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

Merge commit '9e7b62f0fb7462a902330fcc82cf596388f0187b'

Browse Source 
* commit '9e7b62f0fb7462a902330fcc82cf596388f0187b':
  twinvq: set block align for codecs and use it in size checks

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-26 14:46:56 +02:00
commit 6063f012f2
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/metasound.c
View File

@ -170,12 +170,6 @@ static int metasound_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
GetBitContext gb; GetBitContext gb;
int i, j, k; int i, j, k;
if (buf_size * 8 < avctx->bit_rate * mtab->size / avctx->sample_rate) {
av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size);
return AVERROR(EINVAL);
}
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS); bits->window_type = get_bits(&gb, TWINVQ_WINDOW_TYPE_BITS);
@ -323,6 +317,9 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx)
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
} }
avctx->block_align = (avctx->bit_rate * tctx->mtab->size
/ avctx->sample_rate + 7) / 8;
tctx->codec = TWINVQ_CODEC_METASOUND; tctx->codec = TWINVQ_CODEC_METASOUND;
tctx->read_bitstream = metasound_read_bitstream; tctx->read_bitstream = metasound_read_bitstream;
tctx->dec_bark_env = dec_bark_env; tctx->dec_bark_env = dec_bark_env;

8
libavcodec/twinvq.c
View File

@ -489,6 +489,12 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
out = (float **)frame->extended_data; out = (float **)frame->extended_data;
} }
if (buf_size < avctx->block_align) {
av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size);
return AVERROR(EINVAL);
}
if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0) if ((ret = tctx->read_bitstream(avctx, tctx, buf, buf_size)) < 0)
return ret; return ret;
@ -506,7 +512,7 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
*got_frame_ptr = 1; *got_frame_ptr = 1;
return buf_size; return avctx->block_align;
} }
/** /**

9
libavcodec/twinvqdec.c
View File

@ -258,12 +258,6 @@ static int twinvq_read_bitstream(AVCodecContext *avctx, TwinVQContext *tctx,
GetBitContext gb; GetBitContext gb;
int i, j, k; int i, j, k;
if (buf_size * 8 < avctx->bit_rate * mtab->size / avctx->sample_rate + 8) {
av_log(avctx, AV_LOG_ERROR,
"Frame too small (%d bytes). Truncated file?\n", buf_size);
return AVERROR(EINVAL);
}
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
skip_bits(&gb, get_bits(&gb, 8)); skip_bits(&gb, get_bits(&gb, 8));
@ -403,6 +397,9 @@ static av_cold int twinvq_decode_init(AVCodecContext *avctx)
return -1; return -1;
} }
avctx->block_align = (avctx->bit_rate * tctx->mtab->size
/ avctx->sample_rate + 15) / 8;
tctx->codec = TWINVQ_CODEC_VQF; tctx->codec = TWINVQ_CODEC_VQF;
tctx->read_bitstream = twinvq_read_bitstream; tctx->read_bitstream = twinvq_read_bitstream;
tctx->dec_bark_env = dec_bark_env; tctx->dec_bark_env = dec_bark_env;