generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/g729dec: support decoding packets with multiple frames

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2015-04-17 14:29:06 +00:00
parent f98cad8759
commit daf73d5d17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/g729dec.c
View File

@ -421,7 +421,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
return ret; return ret;
out_frame = (int16_t*) frame->data[0]; out_frame = (int16_t*) frame->data[0];
if (buf_size == 10) { if (buf_size % 10 == 0) {
packet_type = FORMAT_G729_8K; packet_type = FORMAT_G729_8K;
format = &format_g729_8k; format = &format_g729_8k;
//Reset voice decision //Reset voice decision
@ -711,7 +711,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
memmove(ctx->exc_base, ctx->exc_base + 2 * SUBFRAME_SIZE, (PITCH_DELAY_MAX+INTERPOL_LEN)*sizeof(int16_t)); memmove(ctx->exc_base, ctx->exc_base + 2 * SUBFRAME_SIZE, (PITCH_DELAY_MAX+INTERPOL_LEN)*sizeof(int16_t));
*got_frame_ptr = 1; *got_frame_ptr = 1;
return buf_size; return packet_type == FORMAT_G729_8K ? 10 : 8;
} }
AVCodec ff_g729_decoder = { AVCodec ff_g729_decoder = {
@ -722,5 +722,5 @@ AVCodec ff_g729_decoder = {
.priv_data_size = sizeof(G729Context), .priv_data_size = sizeof(G729Context),
.init = decoder_init, .init = decoder_init,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1,
}; };