diff options
author | Benny Prijono <bennylp@teluu.com> | 2011-10-14 04:15:15 +0000 |
---|---|---|
committer | Benny Prijono <bennylp@teluu.com> | 2011-10-14 04:15:15 +0000 |
commit | de1679edb534fafe595aa0dbcfd41086c4d51277 (patch) | |
tree | 30eeab4eb7bc03d6a8037202b12acef71ff82180 /pjsip-apps/src | |
parent | d3f073e11620f76da99dd660356c3094c13cd810 (diff) |
Committing re #1388: Support for OpenCORE AMR-NB codec (thank you Dan Arrhenius for the contribution!)
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3816 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
-rw-r--r-- | pjsip-apps/src/samples/encdec.c | 3 | ||||
-rw-r--r-- | pjsip-apps/src/samples/jbsim.c | 3 | ||||
-rw-r--r-- | pjsip-apps/src/samples/pcaputil.c | 4 | ||||
-rw-r--r-- | pjsip-apps/src/samples/pjsip-perf.c | 3 | ||||
-rw-r--r-- | pjsip-apps/src/samples/streamutil.c | 5 |
5 files changed, 18 insertions, 0 deletions
diff --git a/pjsip-apps/src/samples/encdec.c b/pjsip-apps/src/samples/encdec.c index 0d38ce88..f6693679 100644 --- a/pjsip-apps/src/samples/encdec.c +++ b/pjsip-apps/src/samples/encdec.c @@ -253,6 +253,9 @@ int main(int argc, char *argv[]) #if PJMEDIA_HAS_G722_CODEC CHECK( pjmedia_codec_g722_init(mept) ); #endif +#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC + CHECK( pjmedia_codec_opencore_amrnb_init(mept) ); +#endif pj_gettimeofday(&t0); status = enc_dec_test(argv[1], argv[2], argv[3]); diff --git a/pjsip-apps/src/samples/jbsim.c b/pjsip-apps/src/samples/jbsim.c index e023dd55..65d57a8c 100644 --- a/pjsip-apps/src/samples/jbsim.c +++ b/pjsip-apps/src/samples/jbsim.c @@ -494,6 +494,9 @@ static pj_status_t test_init(void) #if defined(PJMEDIA_HAS_INTEL_IPP) && PJMEDIA_HAS_INTEL_IPP != 0 pjmedia_codec_ipp_init(g_app.endpt); #endif +#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && (PJMEDIA_HAS_OPENCORE_AMRNB_CODEC != 0) + pjmedia_codec_opencore_amrnb_init(g_app.endpt); +#endif #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC != 0 pjmedia_codec_l16_init(g_app.endpt, 0); #endif diff --git a/pjsip-apps/src/samples/pcaputil.c b/pjsip-apps/src/samples/pcaputil.c index 01c87129..ff4403d3 100644 --- a/pjsip-apps/src/samples/pcaputil.c +++ b/pjsip-apps/src/samples/pcaputil.c @@ -305,6 +305,10 @@ static void pcap2wav(const pj_str_t *codec, T( pjmedia_codec_l16_init(app.mept, 0) ); #endif /* PJMEDIA_HAS_L16_CODEC */ +#if PJMEDIA_HAS_OPENCORE_AMRNB_CODEC + T( pjmedia_codec_opencore_amrnb_init(app.mept) ); +#endif /* PJMEDIA_HAS_L16_CODEC */ + #if PJMEDIA_HAS_INTEL_IPP T( pjmedia_codec_ipp_init(app.mept) ); #endif diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index 9c8fec3a..851f79da 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -940,6 +940,9 @@ static pj_status_t init_media() #if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0 pjmedia_codec_g722_init(app.med_endpt); #endif +#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && PJMEDIA_HAS_OPENCORE_AMRNB_CODEC!=0 + pjmedia_codec_opencore_amrnb_init(app.med_endpt); +#endif /* Init dummy socket addresses */ app.skinfo_cnt = 0; diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c index 7237b7b8..1a449352 100644 --- a/pjsip-apps/src/samples/streamutil.c +++ b/pjsip-apps/src/samples/streamutil.c @@ -125,6 +125,11 @@ static pj_status_t init_codecs(pjmedia_endpt *med_endpt) PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); #endif +#if defined(PJMEDIA_HAS_OPENCORE_AMRNB_CODEC) && PJMEDIA_HAS_OPENCORE_AMRNB_CODEC!=0 + status = pjmedia_codec_opencore_amrnb_init(med_endpt); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); +#endif + #if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 status = pjmedia_codec_l16_init(med_endpt, 0); PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); |