diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2008-06-05 10:50:40 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2008-06-05 10:50:40 +0000 |
commit | 5f1ff63b18fbf86eaa27798a35ae8979e3a01b11 (patch) | |
tree | d7ec5fdb38e021ed5c3d2239db3f49d421fc64c8 /pjmedia/src/pjmedia-codec/g722.c | |
parent | 5c55c6ae827ee835906e48e1657f64fa0a84f309 (diff) |
Ticket #473:
- fixed issue on Speex multiple frames (encoding: encoded bits concatenation & decoding: frames parsing)
- updated pjmedia stream & codecs on encoding multiple frames
- introduced bit_info in pjmedia_frame and jitter buffer
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1983 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia-codec/g722.c')
-rw-r--r-- | pjmedia/src/pjmedia-codec/g722.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pjmedia/src/pjmedia-codec/g722.c b/pjmedia/src/pjmedia-codec/g722.c index 4a89b182..aa54c177 100644 --- a/pjmedia/src/pjmedia-codec/g722.c +++ b/pjmedia/src/pjmedia-codec/g722.c @@ -532,14 +532,10 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, struct g722_data *g722_data = (struct g722_data*) codec->codec_data; pj_status_t status; - pj_assert(g722_data != NULL); - PJ_ASSERT_RETURN(input && output, PJ_EINVAL); - - if (output_buf_len < FRAME_LEN) - return PJMEDIA_CODEC_EFRMTOOSHORT; + pj_assert(g722_data && input && output); - PJ_ASSERT_RETURN(input->size/2 == SAMPLES_PER_FRAME, - PJMEDIA_CODEC_EPCMFRMINLEN); + PJ_ASSERT_RETURN((input->size >> 2) <= output_buf_len, + PJMEDIA_CODEC_EFRMTOOSHORT); /* Detect silence */ if (g722_data->vad_enabled) { @@ -570,7 +566,7 @@ static pj_status_t g722_codec_encode(pjmedia_codec *codec, /* Encode to temporary buffer */ output->size = output_buf_len; status = g722_enc_encode(&g722_data->encoder, (pj_int16_t*)input->buf, - SAMPLES_PER_FRAME, output->buf, &output->size); + (input->size >> 1), output->buf, &output->size); if (status != PJ_SUCCESS) { output->size = 0; output->buf = NULL; |