From cd283c8825c9a94400f27735acb1c9385e90ffc8 Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 19 Jul 2011 03:42:28 +0000 Subject: Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn". git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98 --- pjsip-apps/src/samples/encdec.c | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'pjsip-apps/src/samples/encdec.c') diff --git a/pjsip-apps/src/samples/encdec.c b/pjsip-apps/src/samples/encdec.c index 0d38ce88..117497b9 100644 --- a/pjsip-apps/src/samples/encdec.c +++ b/pjsip-apps/src/samples/encdec.c @@ -137,8 +137,8 @@ static pj_status_t enc_dec_test(const char *codec_id, /* Alloc codec */ CHECK( pjmedia_codec_mgr_alloc_codec(cm, pci, &codec) ); - CHECK( codec->op->init(codec, pool) ); - CHECK( codec->op->open(codec, ¶m) ); + CHECK( pjmedia_codec_init(codec, pool) ); + CHECK( pjmedia_codec_open(codec, ¶m) ); for (;;) { pjmedia_frame frm_pcm, frm_bit, out_frm, frames[4]; @@ -162,7 +162,8 @@ static pj_status_t enc_dec_test(const char *codec_id, /* Encode */ frm_bit.buf = bitstream; frm_bit.size = sizeof(bitstream); - CHECK(codec->op->encode(codec, &frm_pcm, sizeof(bitstream), &frm_bit)); + CHECK(pjmedia_codec_encode(codec, &frm_pcm, sizeof(bitstream), + &frm_bit)); /* On DTX, write zero frame to wavout to maintain duration */ if (frm_bit.size == 0 || frm_bit.type != PJMEDIA_FRAME_TYPE_AUDIO) { @@ -180,8 +181,8 @@ static pj_status_t enc_dec_test(const char *codec_id, */ ts.u64 = 0; cnt = PJ_ARRAY_SIZE(frames); - CHECK( codec->op->parse(codec, bitstream, frm_bit.size, &ts, &cnt, - frames) ); + CHECK( pjmedia_codec_parse(codec, bitstream, frm_bit.size, &ts, &cnt, + frames) ); CHECK( (cnt==1 ? PJ_SUCCESS : -1) ); /* Decode or simulate packet loss */ @@ -190,11 +191,11 @@ static pj_status_t enc_dec_test(const char *codec_id, if ((pj_rand() % 100) < (int)lost_pct) { /* Simulate loss */ - CHECK( codec->op->recover(codec, sizeof(pcmbuf), &out_frm) ); + CHECK( pjmedia_codec_recover(codec, sizeof(pcmbuf), &out_frm) ); TRACE_((THIS_FILE, "%d.%03d Packet lost", T)); } else { /* Decode */ - CHECK( codec->op->decode(codec, &frames[0], sizeof(pcmbuf), + CHECK( pjmedia_codec_decode(codec, &frames[0], sizeof(pcmbuf), &out_frm) ); } @@ -210,7 +211,7 @@ static pj_status_t enc_dec_test(const char *codec_id, pjmedia_port_destroy(wavin); /* Close codec */ - codec->op->close(codec); + pjmedia_codec_close(codec); pjmedia_codec_mgr_dealloc_codec(cm, codec); /* Release pool */ @@ -238,21 +239,7 @@ int main(int argc, char *argv[]) CHECK( pjmedia_endpt_create(&cp.factory, NULL, 1, &mept) ); /* Register all codecs */ -#if PJMEDIA_HAS_G711_CODEC - CHECK( pjmedia_codec_g711_init(mept) ); -#endif -#if PJMEDIA_HAS_GSM_CODEC - CHECK( pjmedia_codec_gsm_init(mept) ); -#endif -#if PJMEDIA_HAS_ILBC_CODEC - CHECK( pjmedia_codec_ilbc_init(mept, 30) ); -#endif -#if PJMEDIA_HAS_SPEEX_CODEC - CHECK( pjmedia_codec_speex_init(mept, 0, 5, 5) ); -#endif -#if PJMEDIA_HAS_G722_CODEC - CHECK( pjmedia_codec_g722_init(mept) ); -#endif + CHECK( pjmedia_codec_register_audio_codecs(mept, NULL) ); pj_gettimeofday(&t0); status = enc_dec_test(argv[1], argv[2], argv[3]); -- cgit v1.2.3