virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

sipr: fix the output data size check and only calculate it once.

Browse Source
This commit is contained in:
Justin Ruggles 2011-09-20 15:27:44 -04:00
parent 12bd8532cf
commit 1b5a189f06
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/sipr.c
View File

@ -509,7 +509,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
GetBitContext gb; GetBitContext gb;
float *data = datap; float *data = datap;
int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE; int subframe_size = ctx->mode == MODE_16k ? L_SUBFR_16k : SUBFR_SIZE;
int i; int i, out_size;
ctx->avctx = avctx; ctx->avctx = avctx;
if (avpkt->size < (mode_par->bits_per_frame >> 3)) { if (avpkt->size < (mode_par->bits_per_frame >> 3)) {
@ -520,7 +520,11 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
*data_size = 0; *data_size = 0;
return -1; return -1;
} }
if (*data_size < subframe_size * mode_par->subframe_count * sizeof(float)) {
out_size = mode_par->frames_per_packet * subframe_size *
mode_par->subframe_count *
av_get_bytes_per_sample(avctx->sample_fmt);
if (*data_size < out_size) {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error processing packet: output buffer (%d) too small\n", "Error processing packet: output buffer (%d) too small\n",
*data_size); *data_size);
@ -542,8 +546,7 @@ static int sipr_decode_frame(AVCodecContext *avctx, void *datap,
data += subframe_size * mode_par->subframe_count; data += subframe_size * mode_par->subframe_count;
} }
*data_size = mode_par->frames_per_packet * subframe_size * *data_size = out_size;
mode_par->subframe_count * sizeof(float);
return mode_par->bits_per_frame >> 3; return mode_par->bits_per_frame >> 3;
} }