From d9c6eece21dfecb510e33738092f7a43fc7d36f8 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 00:31:11 -0400 Subject: gsm: use av_get_bytes_per_sample() in frame_bytes calculation --- libavcodec/gsmdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 7c247a6b65..57286c796f 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -58,7 +58,8 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; int16_t *samples = data; - int frame_bytes = 2 * avctx->frame_size; + int frame_bytes = avctx->frame_size * + av_get_bytes_per_sample(avctx->sample_fmt); if (*data_size < frame_bytes) return -1; -- cgit v1.2.3 From bac2597a32b774db9b72163d1476673b57ea0187 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 00:34:52 -0400 Subject: gsmdec: log error message when output buffer is too small. also return AVERROR(EINVAL) instead of -1 --- libavcodec/gsmdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 57286c796f..26340c2792 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -61,8 +61,10 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, int frame_bytes = avctx->frame_size * av_get_bytes_per_sample(avctx->sample_fmt); - if (*data_size < frame_bytes) - return -1; + if (*data_size < frame_bytes) { + av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n"); + return AVERROR(EINVAL); + } *data_size = 0; if(buf_size < avctx->block_align) return AVERROR_INVALIDDATA; -- cgit v1.2.3 From fc43fc9faa6edc3c8df76cfa51510a98958563e6 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 10:07:41 -0400 Subject: gsmdec: add flush function to reset the decoder state when seeking --- libavcodec/gsmdec.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 26340c2792..77c22e5d79 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -87,6 +87,12 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, return avctx->block_align; } +static void gsm_flush(AVCodecContext *avctx) +{ + GSMContext *s = avctx->priv_data; + memset(s, 0, sizeof(*s)); +} + AVCodec ff_gsm_decoder = { .name = "gsm", .type = AVMEDIA_TYPE_AUDIO, @@ -94,6 +100,7 @@ AVCodec ff_gsm_decoder = { .priv_data_size = sizeof(GSMContext), .init = gsm_init, .decode = gsm_decode_frame, + .flush = gsm_flush, .long_name = NULL_IF_CONFIG_SMALL("GSM"), }; @@ -104,5 +111,6 @@ AVCodec ff_gsm_ms_decoder = { .priv_data_size = sizeof(GSMContext), .init = gsm_init, .decode = gsm_decode_frame, + .flush = gsm_flush, .long_name = NULL_IF_CONFIG_SMALL("GSM Microsoft variant"), }; -- cgit v1.2.3 From a2e255783e2701b1bd4b59c1c309580f375fb138 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 10:09:45 -0400 Subject: gsmdec: do not needlessly set *data_size to 0 --- libavcodec/gsmdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index 77c22e5d79..f084b14553 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -65,7 +65,7 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n"); return AVERROR(EINVAL); } - *data_size = 0; + if(buf_size < avctx->block_align) return AVERROR_INVALIDDATA; -- cgit v1.2.3 From 9d52f0a7113d9ce14e038f8e65fd0e92ce0d33c1 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Fri, 28 Oct 2011 10:18:07 -0400 Subject: gsm: log error message when packet is too small --- libavcodec/gsmdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libavcodec/gsmdec.c') diff --git a/libavcodec/gsmdec.c b/libavcodec/gsmdec.c index f084b14553..1091745f4b 100644 --- a/libavcodec/gsmdec.c +++ b/libavcodec/gsmdec.c @@ -66,8 +66,10 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data, return AVERROR(EINVAL); } - if(buf_size < avctx->block_align) + if (buf_size < avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); return AVERROR_INVALIDDATA; + } switch (avctx->codec_id) { case CODEC_ID_GSM: -- cgit v1.2.3