X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvqavideo.c;h=7f0c9520672a388bb3e6ca5c6935b2f57df1ef56;hb=514e0831aef4d487cf7b4a53c7fbb24222bc5634;hp=8f4ac173f3cf02b448dee69ab3c2e13c9492bbaf;hpb=2a2bbcb05fde486eef76d070f26eecddd4de0ace;p=ffmpeg diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index 8f4ac173f3c..7f0c9520672 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -14,7 +14,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -82,26 +82,13 @@ #define MAX_VECTORS (MAX_CODEBOOK_VECTORS + SOLID_PIXEL_VECTORS) #define MAX_CODEBOOK_SIZE (MAX_VECTORS * 4 * 4) -#define LE_16(x) ((((uint8_t*)(x))[1] << 8) | ((uint8_t*)(x))[0]) -#define BE_16(x) ((((uint8_t*)(x))[0] << 8) | ((uint8_t*)(x))[1]) -#define BE_32(x) ((((uint8_t*)(x))[0] << 24) | \ - (((uint8_t*)(x))[1] << 16) | \ - (((uint8_t*)(x))[2] << 8) | \ - ((uint8_t*)(x))[3]) - -#define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - ( (long)(unsigned char)(ch3) | \ - ( (long)(unsigned char)(ch2) << 8 ) | \ - ( (long)(unsigned char)(ch1) << 16 ) | \ - ( (long)(unsigned char)(ch0) << 24 ) ) - -#define CBF0_TAG FOURCC_TAG('C', 'B', 'F', '0') -#define CBFZ_TAG FOURCC_TAG('C', 'B', 'F', 'Z') -#define CBP0_TAG FOURCC_TAG('C', 'B', 'P', '0') -#define CBPZ_TAG FOURCC_TAG('C', 'B', 'P', 'Z') -#define CPL0_TAG FOURCC_TAG('C', 'P', 'L', '0') -#define CPLZ_TAG FOURCC_TAG('C', 'P', 'L', 'Z') -#define VPTZ_TAG FOURCC_TAG('V', 'P', 'T', 'Z') +#define CBF0_TAG MKBETAG('C', 'B', 'F', '0') +#define CBFZ_TAG MKBETAG('C', 'B', 'F', 'Z') +#define CBP0_TAG MKBETAG('C', 'B', 'P', '0') +#define CBPZ_TAG MKBETAG('C', 'B', 'P', 'Z') +#define CPL0_TAG MKBETAG('C', 'P', 'L', '0') +#define CPLZ_TAG MKBETAG('C', 'P', 'L', 'Z') +#define VPTZ_TAG MKBETAG('V', 'P', 'T', 'Z') #define VQA_DEBUG 0 @@ -155,7 +142,7 @@ static int vqa_decode_init(AVCodecContext *avctx) /* make sure the extradata made it */ if (s->avctx->extradata_size != VQA_HEADER_SIZE) { - printf(" VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: expected extradata size of %d\n", VQA_HEADER_SIZE); return -1; } @@ -164,6 +151,10 @@ static int vqa_decode_init(AVCodecContext *avctx) s->vqa_version = vqa_header[0]; s->width = LE_16(&vqa_header[6]); s->height = LE_16(&vqa_header[8]); + if(avcodec_check_dimensions(avctx, s->width, s->height)){ + s->width= s->height= 0; + return -1; + } s->vector_width = vqa_header[10]; s->vector_height = vqa_header[11]; s->partial_count = s->partial_countdown = vqa_header[13]; @@ -206,8 +197,8 @@ static int vqa_decode_init(AVCodecContext *avctx) #define CHECK_COUNT() \ if (dest_index + count > dest_size) { \ - printf (" VQA video: decode_format80 problem: next op would overflow dest_index\n"); \ - printf (" VQA video: current dest_index = %d, count = %d, dest_size = %d\n", \ + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: next op would overflow dest_index\n"); \ + av_log(NULL, AV_LOG_ERROR, " VQA video: current dest_index = %d, count = %d, dest_size = %d\n", \ dest_index, count, dest_size); \ return; \ } @@ -231,7 +222,7 @@ static void decode_format80(unsigned char *src, int src_size, return; if (dest_index >= dest_size) { - printf (" VQA video: decode_format80 problem: dest_index (%d) exceeded dest_size (%d)\n", + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: dest_index (%d) exceeded dest_size (%d)\n", dest_index, dest_size); return; } @@ -299,7 +290,7 @@ static void decode_format80(unsigned char *src, int src_size, * not every entry needs to be filled */ if (check_size) if (dest_index < dest_size) - printf (" VQA video: decode_format80 problem: decode finished with dest_index (%d) < dest_size (%d)\n", + av_log(NULL, AV_LOG_ERROR, " VQA video: decode_format80 problem: decode finished with dest_index (%d) < dest_size (%d)\n", dest_index, dest_size); } @@ -367,7 +358,7 @@ static void vqa_decode_chunk(VqaContext *s) break; default: - printf (" VQA video: Found unknown chunk type: %c%c%c%c (%08X)\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: Found unknown chunk type: %c%c%c%c (%08X)\n", (chunk_type >> 24) & 0xFF, (chunk_type >> 16) & 0xFF, (chunk_type >> 8) & 0xFF, @@ -384,7 +375,7 @@ static void vqa_decode_chunk(VqaContext *s) if ((cpl0_chunk != -1) && (cplz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CPL0 and CPLZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CPL0 and CPLZ chunks\n"); return; } @@ -401,7 +392,7 @@ static void vqa_decode_chunk(VqaContext *s) chunk_size = BE_32(&s->buf[cpl0_chunk + 4]); /* sanity check the palette size */ if (chunk_size / 3 > 256) { - printf (" VQA video: problem: found a palette chunk with %d colors\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found a palette chunk with %d colors\n", chunk_size / 3); return; } @@ -419,7 +410,7 @@ static void vqa_decode_chunk(VqaContext *s) if ((cbf0_chunk != -1) && (cbfz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CBF0 and CBFZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBF0 and CBFZ chunks\n"); return; } @@ -438,7 +429,7 @@ static void vqa_decode_chunk(VqaContext *s) chunk_size = BE_32(&s->buf[cbf0_chunk + 4]); /* sanity check the full codebook size */ if (chunk_size > MAX_CODEBOOK_SIZE) { - printf (" VQA video: problem: CBF0 chunk too large (0x%X bytes)\n", + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: CBF0 chunk too large (0x%X bytes)\n", chunk_size); return; } @@ -451,7 +442,7 @@ static void vqa_decode_chunk(VqaContext *s) if (vptz_chunk == -1) { /* something is wrong if there is no VPTZ chunk */ - printf (" VQA video: problem: no VPTZ chunk found\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: no VPTZ chunk found\n"); return; } @@ -465,7 +456,7 @@ static void vqa_decode_chunk(VqaContext *s) index_shift = 4; else index_shift = 3; - for (y = 0; y < s->frame.linesize[0] * s->height; + for (y = 0; y < s->frame.linesize[0] * s->height; y += s->frame.linesize[0] * s->vector_height) { for (x = y; x < y + s->width; x += 4, lobytes++, hibytes++) { @@ -476,7 +467,7 @@ static void vqa_decode_chunk(VqaContext *s) switch (s->vqa_version) { case 1: -/* still need sample media for this case (only one game, "Legend of +/* still need sample media for this case (only one game, "Legend of * Kyrandia III : Malcolm's Revenge", is known to use this version) */ lines = 0; break; @@ -508,7 +499,7 @@ static void vqa_decode_chunk(VqaContext *s) /* handle partial codebook */ if ((cbp0_chunk != -1) && (cbpz_chunk != -1)) { /* a chunk should not have both chunk types */ - printf (" VQA video: problem: found both CBP0 and CBPZ chunks\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA video: problem: found both CBP0 and CBPZ chunks\n"); return; } @@ -526,7 +517,7 @@ static void vqa_decode_chunk(VqaContext *s) if (s->partial_countdown == 0) { /* time to replace codebook */ - memcpy(s->codebook, s->next_codebook_buffer, + memcpy(s->codebook, s->next_codebook_buffer, s->next_codebook_buffer_index); /* reset accounting */ @@ -549,8 +540,8 @@ static void vqa_decode_chunk(VqaContext *s) if (s->partial_countdown == 0) { /* decompress codebook */ - decode_format80(s->next_codebook_buffer, - s->next_codebook_buffer_index, + decode_format80(s->next_codebook_buffer, + s->next_codebook_buffer_index, s->codebook, s->codebook_size, 0); /* reset accounting */ @@ -573,7 +564,7 @@ static int vqa_decode_frame(AVCodecContext *avctx, avctx->release_buffer(avctx, &s->frame); if (avctx->get_buffer(avctx, &s->frame)) { - printf (" VQA Video: get_buffer() failed\n"); + av_log(s->avctx, AV_LOG_ERROR, " VQA Video: get_buffer() failed\n"); return -1; }