diff options
Diffstat (limited to 'pjsip-apps/src/samples/pcaputil.c')
-rw-r--r-- | pjsip-apps/src/samples/pcaputil.c | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/pjsip-apps/src/samples/pcaputil.c b/pjsip-apps/src/samples/pcaputil.c index d565bd63..1f6efb27 100644 --- a/pjsip-apps/src/samples/pcaputil.c +++ b/pjsip-apps/src/samples/pcaputil.c @@ -87,7 +87,7 @@ static void err_exit(const char *title, pj_status_t status) pj_ssize_t pos = pjmedia_wav_writer_port_get_pos(app.wav); if (pos >= 0) { unsigned msec; - msec = pos / 2 * 1000 / app.wav->info.clock_rate; + msec = pos / 2 * 1000 / PJMEDIA_PIA_SRATE(&app.wav->info); printf("Written: %dm:%02ds.%03d\n", msec / 1000 / 60, (msec / 1000) % 60, @@ -98,7 +98,7 @@ static void err_exit(const char *title, pj_status_t status) if (app.pcap) pj_pcap_close(app.pcap); if (app.codec) { pjmedia_codec_mgr *cmgr; - app.codec->op->close(app.codec); + pjmedia_codec_close(app.codec); cmgr = pjmedia_endpt_get_codec_mgr(app.mept); pjmedia_codec_mgr_dealloc_codec(cmgr, app.codec); } @@ -229,29 +229,7 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, pj_status_t status; /* Initialize all codecs */ -#if PJMEDIA_HAS_SPEEX_CODEC - T( pjmedia_codec_speex_init(app.mept, 0, 10, 10) ); -#endif /* PJMEDIA_HAS_SPEEX_CODEC */ - -#if PJMEDIA_HAS_ILBC_CODEC - T( pjmedia_codec_ilbc_init(app.mept, 30) ); -#endif /* PJMEDIA_HAS_ILBC_CODEC */ - -#if PJMEDIA_HAS_GSM_CODEC - T( pjmedia_codec_gsm_init(app.mept) ); -#endif /* PJMEDIA_HAS_GSM_CODEC */ - -#if PJMEDIA_HAS_G711_CODEC - 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 */ + T( pjmedia_codec_register_audio_codecs(app.mept, NULL) ); /* Create SRTP transport is needed */ #if PJMEDIA_HAS_SRTP @@ -282,8 +260,8 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, /* Alloc and init codec */ T( pjmedia_codec_mgr_alloc_codec(cmgr, ci, &app.codec) ); - T( app.codec->op->init(app.codec, app.pool) ); - T( app.codec->op->open(app.codec, ¶m) ); + T( pjmedia_codec_init(app.codec, app.pool) ); + T( pjmedia_codec_open(app.codec, ¶m) ); /* Open WAV file */ samples_per_frame = ci->clock_rate * param.info.frm_ptime / 1000; @@ -307,7 +285,7 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, /* Parse first packet */ ts.u64 = 0; frame_cnt = PJ_ARRAY_SIZE(frames); - T( app.codec->op->parse(app.codec, pkt0.payload, pkt0.payload_len, + T( pjmedia_codec_parse(app.codec, pkt0.payload, pkt0.payload_len, &ts, &frame_cnt, frames) ); /* Decode and write to WAV file */ @@ -318,7 +296,7 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, pcm_frame.buf = pcm; pcm_frame.size = samples_per_frame * 2; - T( app.codec->op->decode(app.codec, &frames[i], pcm_frame.size, + T( pjmedia_codec_decode(app.codec, &frames[i], pcm_frame.size, &pcm_frame) ); T( pjmedia_port_put_frame(app.wav, &pcm_frame) ); samples_cnt += samples_per_frame; @@ -337,8 +315,8 @@ static void pcap2wav(const char *wav_filename, const pj_str_t *srtp_crypto, pcm_frame.size = samples_per_frame * 2; if (app.codec->op->recover) { - T( app.codec->op->recover(app.codec, pcm_frame.size, - &pcm_frame) ); + T( pjmedia_codec_recover(app.codec, pcm_frame.size, + &pcm_frame) ); } else { pj_bzero(pcm_frame.buf, pcm_frame.size); } |