Skip to content

F
ffmpeg.wasm-core
Commit 5727d387 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '92a36a6b' 

* commit '92a36a6b':
  pngdec: correctly indent macros

Conflicts:
	libavcodec/pngdec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c87f645a 92a36a6b
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 10 deletions
libavcodec/pngdec.c
View file @ 5727d387
...@@ -185,7 +185,8 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, ...@@ -185,7 +185,8 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top,
} }
} }
#define UNROLL1(bpp, op) { \ #define UNROLL1(bpp, op) \
{ \
r = dst[0]; \ r = dst[0]; \
if (bpp >= 2) \ if (bpp >= 2) \
g = dst[1]; \ g = dst[1]; \
...@@ -205,16 +206,21 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top, ...@@ -205,16 +206,21 @@ void ff_add_png_paeth_prediction(uint8_t *dst, uint8_t *src, uint8_t *top,
continue; \ continue; \
dst[i + 3] = a = op(a, src[i + 3], last[i + 3]); \ dst[i + 3] = a = op(a, src[i + 3], last[i + 3]); \
} \ } \
} }
#define UNROLL_FILTER(op)\ #define UNROLL_FILTER(op) \
if (bpp == 1) UNROLL1(1, op)\ if (bpp == 1) { \
else if (bpp == 2) UNROLL1(2, op)\ UNROLL1(1, op) \
else if (bpp == 3) UNROLL1(3, op)\ } else if (bpp == 2) { \
else if (bpp == 4) UNROLL1(4, op)\ UNROLL1(2, op) \
for (; i < size; i++) {\ } else if (bpp == 3) { \
dst[i] = op(dst[i - bpp], src[i], last[i]);\ UNROLL1(3, op) \
}\ } else if (bpp == 4) { \
UNROLL1(4, op) \
} \
for (; i < size; i++) { \
dst[i] = op(dst[i - bpp], src[i], last[i]); \
}
/* NOTE: 'dst' can be equal to 'last' */ /* NOTE: 'dst' can be equal to 'last' */
static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type, static void png_filter_row(PNGDSPContext *dsp, uint8_t *dst, int filter_type,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment