From eafbc6716cede6d4a652f8bedf82f2901c68d06d Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Tue, 19 May 2015 16:57:46 +0100 Subject: vmnc: Delay pixel size check Some clients incorrectly set 24 as bits_per_coded_sample, while the actual value is preserved in one of the codec headers. In order to work around this, delay the check until decode_frame(). Signed-off-by: Vittorio Giovara --- libavcodec/vmnc.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index 16984fbf0f..23cfe25453 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -419,10 +419,18 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, c->pic->pict_type = AV_PICTURE_TYPE_I; depth = bytestream2_get_byte(gb); if (depth != c->bpp) { - av_log(avctx, AV_LOG_INFO, - "Depth mismatch. Container %i bpp, " - "Frame data: %i bpp\n", - c->bpp, depth); + av_log(avctx, AV_LOG_WARNING, "Depth mismatch. " + "Container %i bpp / Codec %i bpp\n", c->bpp, depth); + + if (depth != 8 && depth != 16 && depth != 32) { + av_log(avctx, AV_LOG_ERROR, + "Unsupported codec bitdepth %i\n", depth); + return AVERROR_INVALIDDATA; + } + + /* reset values */ + c->bpp = depth; + c->bpp2 = c->bpp / 8; } bytestream2_skip(gb, 1); c->bigendian = bytestream2_get_byte(gb); @@ -524,6 +532,9 @@ static av_cold int decode_init(AVCodecContext *avctx) case 16: avctx->pix_fmt = AV_PIX_FMT_RGB555; break; + case 24: + /* 24 bits is not technically supported, but some clients might + * mistakenly set it -- delay the actual check until decode_frame() */ case 32: avctx->pix_fmt = AV_PIX_FMT_RGB32; break; -- cgit v1.2.3