virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

avcodec/qdrw: fix decoding odd size images for 2bpp and 4bpp

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-02-27 11:39:36 +01:00
parent 05aa53dc55
commit dc78696ea4
1 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libavcodec/qdrw.c
View File

@ -91,31 +91,27 @@ static int decode_rle_bpp2(AVCodecContext *avctx, AVFrame *p, GetByteContext *gb
if (code & 0x80 ) { /* run */
pix = bytestream2_get_byte(gbc);
for (j = 0; j < 257 - code; j++) {
out[pos++] = (pix & 0xC0) >> 6;
out[pos++] = (pix & 0x30) >> 4;
out[pos++] = (pix & 0x0C) >> 2;
out[pos++] = (pix & 0x03);
if (pos >= offset) {
pos -= offset;
pos++;
}
if (pos >= offset)
return AVERROR_INVALIDDATA;
if (pos < offset)
out[pos++] = (pix & 0xC0) >> 6;
if (pos < offset)
out[pos++] = (pix & 0x30) >> 4;
if (pos < offset)
out[pos++] = (pix & 0x0C) >> 2;
if (pos < offset)
out[pos++] = (pix & 0x03);
}
left -= 2;
} else { /* copy */
for (j = 0; j < code + 1; j++) {
pix = bytestream2_get_byte(gbc);
out[pos++] = (pix & 0xC0) >> 6;
out[pos++] = (pix & 0x30) >> 4;
out[pos++] = (pix & 0x0C) >> 2;
out[pos++] = (pix & 0x03);
if (pos >= offset) {
pos -= offset;
pos++;
}
if (pos >= offset)
return AVERROR_INVALIDDATA;
if (pos < offset)
out[pos++] = (pix & 0xC0) >> 6;
if (pos < offset)
out[pos++] = (pix & 0x30) >> 4;
if (pos < offset)
out[pos++] = (pix & 0x0C) >> 2;
if (pos < offset)
out[pos++] = (pix & 0x03);
}
left -= 1 + (code + 1);
}
@ -147,27 +143,19 @@ static int decode_rle_bpp4(AVCodecContext *avctx, AVFrame *p, GetByteContext *gb
if (code & 0x80 ) { /* run */
pix = bytestream2_get_byte(gbc);
for (j = 0; j < 257 - code; j++) {
out[pos++] = (pix & 0xF0) >> 4;
out[pos++] = pix & 0xF;
if (pos >= offset) {
pos -= offset;
pos++;
}
if (pos >= offset)
return AVERROR_INVALIDDATA;
if (pos < offset)
out[pos++] = (pix & 0xF0) >> 4;
if (pos < offset)
out[pos++] = pix & 0xF;
}
left -= 2;
} else { /* copy */
for (j = 0; j < code + 1; j++) {
pix = bytestream2_get_byte(gbc);
out[pos++] = (pix & 0xF0) >> 4;
out[pos++] = pix & 0xF;
if (pos >= offset) {
pos -= offset;
pos++;
}
if (pos >= offset)
return AVERROR_INVALIDDATA;
if (pos < offset)
out[pos++] = (pix & 0xF0) >> 4;
if (pos < offset)
out[pos++] = pix & 0xF;
}
left -= 1 + (code + 1);
}