summaryrefslogtreecommitdiff
path: root/pjmedia/src/pjmedia-codec/opencore_amrnb.c
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-12-15 06:45:23 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-12-15 06:45:23 +0000
commitc8c2f23926a066d277ece3548bc2319aface3d70 (patch)
treed947ae929dfb5853b0c5c0ddcb8e4a312f359152 /pjmedia/src/pjmedia-codec/opencore_amrnb.c
parent96cb849fd94be80c541100ddd80f802405f66bc2 (diff)
Close #1279: Implemented custom SDP format match for G.722.1 and AMR-NB/WB.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3911 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec/opencore_amrnb.c')
-rw-r--r--pjmedia/src/pjmedia-codec/opencore_amrnb.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/pjmedia/src/pjmedia-codec/opencore_amrnb.c b/pjmedia/src/pjmedia-codec/opencore_amrnb.c
index eba53215..fdc68cdd 100644
--- a/pjmedia/src/pjmedia-codec/opencore_amrnb.c
+++ b/pjmedia/src/pjmedia-codec/opencore_amrnb.c
@@ -1,4 +1,4 @@
-/* $Id */
+/* $Id$ */
/*
* Copyright (C) 2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2011 Dan Arrhenius <dan@keystream.se>
@@ -22,6 +22,7 @@
* AMR-NB codec implementation with OpenCORE AMRNB library
*/
#include <pjmedia-codec/g722.h>
+#include <pjmedia-codec/amr_sdp_match.h>
#include <pjmedia/codec.h>
#include <pjmedia/errno.h>
#include <pjmedia/endpoint.h>
@@ -166,6 +167,7 @@ static pjmedia_codec_amrnb_config def_config =
PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt )
{
pjmedia_codec_mgr *codec_mgr;
+ pj_str_t codec_name;
pj_status_t status;
if (amr_codec_factory.pool != NULL)
@@ -188,6 +190,14 @@ PJ_DEF(pj_status_t) pjmedia_codec_opencore_amrnb_init( pjmedia_endpt *endpt )
goto on_error;
}
+ /* Register format match callback. */
+ pj_cstr(&codec_name, "AMR");
+ status = pjmedia_sdp_neg_register_fmt_match_cb(
+ &codec_name,
+ &pjmedia_codec_amr_match_sdp);
+ if (status != PJ_SUCCESS)
+ goto on_error;
+
/* Register codec factory to endpoint. */
status = pjmedia_codec_mgr_register_factory(codec_mgr,
&amr_codec_factory.base);