From 3344f5cb747bb1f54cc34878b66dc0536f194720 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 18:07:42 +0100 Subject: [PATCH 1/9] nuv: return meaningful error codes. --- libavcodec/nuv.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 0b47e974f5..f7d348a486 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -87,7 +87,7 @@ static int get_quant(AVCodecContext *avctx, NuvContext *c, const uint8_t *buf, int i; if (size < 2 * 64 * 4) { av_log(avctx, AV_LOG_ERROR, "insufficient rtjpeg quant data\n"); - return -1; + return AVERROR_INVALIDDATA; } for (i = 0; i < 64; i++, buf += 4) c->lq[i] = AV_RL32(buf); @@ -113,13 +113,15 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int quality) { NuvContext *c = avctx->priv_data; + int ret; + width = FFALIGN(width, 2); height = FFALIGN(height, 2); if (quality >= 0) get_quant_quality(c, quality); if (width != c->width || height != c->height) { - if (av_image_check_size(height, width, 0, avctx) < 0) - return 0; + if ((ret = av_image_check_size(height, width, 0, avctx)) < 0) + return ret; avctx->width = c->width = width; avctx->height = c->height = height; av_fast_malloc(&c->decomp_buf, &c->decomp_size, @@ -127,7 +129,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, if (!c->decomp_buf) { av_log(avctx, AV_LOG_ERROR, "Can't allocate decompression buffer.\n"); - return 0; + return AVERROR(ENOMEM); } ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); @@ -135,7 +137,7 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, ff_rtjpeg_decode_init(&c->rtj, &c->dsp, c->width, c->height, c->lq, c->cq); - return 1; + return 0; } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, @@ -159,7 +161,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (buf_size < 12) { av_log(avctx, AV_LOG_ERROR, "coded frame too small\n"); - return -1; + return AVERROR_INVALIDDATA; } // codec data (rtjpeg quant tables) @@ -178,7 +180,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (buf[0] != 'V' || buf_size < 12) { av_log(avctx, AV_LOG_ERROR, "not a nuv video frame\n"); - return -1; + return AVERROR_INVALIDDATA; } comptype = buf[1]; switch (comptype) { @@ -213,8 +215,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, w = AV_RL16(&buf[6]); h = AV_RL16(&buf[8]); q = buf[10]; - if (!codec_reinit(avctx, w, h, q)) - return -1; + if ((result = codec_reinit(avctx, w, h, q)) < 0) + return result; buf = &buf[RTJPEG_HEADER_SIZE]; buf_size -= RTJPEG_HEADER_SIZE; } @@ -227,7 +229,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, result = avctx->reget_buffer(avctx, &c->pic); if (result < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return result; } c->pic.pict_type = keyframe ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_P; @@ -258,7 +260,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, break; default: av_log(avctx, AV_LOG_ERROR, "unknown compression\n"); - return -1; + return AVERROR_INVALIDDATA; } *picture = c->pic; @@ -269,6 +271,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static av_cold int decode_init(AVCodecContext *avctx) { NuvContext *c = avctx->priv_data; + int ret; + avctx->pix_fmt = AV_PIX_FMT_YUV420P; c->pic.data[0] = NULL; c->decomp_buf = NULL; @@ -283,8 +287,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_dsputil_init(&c->dsp, avctx); - if (!codec_reinit(avctx, avctx->width, avctx->height, -1)) - return 1; + if ((ret = codec_reinit(avctx, avctx->width, avctx->height, -1)) < 0) + return ret; return 0; } From 62d9655217f94ba5a1fa05ada1724e4f61df8605 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 18:17:54 +0100 Subject: [PATCH 2/9] qpeg: return a meaningful error code. --- libavcodec/qpeg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/qpeg.c b/libavcodec/qpeg.c index 4a918e71ec..c295543c38 100644 --- a/libavcodec/qpeg.c +++ b/libavcodec/qpeg.c @@ -247,7 +247,7 @@ static int decode_frame(AVCodecContext *avctx, QpegContext * const a = avctx->priv_data; AVFrame * const p = &a->pic; uint8_t* outdata; - int delta; + int delta, ret; const uint8_t *pal = av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL); if (avpkt->size < 0x86) { @@ -257,9 +257,9 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_init(&a->buffer, avpkt->data, avpkt->size); p->reference = 3; - if (avctx->reget_buffer(avctx, p) < 0) { + if ((ret = avctx->reget_buffer(avctx, p)) < 0) { av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } outdata = a->pic.data[0]; bytestream2_skip(&a->buffer, 4); From 01cbc6f6adf53b48088c07cbe78b8eaa2b98c298 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 18:31:20 +0100 Subject: [PATCH 3/9] targa: return meaningful error codes. --- libavcodec/targa.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/targa.c b/libavcodec/targa.c index 3bbed94dcd..54eea7df65 100644 --- a/libavcodec/targa.c +++ b/libavcodec/targa.c @@ -103,7 +103,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame * const p = &s->picture; uint8_t *dst; int stride; - int idlen, compr, y, w, h, bpp, flags; + int idlen, compr, y, w, h, bpp, flags, ret; int first_clr, colors, csize; bytestream2_init(&s->gb, avpkt->data, avpkt->size); @@ -141,19 +141,19 @@ static int decode_frame(AVCodecContext *avctx, break; default: av_log(avctx, AV_LOG_ERROR, "Bit depth %i is not supported\n", bpp); - return -1; + return AVERROR_INVALIDDATA; } if(s->picture.data[0]) avctx->release_buffer(avctx, &s->picture); - if(av_image_check_size(w, h, 0, avctx)) - return -1; + if ((ret = av_image_check_size(w, h, 0, avctx)) < 0) + return ret; if(w != avctx->width || h != avctx->height) avcodec_set_dimensions(avctx, w, h); - if(ff_get_buffer(avctx, p) < 0){ + if ((ret = ff_get_buffer(avctx, p)) < 0){ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } if(flags & 0x20){ dst = p->data[0]; @@ -167,7 +167,7 @@ static int decode_frame(AVCodecContext *avctx, int pal_size, pal_sample_size; if((colors + first_clr) > 256){ av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with offset %i\n", colors, first_clr); - return -1; + return AVERROR_INVALIDDATA; } switch (csize) { case 24: pal_sample_size = 3; break; @@ -175,7 +175,7 @@ static int decode_frame(AVCodecContext *avctx, case 15: pal_sample_size = 2; break; default: av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not supported\n", csize); - return -1; + return AVERROR_INVALIDDATA; } pal_size = colors * pal_sample_size; if(avctx->pix_fmt != AV_PIX_FMT_PAL8)//should not occur but skip palette anyway From 14cf33e957fb17959ecc3a6953022eabf2489b5b Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 18 Nov 2012 18:53:46 +0100 Subject: [PATCH 4/9] lcldec: return meaningful error codes. --- libavcodec/lcldec.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index f78401d09f..914d4b2775 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -132,7 +132,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i int zret = inflateReset(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); - return -1; + return AVERROR_UNKNOWN; } c->zstream.next_in = src; c->zstream.avail_in = src_len; @@ -141,12 +141,12 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i zret = inflate(&c->zstream, Z_FINISH); if (zret != Z_OK && zret != Z_STREAM_END) { av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); - return -1; + return AVERROR_UNKNOWN; } if (expected != (unsigned int)c->zstream.total_out) { av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n", expected, c->zstream.total_out); - return -1; + return AVERROR_UNKNOWN; } return c->zstream.total_out; } @@ -172,7 +172,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac unsigned int height = avctx->height; // Real image height unsigned int mszh_dlen; unsigned char yq, y1q, uq, vq; - int uqvq; + int uqvq, ret; unsigned int mthread_inlen, mthread_outlen; unsigned int len = buf_size; @@ -181,9 +181,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac c->pic.reference = 0; c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; - if(ff_get_buffer(avctx, &c->pic) < 0){ + if ((ret = ff_get_buffer(avctx, &c->pic)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } outptr = c->pic.data[0]; // Output image pointer @@ -202,14 +202,14 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (mthread_outlen != mszh_dlen) { av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%d != %d)\n", mthread_outlen, mszh_dlen); - return -1; + return AVERROR_INVALIDDATA; } mszh_dlen = mszh_decomp(encoded + 8 + mthread_inlen, len - 8 - mthread_inlen, c->decomp_buf + mthread_outlen, c->decomp_size - mthread_outlen); if (mthread_outlen != mszh_dlen) { av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %d)\n", mthread_outlen, mszh_dlen); - return -1; + return AVERROR_INVALIDDATA; } encoded = c->decomp_buf; len = c->decomp_size; @@ -218,7 +218,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac if (c->decomp_size != mszh_dlen) { av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %d)\n", c->decomp_size, mszh_dlen); - return -1; + return AVERROR_INVALIDDATA; } encoded = c->decomp_buf; len = mszh_dlen; @@ -249,7 +249,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac } default: av_log(avctx, AV_LOG_ERROR, "BUG! Unknown MSZH compression in frame decoder.\n"); - return -1; + return AVERROR_INVALIDDATA; } break; #if CONFIG_ZLIB_DECODER @@ -266,7 +266,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac break; } } else if (c->flags & FLAG_MULTITHREAD) { - int ret; mthread_inlen = AV_RL32(encoded); mthread_inlen = FFMIN(mthread_inlen, len - 8); mthread_outlen = AV_RL32(encoded+4); @@ -286,7 +285,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac #endif default: av_log(avctx, AV_LOG_ERROR, "BUG! Unknown codec in frame decoder compression switch.\n"); - return -1; + return AVERROR_INVALIDDATA; } @@ -370,7 +369,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac break; default: av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in pngfilter switch.\n"); - return -1; + return AVERROR_INVALIDDATA; } } @@ -458,7 +457,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac break; default: av_log(avctx, AV_LOG_ERROR, "BUG! Unknown imagetype in image decoder.\n"); - return -1; + return AVERROR_INVALIDDATA; } *got_frame = 1; From 089b3d6815a8b8f720482b907f526300d5dd7927 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 19 Nov 2012 09:21:15 +0100 Subject: [PATCH 5/9] interplayvideo: return meaningful error codes. --- libavcodec/interplayvideo.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 3f098ac31d..012df378af 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -74,11 +74,11 @@ static int copy_from(IpvideoContext *s, AVFrame *src, int delta_x, int delta_y) + delta_x * (1 + s->is_16bpp); if (motion_offset < 0) { av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset < 0 (%d)\n", motion_offset); - return -1; + return AVERROR_INVALIDDATA; } else if (motion_offset > s->upper_motion_limit_offset) { av_log(s->avctx, AV_LOG_ERROR, " Interplay video: motion offset above limit (%d >= %d)\n", motion_offset, s->upper_motion_limit_offset); - return -1; + return AVERROR_INVALIDDATA; } if (src->data[0] == NULL) { av_log(s->avctx, AV_LOG_ERROR, "Invalid decode type, corrupted header?\n"); @@ -959,6 +959,7 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; IpvideoContext *s = avctx->priv_data; + int ret; /* decoding map contains 4 bits of information per 8x8 block */ s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); @@ -973,9 +974,9 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, buf_size - s->decoding_map_size); s->current_frame.reference = 3; - if (ff_get_buffer(avctx, &s->current_frame)) { + if ((ret = ff_get_buffer(avctx, &s->current_frame)) < 0) { av_log(avctx, AV_LOG_ERROR, " Interplay Video: get_buffer() failed\n"); - return -1; + return ret; } if (!s->is_16bpp) { From 3d973e461be66d9fcfa8ab68e14fdddf16a7dd69 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 19 Nov 2012 10:09:54 +0100 Subject: [PATCH 6/9] interplayvideo: remove a static variable. --- libavcodec/interplayvideo.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index 012df378af..76e7d0fe41 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -882,12 +882,8 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) int x, y; unsigned char opcode; int ret; - static int frame = 0; GetBitContext gb; - av_dlog(NULL, "------------------ frame %d\n", frame); - frame++; - bytestream2_skip(&s->stream_ptr, 14); /* data starts 14 bytes in */ if (!s->is_16bpp) { /* this is PAL8, so make the palette available */ @@ -923,7 +919,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) } if (ret != 0) { av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode problem on frame %d, @ block (%d, %d)\n", - frame, x, y); + s->avctx->frame_number, x, y); return; } } From 048ffb9bb26f30f1995400b8cd3809221ba03441 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 19 Nov 2012 10:30:01 +0100 Subject: [PATCH 7/9] gifdec: return meaningful error codes. --- libavcodec/gifdec.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 8f1d6941bc..2a962e5de0 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -207,13 +207,13 @@ static int gif_read_header1(GifState *s) int has_global_palette; if (s->bytestream_end < s->bytestream + 13) - return -1; + return AVERROR_INVALIDDATA; /* read gif signature */ bytestream_get_buffer(&s->bytestream, sig, 6); if (memcmp(sig, gif87a_sig, 6) != 0 && memcmp(sig, gif89a_sig, 6) != 0) - return -1; + return AVERROR_INVALIDDATA; /* read screen header */ s->transparent_color_index = -1; @@ -222,7 +222,7 @@ static int gif_read_header1(GifState *s) if( (unsigned)s->screen_width > 32767 || (unsigned)s->screen_height > 32767){ av_log(NULL, AV_LOG_ERROR, "picture size too large\n"); - return -1; + return AVERROR_INVALIDDATA; } v = bytestream_get_byte(&s->bytestream); @@ -239,7 +239,7 @@ static int gif_read_header1(GifState *s) if (has_global_palette) { n = 1 << s->bits_per_pixel; if (s->bytestream_end < s->bytestream + n * 3) - return -1; + return AVERROR_INVALIDDATA; bytestream_get_buffer(&s->bytestream, s->global_palette, n * 3); } return 0; @@ -249,6 +249,7 @@ static int gif_parse_next_image(GifState *s) { while (s->bytestream < s->bytestream_end) { int code = bytestream_get_byte(&s->bytestream); + int ret; av_dlog(s->avctx, "gif: code=%02x '%c'\n", code, code); @@ -256,17 +257,17 @@ static int gif_parse_next_image(GifState *s) case ',': return gif_read_image(s); case '!': - if (gif_read_extension(s) < 0) - return -1; + if ((ret = gif_read_extension(s)) < 0) + return ret; break; case ';': /* end of image */ default: /* error or erroneous EOF */ - return -1; + return AVERROR_INVALIDDATA; } } - return -1; + return AVERROR_INVALIDDATA; } static av_cold int gif_decode_init(AVCodecContext *avctx) @@ -293,19 +294,19 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, s->bytestream = buf; s->bytestream_end = buf + buf_size; - if (gif_read_header1(s) < 0) - return -1; + if ((ret = gif_read_header1(s)) < 0) + return ret; avctx->pix_fmt = AV_PIX_FMT_PAL8; - if (av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) - return -1; + if ((ret = av_image_check_size(s->screen_width, s->screen_height, 0, avctx)) < 0) + return ret; avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); if (s->picture.data[0]) avctx->release_buffer(avctx, &s->picture); - if (ff_get_buffer(avctx, &s->picture) < 0) { + if ((ret = ff_get_buffer(avctx, &s->picture)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } s->image_palette = (uint32_t *)s->picture.data[1]; ret = gif_parse_next_image(s); From 8f17829455308c9c988149d9c895913bf9e8af60 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 19 Nov 2012 10:33:54 +0100 Subject: [PATCH 8/9] qtrle: return a meaningful error code. --- libavcodec/qtrle.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 02091d04bf..32ad5d66b7 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -389,14 +389,15 @@ static int qtrle_decode_frame(AVCodecContext *avctx, int header, start_line; int height, row_ptr; int has_palette = 0; + int ret; bytestream2_init(&s->g, avpkt->data, avpkt->size); s->frame.reference = 1; s->frame.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE | FF_BUFFER_HINTS_REUSABLE | FF_BUFFER_HINTS_READABLE; - if (avctx->reget_buffer(avctx, &s->frame)) { + if ((ret = avctx->reget_buffer(avctx, &s->frame)) < 0) { av_log (s->avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return -1; + return ret; } /* check if this frame is even supposed to change */ From 688b132b881d423877e38dc82f17e23a604be676 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 19 Nov 2012 10:38:03 +0100 Subject: [PATCH 9/9] qdrw: return meaningful error codes. --- libavcodec/qdrw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index ca982f340d..e7337a5766 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -45,7 +45,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame * const p = &a->pic; uint8_t* outdata; int colors; - int i; + int i, ret; uint32_t *pal; int r, g, b; @@ -53,9 +53,9 @@ static int decode_frame(AVCodecContext *avctx, avctx->release_buffer(avctx, p); p->reference= 0; - if(ff_get_buffer(avctx, p) < 0){ + if ((ret = ff_get_buffer(avctx, p)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } p->pict_type= AV_PICTURE_TYPE_I; p->key_frame= 1; @@ -70,7 +70,7 @@ static int decode_frame(AVCodecContext *avctx, if(colors < 0 || colors > 256) { av_log(avctx, AV_LOG_ERROR, "Error color count - %i(0x%X)\n", colors, colors); - return -1; + return AVERROR_INVALIDDATA; } if (buf_end - buf < (colors + 1) * 8) return AVERROR_INVALIDDATA;