diff options
author | Lubos Dolezel <lubos@dolezel.info> | 2015-06-15 11:53:24 +0200 |
---|---|---|
committer | Lubos Dolezel <lubos@dolezel.info> | 2015-06-15 11:53:24 +0200 |
commit | 0bb7d9b67eb81117d0170bca7db71bb1c4014d53 (patch) | |
tree | 8bfc6989be16286b7592bbd25f6bedffb8d25a25 /src/user.cpp | |
parent | cfc875dfa13f74ffcaea66f5665efed7a8753ef3 (diff) | |
download | twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.gz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.lz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.tar.xz twinkle-0bb7d9b67eb81117d0170bca7db71bb1c4014d53.zip |
Further work on G.729A integration (issue #15)
Diffstat (limited to 'src/user.cpp')
-rw-r--r-- | src/user.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/user.cpp b/src/user.cpp index b3de725..38978eb 100644 --- a/src/user.cpp +++ b/src/user.cpp @@ -369,6 +369,9 @@ t_user::t_user() { #ifdef HAVE_ILBC codecs.push_back(CODEC_ILBC); #endif +#ifdef HAVE_BCG729 + codecs.push_back(CODEC_G729A); +#endif codecs.push_back(CODEC_G711_ALAW); codecs.push_back(CODEC_G711_ULAW); codecs.push_back(CODEC_GSM); @@ -2256,6 +2259,10 @@ bool t_user::read_config(const string &filename, string &error_msg) { codecs.push_back(CODEC_G726_32); } else if (codec == "g726-40") { codecs.push_back(CODEC_G726_40); +#ifdef HAVE_BCG729 + } else if (codec == "g729a") { + codecs.push_back(CODEC_G729A); +#endif } else { msg = "Syntax error in file "; msg += f; @@ -2673,6 +2680,9 @@ bool t_user::write_config(const string &filename, string &error_msg) { case CODEC_G726_40: config << "g726-40"; break; + case CODEC_G729A: + config << "g729a"; + break; default: assert(false); } |