diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 18:24:05 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 18:29:42 +0400 |
commit | a00d4c5956e178296c31a631679618be4910ba5a (patch) | |
tree | dd8c4ae7365165403d572b50aefa8f916e968688 /libavcodec/pngdec.c | |
parent | b361a0bf1fbbfa3d090e6d8db5aca6cbed8260b3 (diff) | |
parent | c598b569fb3d1f4b6c4868fe64f6989254df5186 (diff) |
Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pngdec.c')
-rw-r--r-- | libavcodec/pngdec.c | 186 |
1 files changed, 96 insertions, 90 deletions
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 985517d88d..fd771fc946 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -85,8 +85,8 @@ static const uint8_t png_pass_dsp_mask[NB_PASSES] = { }; /* NOTE: we try to construct a good looking image at each pass. width - is the original image width. We also do pixel format conversion at - this stage */ + * is the original image width. We also do pixel format conversion at + * this stage */ static void png_put_interlaced_row(uint8_t *dst, int width, int bits_per_pixel, int pass, int color_type, const uint8_t *src) @@ -157,7 +157,8 @@ static void png_put_interlaced_row(uint8_t *dst, int width, } } -void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w, int bpp) +void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, + int w, int bpp) { int i; for (i = 0; i < w; i++) { @@ -184,29 +185,35 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, int w } } -#define UNROLL1(bpp, op) {\ - r = dst[0];\ - if(bpp >= 2) g = dst[1];\ - if(bpp >= 3) b = dst[2];\ - if(bpp >= 4) a = dst[3];\ - for(; i <= size - bpp; i+=bpp) {\ - dst[i+0] = r = op(r, src[i+0], last[i+0]);\ - if(bpp == 1) continue;\ - dst[i+1] = g = op(g, src[i+1], last[i+1]);\ - if(bpp == 2) continue;\ - dst[i+2] = b = op(b, src[i+2], last[i+2]);\ - if(bpp == 3) continue;\ - dst[i+3] = a = op(a, src[i+3], last[i+3]);\ - }\ +#define UNROLL1(bpp, op) { \ + r = dst[0]; \ + if (bpp >= 2) \ + g = dst[1]; \ + if (bpp >= 3) \ + b = dst[2]; \ + if (bpp >= 4) \ + a = dst[3]; \ + for (; i <= size - bpp; i += bpp) { \ + dst[i + 0] = r = op(r, src[i + 0], last[i + 0]); \ + if (bpp == 1) \ + continue; \ + dst[i + 1] = g = op(g, src[i + 1], last[i + 1]); \ + if (bpp == 2) \ + continue; \ + dst[i + 2] = b = op(b, src[i + 2], last[i + 2]); \ + if (bpp == 3) \ + continue; \ + dst[i + 3] = a = op(a, src[i + 3], last[i + 3]); \ + } \ } #define UNROLL_FILTER(op)\ - if(bpp == 1) UNROLL1(1, op)\ - else if(bpp == 2) UNROLL1(2, op)\ - else if(bpp == 3) UNROLL1(3, op)\ - else if(bpp == 4) UNROLL1(4, op)\ + if (bpp == 1) UNROLL1(1, op)\ + else if (bpp == 2) UNROLL1(2, op)\ + else if (bpp == 3) UNROLL1(3, op)\ + else if (bpp == 4) UNROLL1(4, op)\ for (; i < size; i++) {\ - dst[i] = op(dst[i-bpp], src[i], last[i]);\ + dst[i] = op(dst[i - bpp], src[i], last[i]);\ }\ /* NOTE: 'dst' can be equal to 'last' */ @@ -220,18 +227,17 @@ static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type, memcpy(dst, src, size); break; case PNG_FILTER_VALUE_SUB: - for (i = 0; i < bpp; i++) { + for (i = 0; i < bpp; i++) dst[i] = src[i]; - } if (bpp == 4) { - p = *(int*)dst; + p = *(int *)dst; for (; i < size; i += bpp) { - unsigned s = *(int*)(src + i); + unsigned s = *(int *)(src + i); p = ((s & 0x7f7f7f7f) + (p & 0x7f7f7f7f)) ^ ((s ^ p) & 0x80808080); - *(int*)(dst + i) = p; + *(int *)(dst + i) = p; } } else { -#define OP_SUB(x,s,l) x+s +#define OP_SUB(x, s, l) x + s UNROLL_FILTER(OP_SUB); } break; @@ -240,19 +246,20 @@ static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type, break; case PNG_FILTER_VALUE_AVG: for (i = 0; i < bpp; i++) { - p = (last[i] >> 1); + p = (last[i] >> 1); dst[i] = p + src[i]; } -#define OP_AVG(x,s,l) (((x + l) >> 1) + s) & 0xff +#define OP_AVG(x, s, l) (((x + l) >> 1) + s) & 0xff UNROLL_FILTER(OP_AVG); break; case PNG_FILTER_VALUE_PAETH: for (i = 0; i < bpp; i++) { - p = last[i]; + p = last[i]; dst[i] = p + src[i]; } if (bpp > 2 && size > 4) { - // would write off the end of the array if we let it process the last pixel with bpp=3 + /* would write off the end of the array if we let it process + * the last pixel with bpp=3 */ int w = bpp == 4 ? size : size - 3; dsp->add_paeth_prediction(dst + i, src + i, last + i, w - i, bpp); i = w; @@ -269,9 +276,9 @@ static void deloco_ ## NAME(TYPE *dst, int size, int alpha) \ { \ int i; \ for (i = 0; i < size; i += 3 + alpha) { \ - int g = dst [i+1]; \ - dst[i+0] += g; \ - dst[i+2] += g; \ + int g = dst [i + 1]; \ + dst[i + 0] += g; \ + dst[i + 2] += g; \ } \ } @@ -322,12 +329,12 @@ static void png_handle_row(PNGDecContext *s) ptr = s->image_buf + s->image_linesize * s->y; if ((ff_png_pass_ymask[s->pass] << (s->y & 7)) & 0x80) { /* if we already read one row, it is time to stop to - wait for the next one */ + * wait for the next one */ if (got_line) break; png_filter_row(&s->dsp, s->tmp_row, s->crow_buf[0], s->crow_buf + 1, s->last_row, s->pass_row_size, s->bpp); - FFSWAP(uint8_t*, s->last_row, s->tmp_row); + FFSWAP(uint8_t *, s->last_row, s->tmp_row); FFSWAP(unsigned int, s->last_row_size, s->tmp_row_size); got_line = 1; } @@ -346,8 +353,8 @@ static void png_handle_row(PNGDecContext *s) s->pass++; s->y = 0; s->pass_row_size = ff_png_pass_row_size(s->pass, - s->bits_per_pixel, - s->width); + s->bits_per_pixel, + s->width); s->crow_size = s->pass_row_size + 1; if (s->pass_row_size != 0) break; @@ -356,7 +363,7 @@ static void png_handle_row(PNGDecContext *s) } } } - the_end: ; +the_end:; } } @@ -382,7 +389,8 @@ static int png_decode_idat(PNGDecContext *s, int length) s->zstream.next_out = s->crow_buf; } if (ret == Z_STREAM_END && s->zstream.avail_in > 0) { - av_log(NULL, AV_LOG_WARNING, "%d undecompressed bytes left in buffer\n", s->zstream.avail_in); + av_log(NULL, AV_LOG_WARNING, + "%d undecompressed bytes left in buffer\n", s->zstream.avail_in); return 0; } } @@ -509,9 +517,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { - PNGDecContext * const s = avctx->priv_data; - const uint8_t *buf = avpkt->data; - int buf_size = avpkt->size; + PNGDecContext *const s = avctx->priv_data; + const uint8_t *buf = avpkt->data; + int buf_size = avpkt->size; AVFrame *p; AVDictionary *metadata = NULL; uint32_t tag, length; @@ -584,7 +592,7 @@ static int decode_frame(AVCodecContext *avctx, s->state |= PNG_IHDR; if (avctx->debug & FF_DEBUG_PICT_INFO) av_log(avctx, AV_LOG_DEBUG, "width=%d height=%d depth=%d color_type=%d " - "compression_type=%d filter_type=%d interlace_type=%d\n", + "compression_type=%d filter_type=%d interlace_type=%d\n", s->width, s->height, s->bit_depth, s->color_type, s->compression_type, s->filter_type, s->interlace_type); break; @@ -660,10 +668,10 @@ static int decode_frame(AVCodecContext *avctx, if (!s->interlace_type) { s->crow_size = s->row_size + 1; } else { - s->pass = 0; + s->pass = 0; s->pass_row_size = ff_png_pass_row_size(s->pass, - s->bits_per_pixel, - s->width); + s->bits_per_pixel, + s->width); s->crow_size = s->pass_row_size + 1; } av_dlog(avctx, "row_size=%d crow_size =%d\n", @@ -699,42 +707,41 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_skip(&s->gb, 4); /* crc */ break; case MKTAG('P', 'L', 'T', 'E'): - { - int n, i, r, g, b; - - if ((length % 3) != 0 || length > 256 * 3) - goto skip_tag; - /* read the palette */ - n = length / 3; - for (i = 0; i < n; i++) { - r = bytestream2_get_byte(&s->gb); - g = bytestream2_get_byte(&s->gb); - b = bytestream2_get_byte(&s->gb); - s->palette[i] = (0xFFU << 24) | (r << 16) | (g << 8) | b; - } - for (; i < 256; i++) { - s->palette[i] = (0xFFU << 24); - } - s->state |= PNG_PLTE; - bytestream2_skip(&s->gb, 4); /* crc */ + { + int n, i, r, g, b; + + if ((length % 3) != 0 || length > 256 * 3) + goto skip_tag; + /* read the palette */ + n = length / 3; + for (i = 0; i < n; i++) { + r = bytestream2_get_byte(&s->gb); + g = bytestream2_get_byte(&s->gb); + b = bytestream2_get_byte(&s->gb); + s->palette[i] = (0xFFU << 24) | (r << 16) | (g << 8) | b; } - break; + for (; i < 256; i++) + s->palette[i] = (0xFFU << 24); + s->state |= PNG_PLTE; + bytestream2_skip(&s->gb, 4); /* crc */ + } + break; case MKTAG('t', 'R', 'N', 'S'): - { - int v, i; - - /* read the transparency. XXX: Only palette mode supported */ - if (s->color_type != PNG_COLOR_TYPE_PALETTE || - length > 256 || - !(s->state & PNG_PLTE)) - goto skip_tag; - for (i = 0; i < length; i++) { - v = bytestream2_get_byte(&s->gb); - s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); - } - bytestream2_skip(&s->gb, 4); /* crc */ + { + int v, i; + + /* read the transparency. XXX: Only palette mode supported */ + if (s->color_type != PNG_COLOR_TYPE_PALETTE || + length > 256 || + !(s->state & PNG_PLTE)) + goto skip_tag; + for (i = 0; i < length; i++) { + v = bytestream2_get_byte(&s->gb); + s->palette[i] = (s->palette[i] & 0x00ffffff) | (v << 24); } - break; + bytestream2_skip(&s->gb, 4); /* crc */ + } + break; case MKTAG('t', 'E', 'X', 't'): if (decode_text_chunk(s, length, 0, &metadata) < 0) av_log(avctx, AV_LOG_WARNING, "Broken tEXt chunk\n"); @@ -755,12 +762,12 @@ static int decode_frame(AVCodecContext *avctx, goto exit_loop; default: /* skip tag */ - skip_tag: +skip_tag: bytestream2_skip(&s->gb, length + 4); break; } } - exit_loop: +exit_loop: if (s->bits_per_pixel == 1 && s->color_type == PNG_COLOR_TYPE_PALETTE){ int i, j, k; @@ -834,9 +841,9 @@ static int decode_frame(AVCodecContext *avctx, } } - /* handle p-frames only if a predecessor frame is available */ - if (s->last_picture.f->data[0]) { - if ( !(avpkt->flags & AV_PKT_FLAG_KEY) && avctx->codec_tag != AV_RL32("MPNG") + /* handle p-frames only if a predecessor frame is available */ + if (s->last_picture.f->data[0]) { + if ( !(avpkt->flags & AV_PKT_FLAG_KEY) && avctx->codec_tag != AV_RL32("MPNG") && s->last_picture.f->width == p->width && s->last_picture.f->height== p->height && s->last_picture.f->format== p->format @@ -847,9 +854,8 @@ static int decode_frame(AVCodecContext *avctx, ff_thread_await_progress(&s->last_picture, INT_MAX, 0); for (j = 0; j < s->height; j++) { - for (i = 0; i < s->width * s->bpp; i++) { + for (i = 0; i < s->width * s->bpp; i++) pd[i] += pd_last[i]; - } pd += s->image_linesize; pd_last += s->image_linesize; } @@ -866,11 +872,11 @@ static int decode_frame(AVCodecContext *avctx, *got_frame = 1; ret = bytestream2_tell(&s->gb); - the_end: +the_end: inflateEnd(&s->zstream); s->crow_buf = NULL; return ret; - fail: +fail: av_dict_free(&metadata); ff_thread_report_progress(&s->picture, INT_MAX, 0); ret = AVERROR_INVALIDDATA; |