From 80344261aa347423eeecfead5365788b336de962 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 07:06:01 +0100 Subject: [PATCH 1/4] fraps: cosmetics, reformat --- libavcodec/fraps.c | 100 +++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 48 deletions(-) diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c index 56153d1e54..5473bd8b76 100644 --- a/libavcodec/fraps.c +++ b/libavcodec/fraps.c @@ -42,7 +42,7 @@ /** * local variable storage */ -typedef struct FrapsContext{ +typedef struct FrapsContext { AVCodecContext *avctx; AVFrame frame; uint8_t *tmpbuf; @@ -61,9 +61,9 @@ static av_cold int decode_init(AVCodecContext *avctx) FrapsContext * const s = avctx->priv_data; avctx->coded_frame = &s->frame; - avctx->pix_fmt= AV_PIX_FMT_NONE; /* set in decode_frame */ + avctx->pix_fmt = AV_PIX_FMT_NONE; /* set in decode_frame */ - s->avctx = avctx; + s->avctx = avctx; s->tmpbuf = NULL; ff_dsputil_init(&s->dsp, avctx); @@ -75,7 +75,8 @@ static av_cold int decode_init(AVCodecContext *avctx) * Comparator - our nodes should ascend by count * but with preserved symbol order */ -static int huff_cmp(const void *va, const void *vb){ +static int huff_cmp(const void *va, const void *vb) +{ const Node *a = va, *b = vb; return (a->count - b->count)*256 + a->sym - b->sym; } @@ -92,7 +93,7 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, VLC vlc; Node nodes[512]; - for(i = 0; i < 256; i++) + for (i = 0; i < 256; i++) nodes[i].count = bytestream_get_le32(&src); size -= 1024; if ((ret = ff_huff_build_tree(s->avctx, &vlc, 256, nodes, huff_cmp, @@ -104,14 +105,16 @@ static int fraps2_decode_plane(FrapsContext *s, uint8_t *dst, int stride, int w, s->dsp.bswap_buf((uint32_t *)s->tmpbuf, (const uint32_t *)src, size >> 2); init_get_bits(&gb, s->tmpbuf, size * 8); - for(j = 0; j < h; j++){ - for(i = 0; i < w*step; i += step){ + for (j = 0; j < h; j++) { + for (i = 0; i < w*step; i += step) { dst[i] = get_vlc2(&gb, vlc.table, 9, 3); /* lines are stored as deltas between previous lines * and we need to add 0x80 to the first lines of chroma planes */ - if(j) dst[i] += dst[i - stride]; - else if(Uoff) dst[i] += 0x80; + if (j) + dst[i] += dst[i - stride]; + else if (Uoff) + dst[i] += 0x80; if (get_bits_left(&gb) < 0) { ff_free_vlc(&vlc); return AVERROR_INVALIDDATA; @@ -127,11 +130,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; FrapsContext * const s = avctx->priv_data; - AVFrame *frame = data; - AVFrame * const f = &s->frame; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; + AVFrame *frame = data; + AVFrame * const f = &s->frame; uint32_t header; unsigned int version,header_size; unsigned int x, y; @@ -141,8 +144,8 @@ static int decode_frame(AVCodecContext *avctx, int i, j, ret, is_chroma, planes; enum AVPixelFormat pix_fmt; - header = AV_RL32(buf); - version = header & 0xff; + header = AV_RL32(buf); + version = header & 0xff; header_size = (header & (1<<30))? 8 : 4; /* bit 30 means pad to 8 bytes */ if (version > 5) { @@ -152,9 +155,9 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - buf+=4; + buf += 4; if (header_size == 8) - buf+=4; + buf += 4; pix_fmt = version & 1 ? AV_PIX_FMT_BGR24 : AV_PIX_FMT_YUVJ420P; if (avctx->pix_fmt != pix_fmt && f->data[0]) { @@ -162,19 +165,20 @@ static int decode_frame(AVCodecContext *avctx, } avctx->pix_fmt = pix_fmt; - switch(version) { + switch (version) { case 0: default: /* Fraps v0 is a reordered YUV420 */ - if ( (buf_size != avctx->width*avctx->height*3/2+header_size) && - (buf_size != header_size) ) { + if ((buf_size != avctx->width * avctx->height * 3 / 2 + header_size) && + (buf_size != header_size)) { av_log(avctx, AV_LOG_ERROR, "Invalid frame length %d (should be %d)\n", - buf_size, avctx->width*avctx->height*3/2+header_size); + buf_size, + avctx->width * avctx->height * 3 / 2 + header_size); return AVERROR_INVALIDDATA; } - if (( (avctx->width % 8) != 0) || ( (avctx->height % 2) != 0 )) { + if (((avctx->width % 8) != 0) || ((avctx->height % 2) != 0)) { av_log(avctx, AV_LOG_ERROR, "Invalid frame size %dx%d\n", avctx->width, avctx->height); return AVERROR_INVALIDDATA; @@ -189,17 +193,17 @@ static int decode_frame(AVCodecContext *avctx, return ret; } /* bit 31 means same as previous pic */ - f->pict_type = (header & (1U<<31))? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; + f->pict_type = (header & (1U << 31)) ? AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_I; f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; if (f->pict_type == AV_PICTURE_TYPE_I) { - buf32=(const uint32_t*)buf; - for(y=0; yheight/2; y++){ - luma1=(uint32_t*)&f->data[0][ y*2*f->linesize[0] ]; - luma2=(uint32_t*)&f->data[0][ (y*2+1)*f->linesize[0] ]; - cr=(uint32_t*)&f->data[1][ y*f->linesize[1] ]; - cb=(uint32_t*)&f->data[2][ y*f->linesize[2] ]; - for(x=0; xwidth; x+=8){ + buf32 = (const uint32_t*)buf; + for (y = 0; y < avctx->height / 2; y++) { + luma1 = (uint32_t*)&f->data[0][ y * 2 * f->linesize[0]]; + luma2 = (uint32_t*)&f->data[0][(y * 2 + 1) * f->linesize[0]]; + cr = (uint32_t*)&f->data[1][ y * f->linesize[1]]; + cb = (uint32_t*)&f->data[2][ y * f->linesize[2]]; + for (x = 0; x < avctx->width; x += 8) { *(luma1++) = *(buf32++); *(luma1++) = *(buf32++); *(luma2++) = *(buf32++); @@ -213,11 +217,11 @@ static int decode_frame(AVCodecContext *avctx, case 1: /* Fraps v1 is an upside-down BGR24 */ - if ( (buf_size != avctx->width*avctx->height*3+header_size) && - (buf_size != header_size) ) { + if ((buf_size != avctx->width * avctx->height * 3 + header_size) && + (buf_size != header_size) ) { av_log(avctx, AV_LOG_ERROR, "Invalid frame length %d (should be %d)\n", - buf_size, avctx->width*avctx->height*3+header_size); + buf_size, avctx->width * avctx->height * 3 + header_size); return AVERROR_INVALIDDATA; } @@ -234,10 +238,10 @@ static int decode_frame(AVCodecContext *avctx, f->key_frame = f->pict_type == AV_PICTURE_TYPE_I; if (f->pict_type == AV_PICTURE_TYPE_I) { - for(y=0; yheight; y++) - memcpy(&f->data[0][ (avctx->height-y)*f->linesize[0] ], - &buf[y*avctx->width*3], - 3*avctx->width); + for (y = 0; yheight; y++) + memcpy(&f->data[0][(avctx->height - y) * f->linesize[0]], + &buf[y * avctx->width * 3], + 3 * avctx->width); } break; @@ -257,26 +261,26 @@ static int decode_frame(AVCodecContext *avctx, return ret; } /* skip frame */ - if(buf_size == 8) { + if (buf_size == 8) { f->pict_type = AV_PICTURE_TYPE_P; f->key_frame = 0; break; } f->pict_type = AV_PICTURE_TYPE_I; f->key_frame = 1; - if ((AV_RL32(buf) != FPS_TAG)||(buf_size < (planes*1024 + 24))) { + if ((AV_RL32(buf) != FPS_TAG) || (buf_size < (planes * 1024 + 24))) { av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); return AVERROR_INVALIDDATA; } - for(i = 0; i < planes; i++) { + for (i = 0; i < planes; i++) { offs[i] = AV_RL32(buf + 4 + i * 4); - if(offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) { + if (offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) { av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i); return AVERROR_INVALIDDATA; } } offs[planes] = buf_size; - for(i = 0; i < planes; i++){ + for (i = 0; i < planes; i++) { is_chroma = !!i; av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024); @@ -305,7 +309,7 @@ static int decode_frame(AVCodecContext *avctx, return ret; } /* skip frame */ - if(buf_size == 8) { + if (buf_size == 8) { f->pict_type = AV_PICTURE_TYPE_P; f->key_frame = 0; break; @@ -316,15 +320,15 @@ static int decode_frame(AVCodecContext *avctx, av_log(avctx, AV_LOG_ERROR, "Fraps: error in data stream\n"); return AVERROR_INVALIDDATA; } - for(i = 0; i < planes; i++) { + for (i = 0; i < planes; i++) { offs[i] = AV_RL32(buf + 4 + i * 4); - if(offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) { + if (offs[i] >= buf_size || (i && offs[i] <= offs[i - 1] + 1024)) { av_log(avctx, AV_LOG_ERROR, "Fraps: plane %i offset is out of bounds\n", i); return AVERROR_INVALIDDATA; } } offs[planes] = buf_size; - for(i = 0; i < planes; i++){ + for (i = 0; i < planes; i++) { av_fast_padded_malloc(&s->tmpbuf, &s->tmpbuf_size, offs[i + 1] - offs[i] - 1024); if (!s->tmpbuf) @@ -337,8 +341,8 @@ static int decode_frame(AVCodecContext *avctx, } } // convert pseudo-YUV into real RGB - for(j = 0; j < avctx->height; j++){ - for(i = 0; i < avctx->width; i++){ + for (j = 0; j < avctx->height; j++) { + for (i = 0; i < avctx->width; i++) { f->data[0][0 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]]; f->data[0][2 + i*3 + j*f->linesize[0]] += f->data[0][1 + i*3 + j*f->linesize[0]]; } From 7c8fceef6cea96681b6a2e52853e789f20a05dbf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 07:32:09 +0100 Subject: [PATCH 2/4] cljr: return a meaningful error code. --- libavcodec/cljr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 9ba513845b..5168d34571 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -53,7 +53,7 @@ static int decode_frame(AVCodecContext *avctx, GetBitContext gb; AVFrame *picture = data; AVFrame * const p = &a->picture; - int x, y; + int x, y, ret; if (p->data[0]) avctx->release_buffer(avctx, p); @@ -70,9 +70,9 @@ static int decode_frame(AVCodecContext *avctx, } 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; From 126abaaaae7926cbac9fcc37fd897102ecc3bfa3 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 07:37:08 +0100 Subject: [PATCH 3/4] rl2: return meaningful error codes. --- libavcodec/rl2.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index c9eb93eb62..da60e2493a 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -140,7 +140,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) /** parse extra data */ if(!avctx->extradata || avctx->extradata_size < EXTRADATA1_SIZE){ av_log(avctx, AV_LOG_ERROR, "invalid extradata size\n"); - return -1; + return AVERROR(EINVAL); } /** get frame_offset */ @@ -149,7 +149,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) if(s->video_base >= avctx->width * avctx->height){ av_log(avctx, AV_LOG_ERROR, "invalid video_base\n"); - return -1; + return AVERROR_INVALIDDATA; } /** initialize palette */ @@ -162,7 +162,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) if(back_size > 0){ unsigned char* back_frame = av_mallocz(avctx->width*avctx->height); if(!back_frame) - return -1; + return AVERROR(ENOMEM); rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size, back_frame,avctx->width,0); s->back_frame = back_frame; @@ -176,7 +176,7 @@ static int rl2_decode_frame(AVCodecContext *avctx, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + int ret, buf_size = avpkt->size; Rl2Context *s = avctx->priv_data; if(s->frame.data[0]) @@ -184,9 +184,9 @@ static int rl2_decode_frame(AVCodecContext *avctx, /** get buffer */ s->frame.reference= 0; - if(ff_get_buffer(avctx, &s->frame)) { + if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } /** run length decode */ From 3c6e5a840c45fd3b832e86881602a72e47d46f19 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 17 Nov 2012 07:40:45 +0100 Subject: [PATCH 4/4] rl2: use fixed-width integer types where appropriate --- libavcodec/rl2.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c index da60e2493a..a368e6b470 100644 --- a/libavcodec/rl2.c +++ b/libavcodec/rl2.c @@ -43,10 +43,10 @@ typedef struct Rl2Context { AVCodecContext *avctx; AVFrame frame; - unsigned short video_base; ///< initial drawing offset - unsigned int clr_count; ///< number of used colors (currently unused) - unsigned char* back_frame; ///< background frame - unsigned int palette[AVPALETTE_COUNT]; + uint16_t video_base; ///< initial drawing offset + uint32_t clr_count; ///< number of used colors (currently unused) + uint8_t *back_frame; ///< background frame + uint32_t palette[AVPALETTE_COUNT]; } Rl2Context; /** @@ -58,16 +58,17 @@ typedef struct Rl2Context { * @param stride stride of the output buffer * @param video_base offset of the rle data inside the frame */ -static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size, - unsigned char* out,int stride,int video_base){ +static void rl2_rle_decode(Rl2Context *s, const uint8_t *in, int size, + uint8_t *out, int stride, int video_base) +{ int base_x = video_base % s->avctx->width; int base_y = video_base / s->avctx->width; int stride_adj = stride - s->avctx->width; int i; - const unsigned char* back_frame = s->back_frame; - const unsigned char* in_end = in + size; - const unsigned char* out_end = out + stride * s->avctx->height; - unsigned char* line_end; + const uint8_t *back_frame = s->back_frame; + const uint8_t *in_end = in + size; + const uint8_t *out_end = out + stride * s->avctx->height; + uint8_t *line_end; /** copy start of the background frame */ for(i=0;i<=base_y;i++){ @@ -82,7 +83,7 @@ static void rl2_rle_decode(Rl2Context *s,const unsigned char* in,int size, /** decode the variable part of the frame */ while(in < in_end){ - unsigned char val = *in++; + uint8_t val = *in++; int len = 1; if(val >= 0x80){ if(in >= in_end) @@ -160,7 +161,7 @@ static av_cold int rl2_decode_init(AVCodecContext *avctx) back_size = avctx->extradata_size - EXTRADATA1_SIZE; if(back_size > 0){ - unsigned char* back_frame = av_mallocz(avctx->width*avctx->height); + uint8_t *back_frame = av_mallocz(avctx->width*avctx->height); if(!back_frame) return AVERROR(ENOMEM); rl2_rle_decode(s,avctx->extradata + EXTRADATA1_SIZE,back_size,