From 8adfacff5c4533660b161dc25db144487a07ff39 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 15 Nov 2012 18:24:29 +0100 Subject: zmbv: remove some pointless comments and empty lines --- libavcodec/zmbv.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index 761974c902..0733fa70d4 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -606,13 +606,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac return buf_size; } - - -/* - * - * Init zmbv decoder - * - */ static av_cold int decode_init(AVCodecContext *avctx) { ZmbvContext * const c = avctx->priv_data; @@ -652,13 +645,6 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } - - -/* - * - * Uninit zmbv decoder - * - */ static av_cold int decode_end(AVCodecContext *avctx) { ZmbvContext * const c = avctx->priv_data; -- cgit v1.2.3 From 261f0b14ed81e34a07d20cabf24f367db8fbfc54 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 15 Nov 2012 20:42:22 +0100 Subject: zerocodec: remove an unused variable. --- libavcodec/zerocodec.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c index cba3198473..8122cca3b2 100644 --- a/libavcodec/zerocodec.c +++ b/libavcodec/zerocodec.c @@ -25,7 +25,6 @@ typedef struct { AVFrame previous_frame; z_stream zstream; - int size; } ZeroCodecContext; static int zerocodec_decode_frame(AVCodecContext *avctx, void *data, @@ -136,9 +135,6 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx) avctx->pix_fmt = AV_PIX_FMT_UYVY422; avctx->bits_per_raw_sample = 8; - zc->size = avpicture_get_size(avctx->pix_fmt, - avctx->width, avctx->height); - zstream->zalloc = Z_NULL; zstream->zfree = Z_NULL; zstream->opaque = Z_NULL; -- cgit v1.2.3 From 99e36ddd3ee57c38e6ca9e240ba518848487f849 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 15 Nov 2012 14:24:51 +0100 Subject: ansi: do not depend on get_buffer() initializing the frame. The background changes from 128 (used by the default/cmdutils get_buffer()) to 0. This looks more correct. --- libavcodec/ansi.c | 5 +++++ tests/ref/fate/ansi | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index c2a1d83974..861d4e57e4 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -325,6 +325,11 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } + if (!avctx->frame_number) { + memset(s->frame.data[0], 0, avctx->height * FFABS(s->frame.linesize[0])); + memset(s->frame.data[1], 0, AVPALETTE_SIZE); + } + s->frame.pict_type = AV_PICTURE_TYPE_I; s->frame.palette_has_changed = 1; memcpy(s->frame.data[1], ff_cga_palette, 16 * 4); diff --git a/tests/ref/fate/ansi b/tests/ref/fate/ansi index 56c0226095..78e853fc0b 100644 --- a/tests/ref/fate/ansi +++ b/tests/ref/fate/ansi @@ -1,7 +1,7 @@ #tb 0: 1/25 -0, 0, 0, 1, 768000, 0x3032d0de -0, 1, 1, 1, 768000, 0xc3be5922 -0, 2, 2, 1, 768000, 0xf530c476 +0, 0, 0, 1, 768000, 0x772dd3d0 +0, 1, 1, 1, 768000, 0xd7dab1d1 +0, 2, 2, 1, 768000, 0x0e56f2d3 0, 3, 3, 1, 768000, 0x11c1fb8e 0, 4, 4, 1, 768000, 0x72d12da9 0, 5, 5, 1, 768000, 0x39c7a70d -- cgit v1.2.3 From 51648da4dc7ab9f3d04960c13a4db5c1975e5fc6 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 16 Nov 2012 06:40:14 +0100 Subject: xan: remove a trivially true if(). This function used to be shared with the xxan decoder, but that is not true anymore. --- libavcodec/xan.c | 99 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/xan.c b/libavcodec/xan.c index f036d78eb8..8c90bb6ab0 100644 --- a/libavcodec/xan.c +++ b/libavcodec/xan.c @@ -499,62 +499,61 @@ static int xan_decode_frame(AVCodecContext *avctx, const uint8_t *buf = avpkt->data; int ret, buf_size = avpkt->size; XanContext *s = avctx->priv_data; - - if (avctx->codec->id == AV_CODEC_ID_XAN_WC3) { - const uint8_t *buf_end = buf + buf_size; - int tag = 0; - while (buf_end - buf > 8 && tag != VGA__TAG) { - unsigned *tmpptr; - uint32_t new_pal; - int size; - int i; - tag = bytestream_get_le32(&buf); - size = bytestream_get_be32(&buf); - size = FFMIN(size, buf_end - buf); - switch (tag) { - case PALT_TAG: - if (size < PALETTE_SIZE) - return AVERROR_INVALIDDATA; - if (s->palettes_count >= PALETTES_MAX) - return AVERROR_INVALIDDATA; - tmpptr = av_realloc(s->palettes, - (s->palettes_count + 1) * AVPALETTE_SIZE); - if (!tmpptr) - return AVERROR(ENOMEM); - s->palettes = tmpptr; - tmpptr += s->palettes_count * AVPALETTE_COUNT; - for (i = 0; i < PALETTE_COUNT; i++) { + const uint8_t *buf_end = buf + buf_size; + int tag = 0; + + while (buf_end - buf > 8 && tag != VGA__TAG) { + unsigned *tmpptr; + uint32_t new_pal; + int size; + int i; + tag = bytestream_get_le32(&buf); + size = bytestream_get_be32(&buf); + size = FFMIN(size, buf_end - buf); + switch (tag) { + case PALT_TAG: + if (size < PALETTE_SIZE) + return AVERROR_INVALIDDATA; + if (s->palettes_count >= PALETTES_MAX) + return AVERROR_INVALIDDATA; + tmpptr = av_realloc(s->palettes, + (s->palettes_count + 1) * AVPALETTE_SIZE); + if (!tmpptr) + return AVERROR(ENOMEM); + s->palettes = tmpptr; + tmpptr += s->palettes_count * AVPALETTE_COUNT; + for (i = 0; i < PALETTE_COUNT; i++) { #if RUNTIME_GAMMA - int r = gamma_corr(*buf++); - int g = gamma_corr(*buf++); - int b = gamma_corr(*buf++); + int r = gamma_corr(*buf++); + int g = gamma_corr(*buf++); + int b = gamma_corr(*buf++); #else - int r = gamma_lookup[*buf++]; - int g = gamma_lookup[*buf++]; - int b = gamma_lookup[*buf++]; + int r = gamma_lookup[*buf++]; + int g = gamma_lookup[*buf++]; + int b = gamma_lookup[*buf++]; #endif - *tmpptr++ = (r << 16) | (g << 8) | b; - } - s->palettes_count++; - break; - case SHOT_TAG: - if (size < 4) - return AVERROR_INVALIDDATA; - new_pal = bytestream_get_le32(&buf); - if (new_pal < s->palettes_count) { - s->cur_palette = new_pal; - } else - av_log(avctx, AV_LOG_ERROR, "Invalid palette selected\n"); - break; - case VGA__TAG: - break; - default: - buf += size; - break; + *tmpptr++ = (r << 16) | (g << 8) | b; } + s->palettes_count++; + break; + case SHOT_TAG: + if (size < 4) + return AVERROR_INVALIDDATA; + new_pal = bytestream_get_le32(&buf); + if (new_pal < s->palettes_count) { + s->cur_palette = new_pal; + } else + av_log(avctx, AV_LOG_ERROR, "Invalid palette selected\n"); + break; + case VGA__TAG: + break; + default: + buf += size; + break; } - buf_size = buf_end - buf; } + buf_size = buf_end - buf; + if (s->palettes_count <= 0) { av_log(s->avctx, AV_LOG_ERROR, "No palette found\n"); return AVERROR_INVALIDDATA; -- cgit v1.2.3 From 0a9132b84c0590500bb3d6b358219323805993fc Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 16 Nov 2012 18:42:16 +0100 Subject: wnv1: cosmetics, reformat --- libavcodec/wnv1.c | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 9021ec6a62..1636f16510 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -30,7 +30,7 @@ #include "mathops.h" -typedef struct WNV1Context{ +typedef struct WNV1Context { AVCodecContext *avctx; AVFrame pic; @@ -38,10 +38,10 @@ typedef struct WNV1Context{ GetBitContext gb; } WNV1Context; -static const uint16_t code_tab[16][2]={ -{0x1FD,9}, {0xFD,8}, {0x7D,7}, {0x3D,6}, {0x1D,5}, {0x0D,4}, {0x005,3}, -{0x000,1}, -{0x004,3}, {0x0C,4}, {0x1C,5}, {0x3C,6}, {0x7C,7}, {0xFC,8}, {0x1FC,9}, {0xFF,8} +static const uint16_t code_tab[16][2] = { + { 0x1FD, 9 }, { 0xFD, 8 }, { 0x7D, 7 }, { 0x3D, 6 }, { 0x1D, 5 }, { 0x0D, 4 }, { 0x005, 3 }, + { 0x000, 1 }, + { 0x004, 3 }, { 0x0C, 4 }, { 0x1C, 5 }, { 0x3C, 6 }, { 0x7C, 7 }, { 0xFC, 8 }, { 0x1FC, 9 }, { 0xFF, 8 } }; #define CODE_VLC_BITS 9 @@ -52,32 +52,32 @@ static inline int wnv1_get_code(WNV1Context *w, int base_value) { int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1); - if(v==15) - return ff_reverse[ get_bits(&w->gb, 8 - w->shift) ]; + if (v == 15) + return ff_reverse[get_bits(&w->gb, 8 - w->shift)]; else - return base_value + ((v - 7)<shift); + return base_value + ((v - 7) << w->shift); } static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; WNV1Context * const l = avctx->priv_data; - AVFrame * const p = &l->pic; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + AVFrame * const p = &l->pic; unsigned char *Y,*U,*V; int i, j; int prev_y = 0, prev_u = 0, prev_v = 0; uint8_t *rbuf; rbuf = av_malloc(buf_size + FF_INPUT_BUFFER_PADDING_SIZE); - if(!rbuf){ + if (!rbuf) { av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer\n"); return -1; } - if(p->data[0]) + if (p->data[0]) avctx->release_buffer(avctx, p); p->reference = 0; @@ -88,9 +88,9 @@ static int decode_frame(AVCodecContext *avctx, } p->key_frame = 1; - for(i=8; igb, rbuf+8, (buf_size-8)*8); + for (i = 8; i < buf_size; i++) + rbuf[i] = ff_reverse[buf[i]]; + init_get_bits(&l->gb, rbuf + 8, (buf_size - 8) * 8); if (buf[2] >> 4 == 6) l->shift = 2; @@ -131,14 +131,15 @@ static int decode_frame(AVCodecContext *avctx, return buf_size; } -static av_cold int decode_init(AVCodecContext *avctx){ +static av_cold int decode_init(AVCodecContext *avctx) +{ WNV1Context * const l = avctx->priv_data; static VLC_TYPE code_table[1 << CODE_VLC_BITS][2]; - l->avctx = avctx; + l->avctx = avctx; avctx->pix_fmt = AV_PIX_FMT_YUV422P; - code_vlc.table = code_table; + code_vlc.table = code_table; code_vlc.table_allocated = 1 << CODE_VLC_BITS; init_vlc(&code_vlc, CODE_VLC_BITS, 16, &code_tab[0][1], 4, 2, @@ -147,7 +148,8 @@ static av_cold int decode_init(AVCodecContext *avctx){ return 0; } -static av_cold int decode_end(AVCodecContext *avctx){ +static av_cold int decode_end(AVCodecContext *avctx) +{ WNV1Context * const l = avctx->priv_data; AVFrame *pic = &l->pic; -- cgit v1.2.3