aboutsummaryrefslogtreecommitdiffstats
path: root/codecs/codecs.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2017-07-26 23:23:12 +0200
committerAnders Broman <a.broman58@gmail.com>2017-07-30 05:22:35 +0000
commit3e54cabf8193e6a8cd607b1671defb8b6800b53d (patch)
tree63297098c0c26c1c875ab0959d9679d70b3c6e65 /codecs/codecs.c
parent32b446d5a8f146565b81324d1a18bcb053e07c5f (diff)
Add G.729 decoding based on bcg729 library
Bug: 13635 Change-Id: Ic22a0719a59da13e51425aeb747e88caca0d6512 Reviewed-on: https://code.wireshark.org/review/22808 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'codecs/codecs.c')
-rw-r--r--codecs/codecs.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/codecs/codecs.c b/codecs/codecs.c
index 4001a8d426..93350237f1 100644
--- a/codecs/codecs.c
+++ b/codecs/codecs.c
@@ -37,6 +37,10 @@
#include "G726/G726decode.h"
#endif
+#ifdef HAVE_BCG729
+#include "G729/G729decode.h"
+#endif
+
#ifdef HAVE_PLUGINS
#include <gmodule.h>
@@ -130,6 +134,14 @@ register_all_codecs(void)
register_codec("AAL2-G726-40", codec_aal2_g726_40_init, codec_g726_release,
codec_g726_get_channels, codec_g726_get_frequency, codec_g726_decode);
#endif
+#ifdef HAVE_BCG729
+ register_codec("g729", codec_g729_init, codec_g729_release,
+ codec_g729_get_channels, codec_g729_get_frequency, codec_g729_decode);
+#endif
+#ifdef HAVE_SBC
+ register_codec("SBC", codec_sbc_init, codec_sbc_release,
+ codec_sbc_get_channels, codec_sbc_get_frequency, codec_sbc_decode);
+#endif
#ifdef HAVE_SBC
register_codec("SBC", codec_sbc_init, codec_sbc_release,
codec_sbc_get_channels, codec_sbc_get_frequency, codec_sbc_decode);
@@ -253,6 +265,13 @@ void codec_get_compiled_version_info(GString *str)
#else
g_string_append(str, ", without SpanDSP");
#endif
+
+ /* BCG729 (G.729) */
+#ifdef HAVE_BCG729
+ g_string_append(str, ", with bcg729");
+#else
+ g_string_append(str, ", without bcg729");
+#endif
}
/*