virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/gemdec: Move all support checks before image allocation

Browse Source 
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2021-12-05 21:11:48 +01:00
parent e901716daf
commit 51d5e90158
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/gemdec.c
View File

@@ -157,10 +157,22 @@ static int gem_decode_frame(AVCodecContext *avctx,
if (header_size >= 11) if (header_size >= 11)
tag = bytestream2_peek_be32(&gb); tag = bytestream2_peek_be32(&gb);
if (tag == AV_RB32("STTT") || tag == AV_RB32("TIMG") || tag == AV_RB32("XIMG") || if (tag == AV_RB32("STTT")) {
planes == 1 || planes == 2 || planes == 3 || planes == 4 || if (planes != 4) {
planes == 8 || planes == 16 || planes == 24) { avpriv_request_sample(avctx, "STTT planes=%d", planes);
} else { return AVERROR_PATCHWELCOME;
}
} else if (tag == AV_RB32("TIMG")) {
if (planes != 15) {
avpriv_request_sample(avctx, "TIMG planes=%d", planes);
return AVERROR_PATCHWELCOME;
}
} else if (tag == AV_RB32("XIMG")) {
if (planes != 1 && planes != 2 && planes != 4 && planes != 8 && planes != 16 && planes != 24 && planes != 32) {
avpriv_request_sample(avctx, "XIMG planes=%d", planes);
return AVERROR_PATCHWELCOME;
}
} else if (planes != 1 && planes != 2 && planes != 3 && planes != 4 && planes != 8 && planes != 16 && planes != 24) {
avpriv_request_sample(avctx, "planes=%d", planes); avpriv_request_sample(avctx, "planes=%d", planes);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
@@ -184,14 +196,12 @@ static int gem_decode_frame(AVCodecContext *avctx,
palette[i] = 0xFF000000 | r << 16 | g << 8 | b; palette[i] = 0xFF000000 | r << 16 | g << 8 | b;
} }
} else { } else {
avpriv_request_sample(avctx, "STTT planes=%d", planes); av_assert0(0);
return AVERROR_PATCHWELCOME;
} }
} else if (tag == AV_RB32("TIMG")) { } else if (tag == AV_RB32("TIMG")) {
bytestream2_skip(&gb, 4); bytestream2_skip(&gb, 4);
if (planes != 15) { if (planes != 15) {
avpriv_request_sample(avctx, "TIMG planes=%d", planes); av_assert0(0);
return AVERROR_PATCHWELCOME;
} }
} else if (tag == AV_RB32("XIMG")) { } else if (tag == AV_RB32("XIMG")) {
bytestream2_skip(&gb, 6); bytestream2_skip(&gb, 6);
@@ -215,8 +225,7 @@ static int gem_decode_frame(AVCodecContext *avctx,
row_width = avctx->width * pixel_size; row_width = avctx->width * pixel_size;
put_lines = put_lines_bytes; put_lines = put_lines_bytes;
} else { } else {
avpriv_request_sample(avctx, "XIMG planes=%d", planes); av_assert0(0);
return AVERROR_PATCHWELCOME;
} }
} else if (planes == 1) { } else if (planes == 1) {
palette[0] = 0xFFFFFFFF; palette[0] = 0xFFFFFFFF;
@@ -244,7 +253,8 @@ static int gem_decode_frame(AVCodecContext *avctx,
planes = 1; planes = 1;
row_width = avctx->width * pixel_size; row_width = avctx->width * pixel_size;
put_lines = put_lines_bytes; put_lines = put_lines_bytes;
} } else
av_assert0(0);
ret = av_reallocp_array(&avctx->priv_data, planes, row_width); ret = av_reallocp_array(&avctx->priv_data, planes, row_width);
if (ret < 0) if (ret < 0)