diff options
| author | Riza Sulistyo <riza@teluu.com> | 2015-07-01 01:45:57 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2015-07-01 01:45:57 +0000 |
| commit | 9a0f3e938494f0f48e073d39e68b0ed2fc76e112 (patch) | |
| tree | 545497099f3aaa1d731bcef07e8238835506e42e /pjmedia | |
| parent | 96248296892eb42872aac0093aef2ee825e7e77f (diff) | |
Misc (re #1843): Register fmt matching callbak for AMR-WB in opencore-amr implementation. Thanks to Alexander Traud for the initial patch.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5122 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-codec/opencore_amr.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/pjmedia/src/pjmedia-codec/opencore_amr.c b/pjmedia/src/pjmedia-codec/opencore_amr.c index b5931b96..f7af438c 100644 --- a/pjmedia/src/pjmedia-codec/opencore_amr.c +++ b/pjmedia/src/pjmedia-codec/opencore_amr.c @@ -242,12 +242,26 @@ PJ_DEF(pj_status_t) pjmedia_codec_opencore_amr_init( pjmedia_endpt *endpt, } /* 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; +#ifdef USE_AMRNB + if ((options & PJMEDIA_AMR_NO_NB) == 0) { + 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; + } +#endif +#ifdef USE_AMRWB + if ((options & PJMEDIA_AMR_NO_WB) == 0) { + pj_cstr(&codec_name, "AMR-WB"); + status = pjmedia_sdp_neg_register_fmt_match_cb( + &codec_name, + &pjmedia_codec_amr_match_sdp); + if (status != PJ_SUCCESS) + goto on_error; + } +#endif /* Register codec factory to endpoint. */ status = pjmedia_codec_mgr_register_factory(codec_mgr, |