From 466d7b11a94668e5a262ba4f6f48c32134ae770b Mon Sep 17 00:00:00 2001
From: yanmorin <yanmorin>
Date: Wed, 5 Oct 2005 16:15:22 +0000
Subject: [PATCH] Add my copyright to the file Add a CodecMap (the map) and
CodecDescriptorMap (the one that initialize it) for the request: list seq1
codecdescriptor
---
src/audio/audiolayer.cpp | 1 +
src/audio/audiolayer.h | 1 +
src/audio/audiortp.cpp | 3 ++-
src/audio/audiortp.h | 3 ++-
src/audio/codecDescriptor.cpp | 27 ++++++++++++++------
src/audio/codecDescriptor.h | 47 ++++++++++++++++++++++++-----------
src/audio/dtmfgenerator.cpp | 3 ++-
src/audio/tonegenerator.cpp | 1 +
src/audio/tonegenerator.h | 1 +
src/call.cpp | 1 +
src/call.h | 1 +
src/global.h | 1 +
src/gui/guiframework.cpp | 1 +
src/gui/guiframework.h | 1 +
src/main.cpp | 1 +
src/managerimpl.cpp | 18 ++++++++++++--
src/managerimpl.h | 5 ++++
src/sipcall.cpp | 7 +++---
src/sipcall.h | 3 ++-
src/sipvoiplink.cpp | 1 +
src/sipvoiplink.h | 1 +
src/user_cfg.h | 1 +
src/voIPLink.cpp | 1 +
src/voIPLink.h | 1 +
24 files changed, 99 insertions(+), 32 deletions(-)
diff --git a/src/audio/audiolayer.cpp b/src/audio/audiolayer.cpp
index 6e5b6ce506..f25d89da92 100644
--- a/src/audio/audiolayer.cpp
+++ b/src/audio/audiolayer.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/audiolayer.h b/src/audio/audiolayer.h
index 93ff22563a..11c359451b 100644
--- a/src/audio/audiolayer.h
+++ b/src/audio/audiolayer.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/audiortp.cpp b/src/audio/audiortp.cpp
index 9763451c91..4bee10d241 100644
--- a/src/audio/audiortp.cpp
+++ b/src/audio/audiortp.cpp
@@ -1,5 +1,6 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/audiortp.h b/src/audio/audiortp.h
index b38f100b60..d32960312c 100644
--- a/src/audio/audiortp.h
+++ b/src/audio/audiortp.h
@@ -1,5 +1,6 @@
/**
- * Copyright (C) 2004 Savoir-Faire Linux inc.
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/codecDescriptor.cpp b/src/audio/codecDescriptor.cpp
index 4c7daeab1b..1c6ed5261a 100644
--- a/src/audio/codecDescriptor.cpp
+++ b/src/audio/codecDescriptor.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -25,13 +26,21 @@
#include "ulaw.h"
#include "codecDescriptor.h"
-
const char* CODEC_ALAW = "G711a";
const char* CODEC_ULAW = "G711u";
const char* CODEC_GSM = "GSM";
const char* CODEC_ILBC = "iLBC";
const char* CODEC_SPEEX = "SPEEX";
+CodecDescriptorMap::CodecDescriptorMap()
+{
+ _codecMap[PAYLOAD_CODEC_ALAW] = CODEC_ALAW;
+ _codecMap[PAYLOAD_CODEC_ULAW] = CODEC_ULAW;
+ _codecMap[PAYLOAD_CODEC_GSM] = CODEC_GSM;
+// theses one are not implemented yet..
+// _codecMap[PAYLOAD_CODEC_ILBC] = CODEC_ILBC;
+// _codecMap[PAYLOAD_CODEC_SPEEX] = CODEC_SPEEX;
+}
CodecDescriptor::CodecDescriptor (int payload)
{
@@ -39,13 +48,13 @@ CodecDescriptor::CodecDescriptor (int payload)
_codecName = rtpmapPayload(_payload);
}
-CodecDescriptor::CodecDescriptor (const string& name)
+CodecDescriptor::CodecDescriptor (const std::string& name)
{
_codecName = name;
_payload = matchPayloadCodec(name);
}
-CodecDescriptor::CodecDescriptor (int payload, const string& name)
+CodecDescriptor::CodecDescriptor (int payload, const std::string& name)
{
_payload = payload;
_codecName = name;
@@ -56,7 +65,7 @@ CodecDescriptor::~CodecDescriptor (void)
}
AudioCodec*
-CodecDescriptor::alloc (int payload, const string& name)
+CodecDescriptor::alloc (int payload, const std::string& name)
{
switch(payload) {
case PAYLOAD_CODEC_ULAW:
@@ -87,19 +96,19 @@ CodecDescriptor::getPayload (void)
}
void
-CodecDescriptor::setNameCodec (const string& name)
+CodecDescriptor::setNameCodec (const std::string& name)
{
_codecName = name;
}
-string
+std::string
CodecDescriptor::getNameCodec (void)
{
return _codecName;
}
int
-CodecDescriptor::matchPayloadCodec (const string& codecname) {
+CodecDescriptor::matchPayloadCodec (const std::string& codecname) {
if (codecname == CODEC_ALAW) {
return PAYLOAD_CODEC_ALAW;
} else if (codecname == CODEC_ULAW) {
@@ -114,8 +123,10 @@ CodecDescriptor::matchPayloadCodec (const string& codecname) {
return -1;
}
-string
+std::string
CodecDescriptor::rtpmapPayload (int payload) {
+ // we don't want to use the CodecDescriptorMap Here
+ // we create one, but in MainManager for the list
switch (payload) {
case PAYLOAD_CODEC_ALAW:
return string("PCMA");
diff --git a/src/audio/codecDescriptor.h b/src/audio/codecDescriptor.h
index e3e63e36a5..4ca94aea42 100644
--- a/src/audio/codecDescriptor.h
+++ b/src/audio/codecDescriptor.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -22,46 +23,62 @@
#define __CODEC_DESCRIPTOR_H__
#include <string>
-
-using namespace std;
+#include <map>
typedef enum {
- PAYLOAD_CODEC_ULAW = 0,
- PAYLOAD_CODEC_GSM = 3,
- PAYLOAD_CODEC_ALAW = 8,
- PAYLOAD_CODEC_ILBC = 97,
- PAYLOAD_CODEC_SPEEX = 110
+ PAYLOAD_CODEC_ULAW = 0,
+ PAYLOAD_CODEC_GSM = 3,
+ PAYLOAD_CODEC_ALAW = 8,
+ PAYLOAD_CODEC_ILBC = 97,
+ PAYLOAD_CODEC_SPEEX = 110
} codecType;
+/**
+ * This class should be singleton
+ * But I didn't want to add Singleton template to it.. and an extra header
+ * I didn't want to make my own Singleton structure to not
+ * add an extra function to delete the new CodecDescriptorMap
+ * when the application stop
+ */
+typedef std::map<codecType, std::string> CodecMap;
+class CodecDescriptorMap {
+public:
+ CodecDescriptorMap();
+ ~CodecDescriptorMap() {};
+ CodecMap getMap() const { return _codecMap; } // by Copy
+private:
+ CodecMap _codecMap;
+};
class AudioCodec;
class CodecDescriptor
{
public:
+
CodecDescriptor (int payload);
- CodecDescriptor (const string& name);
- CodecDescriptor (int payload, const string& name);
+ CodecDescriptor (const std::string& name);
+ CodecDescriptor (int payload, const std::string& name);
~CodecDescriptor (void);
- AudioCodec* alloc (int payload, const string& name);
+ AudioCodec* alloc (int payload, const std::string& name);
void setPayload (int payload);
int getPayload (void);
- void setNameCodec (const string& name);
- string getNameCodec (void);
+ void setNameCodec (const std::string& name);
+ std::string getNameCodec (void);
/*
* Match codec name to the payload
*/
- int matchPayloadCodec (const string&);
+ int matchPayloadCodec (const std::string&);
/*
* Match a payload to the codec name
*/
- string rtpmapPayload (int);
+ std::string rtpmapPayload (int);
private:
int _payload;
- string _codecName;
+ std::string _codecName;
};
#endif // __CODEC_DESCRIPTOR_H__
diff --git a/src/audio/dtmfgenerator.cpp b/src/audio/dtmfgenerator.cpp
index 13f267bccf..aaf2d68a40 100644
--- a/src/audio/dtmfgenerator.cpp
+++ b/src/audio/dtmfgenerator.cpp
@@ -1,5 +1,6 @@
-/*
+/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions (c) 2003 iptel.org
diff --git a/src/audio/tonegenerator.cpp b/src/audio/tonegenerator.cpp
index 689b1c330f..9bbc64327b 100644
--- a/src/audio/tonegenerator.cpp
+++ b/src/audio/tonegenerator.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio/tonegenerator.h b/src/audio/tonegenerator.h
index 22c687a31f..c41c1abfe4 100644
--- a/src/audio/tonegenerator.h
+++ b/src/audio/tonegenerator.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/call.cpp b/src/call.cpp
index 6349a4f267..49914e0ce4 100644
--- a/src/call.cpp
+++ b/src/call.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/call.h b/src/call.h
index 6f768f3ee0..df13ddcb1d 100644
--- a/src/call.h
+++ b/src/call.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/global.h b/src/global.h
index 0dead4b834..26a754377f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gui/guiframework.cpp b/src/gui/guiframework.cpp
index b3ac45db05..e2f11ed328 100644
--- a/src/gui/guiframework.cpp
+++ b/src/gui/guiframework.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gui/guiframework.h b/src/gui/guiframework.h
index 7bc27b2001..7690eb071e 100644
--- a/src/gui/guiframework.h
+++ b/src/gui/guiframework.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/main.cpp b/src/main.cpp
index b4f65b54c5..d9119195e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index 0a8f9afe9c..e999aadfe0 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -39,7 +40,6 @@
#include "manager.h"
#include "audio/audiocodec.h"
#include "audio/audiolayer.h"
-#include "audio/codecDescriptor.h"
#include "audio/ringbuffer.h"
#include "audio/tonegenerator.h"
#include "call.h"
@@ -94,6 +94,8 @@ ManagerImpl::ManagerImpl (void)
_toneType = 0;
_nbIncomingWaitingCall=0;
+
+ _codecMap = CodecDescriptorMap().getMap();
}
ManagerImpl::~ManagerImpl (void)
@@ -1473,7 +1475,19 @@ bool
ManagerImpl::getConfigList(const std::string& sequenceId, const std::string& name)
{
bool returnValue = false;
- if (name=="") {
+ if (name=="codecdescriptor") {
+ TokenList tk;
+ CodecMap::iterator iter = _codecMap.begin();
+
+ while( iter != _codecMap.end() ) {
+ tk.clear();
+ std::ostringstream strType;
+ strType << iter->first;
+ tk.push_back(strType.str());
+ tk.push_back(iter->second);
+ _gui->sendMessage("100", sequenceId, tk);
+ iter++;
+ }
returnValue = true;
} else if (name=="") {
returnValue = true;
diff --git a/src/managerimpl.h b/src/managerimpl.h
index 955bd8ba74..3b0dff412a 100644
--- a/src/managerimpl.h
+++ b/src/managerimpl.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -30,6 +31,7 @@
#include "observer.h"
#include "config/config.h"
#include "audio/dtmf.h"
+#include "audio/codecDescriptor.h"
class AudioLayer;
class CodecDescriptor;
@@ -346,6 +348,9 @@ private:
*/
CodecDescriptorVector _codecDescVector;
+ // map of codec (for configlist request)
+ CodecMap _codecMap;
+
/*
* Mutex to protect access to code section
*/
diff --git a/src/sipcall.cpp b/src/sipcall.cpp
index 2e0ee55e90..45cc65dcc3 100644
--- a/src/sipcall.cpp
+++ b/src/sipcall.cpp
@@ -1,6 +1,7 @@
-/*
- * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
- * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
+/**
+ * Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
+ * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) 2002,2003 Aymeric Moizard <jack@atosc.org>
*
diff --git a/src/sipcall.h b/src/sipcall.h
index 649ec244c9..1fdcf5189f 100644
--- a/src/sipcall.h
+++ b/src/sipcall.h
@@ -1,5 +1,6 @@
-/*
+/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) 2002,2003 Aymeric Moizard <jack@atosc.org>
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 588ddad191..b815973c9e 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) 2002,2003 Aymeric Moizard <jack@atosc.org>
diff --git a/src/sipvoiplink.h b/src/sipvoiplink.h
index 3e1b1988b6..c5f2fd92fc 100644
--- a/src/sipvoiplink.h
+++ b/src/sipvoiplink.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* Portions Copyright (C) 2002,2003 Aymeric Moizard <jack@atosc.org>
diff --git a/src/user_cfg.h b/src/user_cfg.h
index 8c7dffb329..144d2e976f 100644
--- a/src/user_cfg.h
+++ b/src/user_cfg.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2004-2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/voIPLink.cpp b/src/voIPLink.cpp
index a7de97c227..9ad71e0316 100644
--- a/src/voIPLink.cpp
+++ b/src/voIPLink.cpp
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/voIPLink.h b/src/voIPLink.h
index 104eb53060..54b35de28e 100644
--- a/src/voIPLink.h
+++ b/src/voIPLink.h
@@ -1,5 +1,6 @@
/**
* Copyright (C) 2005 Savoir-Faire Linux inc.
+ * Author: Yan Morin <yan.morin@savoirfairelinux.com>
* Author : Laurielle Lea <laurielle.lea@savoirfairelinux.com>
*
* This program is free software; you can redistribute it and/or modify
--
GitLab