diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
commit | cd283c8825c9a94400f27735acb1c9385e90ffc8 (patch) | |
tree | 56d5722310fa8957ce5d1ba7cbd137cf8802dcc7 /pjmedia/src/test/codec_vectors.c | |
parent | ed8f8d08abba9040f769e922aa0c1adbde86fbbc (diff) |
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
Diffstat (limited to 'pjmedia/src/test/codec_vectors.c')
-rw-r--r-- | pjmedia/src/test/codec_vectors.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pjmedia/src/test/codec_vectors.c b/pjmedia/src/test/codec_vectors.c index b53850b6..5257b5a7 100644 --- a/pjmedia/src/test/codec_vectors.c +++ b/pjmedia/src/test/codec_vectors.c @@ -73,13 +73,13 @@ static int codec_test_encode(pjmedia_codec_mgr *mgr, codec_param.info.avg_bps = bitrate; codec_param.setting.vad = 0; - status = codec->op->init(codec, pool); + status = pjmedia_codec_init(codec, pool); if (status != PJ_SUCCESS) { rc = -60; goto on_return; } - status = codec->op->open(codec, &codec_param); + status = pjmedia_codec_open(codec, &codec_param); if (status != PJ_SUCCESS) { rc = -70; goto on_return; @@ -117,7 +117,7 @@ static int codec_test_encode(pjmedia_codec_mgr *mgr, break; out_frame.size = samples_per_frame; - status = codec->op->encode(codec, &in_frame, samples_per_frame, + status = pjmedia_codec_encode(codec, &in_frame, samples_per_frame, &out_frame); if (status != PJ_SUCCESS) { rc = -95; @@ -188,7 +188,7 @@ on_return: fclose(fref); if (codec) { - codec->op->close(codec); + pjmedia_codec_close(codec); pjmedia_codec_mgr_dealloc_codec(mgr, codec); } @@ -326,13 +326,13 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, codec_param.info.avg_bps = bitrate; codec_param.setting.vad = 0; - status = codec->op->init(codec, pool); + status = pjmedia_codec_init(codec, pool); if (status != PJ_SUCCESS) { rc = -60; goto on_return; } - status = codec->op->open(codec, &codec_param); + status = pjmedia_codec_open(codec, &codec_param); if (status != PJ_SUCCESS) { rc = -70; goto on_return; @@ -387,8 +387,8 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, if (has_frame) { count = 2; - if (codec->op->parse(codec, pkt, encoded_len, &ts, - &count, in_frame) != PJ_SUCCESS) + if (pjmedia_codec_parse(codec, pkt, encoded_len, &ts, + &count, in_frame) != PJ_SUCCESS) { rc = -100; goto on_return; @@ -399,15 +399,15 @@ static int codec_test_decode(pjmedia_codec_mgr *mgr, goto on_return; } - if (codec->op->decode(codec, &in_frame[0], samples_per_frame*2, - &out_frame) != PJ_SUCCESS) + if (pjmedia_codec_decode(codec, &in_frame[0], samples_per_frame*2, + &out_frame) != PJ_SUCCESS) { rc = -120; goto on_return; } } else { - if (codec->op->recover(codec, samples_per_frame*2, - &out_frame) != PJ_SUCCESS) + if (pjmedia_codec_recover(codec, samples_per_frame*2, + &out_frame) != PJ_SUCCESS) { rc = -125; goto on_return; @@ -483,7 +483,7 @@ on_return: fclose(input); if (codec) { - codec->op->close(codec); + pjmedia_codec_close(codec); pjmedia_codec_mgr_dealloc_codec(mgr, codec); } |