diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-03-17 14:07:53 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-03-17 14:07:53 +0000 |
| commit | e14e1fddbedf8c03df686ecd7c7af0c0ca0f52c6 (patch) | |
| tree | 8ae1ae5d648b62b7fe49cd738e1103e91ac5b310 /pjsip-apps/src/samples | |
| parent | 685aef52bcf830cb591798cd0814dd4a10605497 (diff) | |
Ticket #507: committed and tested g722 patch on Windows
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1870 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/samples')
| -rw-r--r-- | pjsip-apps/src/samples/encdec.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 |
4 files changed, 15 insertions, 0 deletions
diff --git a/pjsip-apps/src/samples/encdec.c b/pjsip-apps/src/samples/encdec.c index 22ede776..ca43debb 100644 --- a/pjsip-apps/src/samples/encdec.c +++ b/pjsip-apps/src/samples/encdec.c @@ -266,6 +266,9 @@ int main(int argc, char *argv[]) #if HAS_G729_CODEC CHECK( keystream_g729ab_init(mept) ); #endif +#if PJMEDIA_HAS_G722_CODEC + CHECK( pjmedia_codec_g722_init(mept) ); +#endif pj_gettimeofday(&t0); status = enc_dec_test(argv[1], argv[2], argv[3]); diff --git a/pjsip-apps/src/samples/pcaputil.c b/pjsip-apps/src/samples/pcaputil.c index 9ea77a02..d44ba782 100644 --- a/pjsip-apps/src/samples/pcaputil.c +++ b/pjsip-apps/src/samples/pcaputil.c @@ -243,6 +243,10 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, T( pjmedia_codec_g711_init(app.mept) ); #endif /* PJMEDIA_HAS_G711_CODEC */ +#if PJMEDIA_HAS_G722_CODEC + T( pjmedia_codec_g722_init(app.mept) ); +#endif /* PJMEDIA_HAS_G722_CODEC */ + #if PJMEDIA_HAS_L16_CODEC T( pjmedia_codec_l16_init(app.mept, 0) ); #endif /* PJMEDIA_HAS_L16_CODEC */ diff --git a/pjsip-apps/src/samples/pjsip-perf.c b/pjsip-apps/src/samples/pjsip-perf.c index c6ca6e5c..c5e4fe69 100644 --- a/pjsip-apps/src/samples/pjsip-perf.c +++ b/pjsip-apps/src/samples/pjsip-perf.c @@ -936,6 +936,9 @@ static pj_status_t init_media() #if defined(PJMEDIA_HAS_SPEEX_CODEC) && PJMEDIA_HAS_SPEEX_CODEC!=0 pjmedia_codec_speex_init(app.med_endpt, PJMEDIA_SPEEX_NO_UWB, 3, 3); #endif +#if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0 + pjmedia_codec_g722_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 e2e9b14c..0f71a76b 100644 --- a/pjsip-apps/src/samples/streamutil.c +++ b/pjsip-apps/src/samples/streamutil.c @@ -118,6 +118,11 @@ static pj_status_t init_codecs(pjmedia_endpt *med_endpt) PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); #endif +#if defined(PJMEDIA_HAS_G722_CODEC) && PJMEDIA_HAS_G722_CODEC!=0 + status = pjmedia_codec_g722_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); |