swscale: K&R formatting cosmetics (part I)

1 files changed, 472 insertions, 421 deletions

diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 24dc96032d..1c44a2f544 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -28,12 +28,12 @@
 #include <inttypes.h>
 #include <assert.h>
 
+#include "libavutil/cpu.h"
+#include "libavutil/bswap.h"
 #include "config.h"
 #include "rgb2rgb.h"
 #include "swscale.h"
 #include "swscale_internal.h"
-#include "libavutil/cpu.h"
-#include "libavutil/bswap.h"
 
 extern const uint8_t dither_4x4_16[4][8];
 extern const uint8_t dither_8x8_32[8][8];
@@ -41,14 +41,14 @@ extern const uint8_t dither_8x8_73[8][8];
 extern const uint8_t dither_8x8_220[8][8];
 
 const int32_t ff_yuv2rgb_coeffs[8][4] = {
-    {117504, 138453, 13954, 34903}, /* no sequence_display_extension */
-    {117504, 138453, 13954, 34903}, /* ITU-R Rec. 709 (1990) */
-    {104597, 132201, 25675, 53279}, /* unspecified */
-    {104597, 132201, 25675, 53279}, /* reserved */
-    {104448, 132798, 24759, 53109}, /* FCC */
-    {104597, 132201, 25675, 53279}, /* ITU-R Rec. 624-4 System B, G */
-    {104597, 132201, 25675, 53279}, /* SMPTE 170M */
-    {117579, 136230, 16907, 35559}  /* SMPTE 240M (1987) */
+    { 117504, 138453, 13954, 34903 }, /* no sequence_display_extension */
+    { 117504, 138453, 13954, 34903 }, /* ITU-R Rec. 709 (1990) */
+    { 104597, 132201, 25675, 53279 }, /* unspecified */
+    { 104597, 132201, 25675, 53279 }, /* reserved */
+    { 104448, 132798, 24759, 53109 }, /* FCC */
+    { 104597, 132201, 25675, 53279 }, /* ITU-R Rec. 624-4 System B, G */
+    { 104597, 132201, 25675, 53279 }, /* SMPTE 170M */
+    { 117579, 136230, 16907, 35559 }  /* SMPTE 240M (1987) */
 };
 
 const int *sws_getCoefficients(int colorspace)
@@ -65,503 +65,548 @@ const int *sws_getCoefficients(int colorspace)
     g = (void *)(c->table_gU[U] + c->table_gV[V]);  \
     b = (void *)c->table_bU[U];
 
-#define PUTRGB(dst,src,i)            \
-    Y = src[2*i];                    \
-    dst[2*i  ] = r[Y] + g[Y] + b[Y]; \
-    Y = src[2*i+1];                  \
-    dst[2*i+1] = r[Y] + g[Y] + b[Y];
-
-#define PUTRGB24(dst,src,i)                                  \
-    Y = src[2*i];                                            \
-    dst[6*i+0] = r[Y]; dst[6*i+1] = g[Y]; dst[6*i+2] = b[Y]; \
-    Y = src[2*i+1];                                          \
-    dst[6*i+3] = r[Y]; dst[6*i+4] = g[Y]; dst[6*i+5] = b[Y];
-
-#define PUTBGR24(dst,src,i)                                  \
-    Y = src[2*i];                                            \
-    dst[6*i+0] = b[Y]; dst[6*i+1] = g[Y]; dst[6*i+2] = r[Y]; \
-    Y = src[2*i+1];                                          \
-    dst[6*i+3] = b[Y]; dst[6*i+4] = g[Y]; dst[6*i+5] = r[Y];
-
-#define PUTRGBA(dst,ysrc,asrc,i,s)                      \
-    Y = ysrc[2*i];                                      \
-    dst[2*i  ] = r[Y] + g[Y] + b[Y] + (asrc[2*i  ]<<s); \
-    Y = ysrc[2*i+1];                                    \
-    dst[2*i+1] = r[Y] + g[Y] + b[Y] + (asrc[2*i+1]<<s);
-
-#define PUTRGB48(dst,src,i)             \
-    Y = src[2*i];                       \
-    dst[12*i+ 0] = dst[12*i+ 1] = r[Y]; \
-    dst[12*i+ 2] = dst[12*i+ 3] = g[Y]; \
-    dst[12*i+ 4] = dst[12*i+ 5] = b[Y]; \
-    Y = src[2*i+1];                     \
-    dst[12*i+ 6] = dst[12*i+ 7] = r[Y]; \
-    dst[12*i+ 8] = dst[12*i+ 9] = g[Y]; \
-    dst[12*i+10] = dst[12*i+11] = b[Y];
-
-#define PUTBGR48(dst,src,i)             \
-    Y = src[2*i];                       \
-    dst[12*i+ 0] = dst[12*i+ 1] = b[Y]; \
-    dst[12*i+ 2] = dst[12*i+ 3] = g[Y]; \
-    dst[12*i+ 4] = dst[12*i+ 5] = r[Y]; \
-    Y = src[2*i+1];                     \
-    dst[12*i+ 6] = dst[12*i+ 7] = b[Y]; \
-    dst[12*i+ 8] = dst[12*i+ 9] = g[Y]; \
-    dst[12*i+10] = dst[12*i+11] = r[Y];
-
-#define YUV2RGBFUNC(func_name, dst_type, alpha) \
-static int func_name(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY, \
-                     int srcSliceH, uint8_t* dst[], int dstStride[]) \
-{\
-    int y;\
-\
-    if (!alpha && c->srcFormat == PIX_FMT_YUV422P) {\
-        srcStride[1] *= 2;\
-        srcStride[2] *= 2;\
-    }\
-    for (y=0; y<srcSliceH; y+=2) {\
-        dst_type *dst_1 = (dst_type*)(dst[0] + (y+srcSliceY  )*dstStride[0]);\
-        dst_type *dst_2 = (dst_type*)(dst[0] + (y+srcSliceY+1)*dstStride[0]);\
-        dst_type av_unused *r, *b;\
-        dst_type *g;\
-        const uint8_t *py_1 = src[0] + y*srcStride[0];\
-        const uint8_t *py_2 = py_1 + srcStride[0];\
-        const uint8_t *pu = src[1] + (y>>1)*srcStride[1];\
-        const uint8_t *pv = src[2] + (y>>1)*srcStride[2];\
-        const uint8_t av_unused *pa_1, *pa_2;\
-        unsigned int h_size = c->dstW>>3;\
-        if (alpha) {\
-            pa_1 = src[3] + y*srcStride[3];\
-            pa_2 = pa_1 + srcStride[3];\
-        }\
-        while (h_size--) {\
-            int av_unused U, V;\
-            int Y;\
-
-#define ENDYUV2RGBLINE(dst_delta)\
-            pu += 4;\
-            pv += 4;\
-            py_1 += 8;\
-            py_2 += 8;\
-            dst_1 += dst_delta;\
-            dst_2 += dst_delta;\
-        }\
-        if (c->dstW & 4) {\
-            int av_unused Y, U, V;\
-
-#define ENDYUV2RGBFUNC()\
-        }\
-    }\
-    return srcSliceH;\
-}
+#define PUTRGB(dst, src, i)                         \
+    Y              = src[2 * i];                    \
+    dst[2 * i]     = r[Y] + g[Y] + b[Y];            \
+    Y              = src[2 * i + 1];                \
+    dst[2 * i + 1] = r[Y] + g[Y] + b[Y];
+
+#define PUTRGB24(dst, src, i)                       \
+    Y              = src[2 * i];                    \
+    dst[6 * i + 0] = r[Y];                          \
+    dst[6 * i + 1] = g[Y];                          \
+    dst[6 * i + 2] = b[Y];                          \
+    Y              = src[2 * i + 1];                \
+    dst[6 * i + 3] = r[Y];                          \
+    dst[6 * i + 4] = g[Y];                          \
+    dst[6 * i + 5] = b[Y];
+
+#define PUTBGR24(dst, src, i)                       \
+    Y              = src[2 * i];                    \
+    dst[6 * i + 0] = b[Y];                          \
+    dst[6 * i + 1] = g[Y];                          \
+    dst[6 * i + 2] = r[Y];                          \
+    Y              = src[2 * i + 1];                \
+    dst[6 * i + 3] = b[Y];                          \
+    dst[6 * i + 4] = g[Y];                          \
+    dst[6 * i + 5] = r[Y];
+
+#define PUTRGBA(dst, ysrc, asrc, i, s)                                  \
+    Y              = ysrc[2 * i];                                       \
+    dst[2 * i]     = r[Y] + g[Y] + b[Y] + (asrc[2 * i]     << s);       \
+    Y              = ysrc[2 * i + 1];                                   \
+    dst[2 * i + 1] = r[Y] + g[Y] + b[Y] + (asrc[2 * i + 1] << s);
+
+#define PUTRGB48(dst, src, i)                       \
+    Y                = src[ 2 * i];                 \
+    dst[12 * i +  0] = dst[12 * i +  1] = r[Y];     \
+    dst[12 * i +  2] = dst[12 * i +  3] = g[Y];     \
+    dst[12 * i +  4] = dst[12 * i +  5] = b[Y];     \
+    Y                = src[ 2 * i + 1];             \
+    dst[12 * i +  6] = dst[12 * i +  7] = r[Y];     \
+    dst[12 * i +  8] = dst[12 * i +  9] = g[Y];     \
+    dst[12 * i + 10] = dst[12 * i + 11] = b[Y];
+
+#define PUTBGR48(dst, src, i)                       \
+    Y                = src[2 * i];                  \
+    dst[12 * i +  0] = dst[12 * i +  1] = b[Y];     \
+    dst[12 * i +  2] = dst[12 * i +  3] = g[Y];     \
+    dst[12 * i +  4] = dst[12 * i +  5] = r[Y];     \
+    Y                = src[2  * i +  1];            \
+    dst[12 * i +  6] = dst[12 * i +  7] = b[Y];     \
+    dst[12 * i +  8] = dst[12 * i +  9] = g[Y];     \
+    dst[12 * i + 10] = dst[12 * i + 11] = r[Y];
+
+#define YUV2RGBFUNC(func_name, dst_type, alpha)                             \
+    static int func_name(SwsContext *c, const uint8_t *src[],               \
+                         int srcStride[], int srcSliceY, int srcSliceH,     \
+                         uint8_t *dst[], int dstStride[])                   \
+    {                                                                       \
+        int y;                                                              \
+                                                                            \
+        if (!alpha && c->srcFormat == PIX_FMT_YUV422P) {                    \
+            srcStride[1] *= 2;                                              \
+            srcStride[2] *= 2;                                              \
+        }                                                                   \
+        for (y = 0; y < srcSliceH; y += 2) {                                \
+            dst_type *dst_1 =                                               \
+                (dst_type *)(dst[0] + (y + srcSliceY)     * dstStride[0]);  \
+            dst_type *dst_2 =                                               \
+                (dst_type *)(dst[0] + (y + srcSliceY + 1) * dstStride[0]);  \
+            dst_type av_unused *r, *g, *b;                                  \
+            const uint8_t *py_1 = src[0] +  y       * srcStride[0];         \
+            const uint8_t *py_2 = py_1   +            srcStride[0];         \
+            const uint8_t *pu   = src[1] + (y >> 1) * srcStride[1];         \
+            const uint8_t *pv   = src[2] + (y >> 1) * srcStride[2];         \
+            const uint8_t av_unused *pa_1, *pa_2;                           \
+            unsigned int h_size = c->dstW >> 3;                             \
+            if (alpha) {                                                    \
+                pa_1 = src[3] + y * srcStride[3];                           \
+                pa_2 = pa_1   +     srcStride[3];                           \
+            }                                                               \
+            while (h_size--) {                                              \
+                int av_unused U, V, Y;                                      \
+
+#define ENDYUV2RGBLINE(dst_delta)                   \
+    pu    += 4;                                     \
+    pv    += 4;                                     \
+    py_1  += 8;                                     \
+    py_2  += 8;                                     \
+    dst_1 += dst_delta;                             \
+    dst_2 += dst_delta;                             \
+    }                                               \
+    if (c->dstW & 4) {                              \
+        int av_unused Y, U, V;                      \
+
+#define ENDYUV2RGBFUNC()                            \
+            }                                       \
+        }                                           \
+        return srcSliceH;                           \
+    }
 
-#define CLOSEYUV2RGBFUNC(dst_delta)\
-    ENDYUV2RGBLINE(dst_delta)\
+#define CLOSEYUV2RGBFUNC(dst_delta)                 \
+    ENDYUV2RGBLINE(dst_delta)                       \
     ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuv2rgb_c_48, uint8_t, 0)
     LOADCHROMA(0);
-    PUTRGB48(dst_1,py_1,0);
-    PUTRGB48(dst_2,py_2,0);
+    PUTRGB48(dst_1, py_1, 0);
+    PUTRGB48(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB48(dst_2,py_2,1);
-    PUTRGB48(dst_1,py_1,1);
+    PUTRGB48(dst_2, py_2, 1);
+    PUTRGB48(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTRGB48(dst_1,py_1,2);
-    PUTRGB48(dst_2,py_2,2);
+    PUTRGB48(dst_1, py_1, 2);
+    PUTRGB48(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTRGB48(dst_2,py_2,3);
-    PUTRGB48(dst_1,py_1,3);
+    PUTRGB48(dst_2, py_2, 3);
+    PUTRGB48(dst_1, py_1, 3);
 ENDYUV2RGBLINE(48)
     LOADCHROMA(0);
-    PUTRGB48(dst_1,py_1,0);
-    PUTRGB48(dst_2,py_2,0);
+    PUTRGB48(dst_1, py_1, 0);
+    PUTRGB48(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB48(dst_2,py_2,1);
-    PUTRGB48(dst_1,py_1,1);
+    PUTRGB48(dst_2, py_2, 1);
+    PUTRGB48(dst_1, py_1, 1);
 ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuv2rgb_c_bgr48, uint8_t, 0)
     LOADCHROMA(0);
-    PUTBGR48(dst_1,py_1,0);
-    PUTBGR48(dst_2,py_2,0);
+    PUTBGR48(dst_1, py_1, 0);
+    PUTBGR48(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTBGR48(dst_2,py_2,1);
-    PUTBGR48(dst_1,py_1,1);
+    PUTBGR48(dst_2, py_2, 1);
+    PUTBGR48(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTBGR48(dst_1,py_1,2);
-    PUTBGR48(dst_2,py_2,2);
+    PUTBGR48(dst_1, py_1, 2);
+    PUTBGR48(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTBGR48(dst_2,py_2,3);
-    PUTBGR48(dst_1,py_1,3);
+    PUTBGR48(dst_2, py_2, 3);
+    PUTBGR48(dst_1, py_1, 3);
 ENDYUV2RGBLINE(48)
     LOADCHROMA(0);
-    PUTBGR48(dst_1,py_1,0);
-    PUTBGR48(dst_2,py_2,0);
+    PUTBGR48(dst_1, py_1, 0);
+    PUTBGR48(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTBGR48(dst_2,py_2,1);
-    PUTBGR48(dst_1,py_1,1);
+    PUTBGR48(dst_2, py_2, 1);
+    PUTBGR48(dst_1, py_1, 1);
 ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuv2rgb_c_32, uint32_t, 0)
     LOADCHROMA(0);
-    PUTRGB(dst_1,py_1,0);
-    PUTRGB(dst_2,py_2,0);
+    PUTRGB(dst_1, py_1, 0);
+    PUTRGB(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB(dst_2,py_2,1);
-    PUTRGB(dst_1,py_1,1);
+    PUTRGB(dst_2, py_2, 1);
+    PUTRGB(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTRGB(dst_1,py_1,2);
-    PUTRGB(dst_2,py_2,2);
+    PUTRGB(dst_1, py_1, 2);
+    PUTRGB(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTRGB(dst_2,py_2,3);
-    PUTRGB(dst_1,py_1,3);
+    PUTRGB(dst_2, py_2, 3);
+    PUTRGB(dst_1, py_1, 3);
 ENDYUV2RGBLINE(8)
     LOADCHROMA(0);
-    PUTRGB(dst_1,py_1,0);
-    PUTRGB(dst_2,py_2,0);
+    PUTRGB(dst_1, py_1, 0);
+    PUTRGB(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB(dst_2,py_2,1);
-    PUTRGB(dst_1,py_1,1);
+    PUTRGB(dst_2, py_2, 1);
+    PUTRGB(dst_1, py_1, 1);
 ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1)
     LOADCHROMA(0);
-    PUTRGBA(dst_1,py_1,pa_1,0,24);
-    PUTRGBA(dst_2,py_2,pa_2,0,24);
+    PUTRGBA(dst_1, py_1, pa_1, 0, 24);
+    PUTRGBA(dst_2, py_2, pa_2, 0, 24);
 
     LOADCHROMA(1);
-    PUTRGBA(dst_2,py_2,pa_1,1,24);
-    PUTRGBA(dst_1,py_1,pa_2,1,24);
+    PUTRGBA(dst_2, py_2, pa_1, 1, 24);
+    PUTRGBA(dst_1, py_1, pa_2, 1, 24);
 
     LOADCHROMA(2);
-    PUTRGBA(dst_1,py_1,pa_1,2,24);
-    PUTRGBA(dst_2,py_2,pa_2,2,24);
+    PUTRGBA(dst_1, py_1, pa_1, 2, 24);
+    PUTRGBA(dst_2, py_2, pa_2, 2, 24);
 
     LOADCHROMA(3);
-    PUTRGBA(dst_2,py_2,pa_1,3,24);
-    PUTRGBA(dst_1,py_1,pa_2,3,24);
-    pa_1 += 8;\
-    pa_2 += 8;\
+    PUTRGBA(dst_2, py_2, pa_1, 3, 24);
+    PUTRGBA(dst_1, py_1, pa_2, 3, 24);
+    pa_1 += 8; \
+    pa_2 += 8; \
 ENDYUV2RGBLINE(8)
     LOADCHROMA(0);
-    PUTRGBA(dst_1,py_1,pa_1,0,24);
-    PUTRGBA(dst_2,py_2,pa_2,0,24);
+    PUTRGBA(dst_1, py_1, pa_1, 0, 24);
+    PUTRGBA(dst_2, py_2, pa_2, 0, 24);
 
     LOADCHROMA(1);
-    PUTRGBA(dst_2,py_2,pa_1,1,24);
-    PUTRGBA(dst_1,py_1,pa_2,1,24);
+    PUTRGBA(dst_2, py_2, pa_1, 1, 24);
+    PUTRGBA(dst_1, py_1, pa_2, 1, 24);
 ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuva2argb_c, uint32_t, 1)
     LOADCHROMA(0);
-    PUTRGBA(dst_1,py_1,pa_1,0,0);
-    PUTRGBA(dst_2,py_2,pa_2,0,0);
+    PUTRGBA(dst_1, py_1, pa_1, 0, 0);
+    PUTRGBA(dst_2, py_2, pa_2, 0, 0);
 
     LOADCHROMA(1);
-    PUTRGBA(dst_2,py_2,pa_2,1,0);
-    PUTRGBA(dst_1,py_1,pa_1,1,0);
+    PUTRGBA(dst_2, py_2, pa_2, 1, 0);
+    PUTRGBA(dst_1, py_1, pa_1, 1, 0);
 
     LOADCHROMA(2);
-    PUTRGBA(dst_1,py_1,pa_1,2,0);
-    PUTRGBA(dst_2,py_2,pa_2,2,0);
+    PUTRGBA(dst_1, py_1, pa_1, 2, 0);
+    PUTRGBA(dst_2, py_2, pa_2, 2, 0);
 
     LOADCHROMA(3);
-    PUTRGBA(dst_2,py_2,pa_2,3,0);
-    PUTRGBA(dst_1,py_1,pa_1,3,0);
-    pa_1 += 8;\
-    pa_2 += 8;\
+    PUTRGBA(dst_2, py_2, pa_2, 3, 0);
+    PUTRGBA(dst_1, py_1, pa_1, 3, 0);
+    pa_1 += 8; \
+    pa_2 += 8; \
 ENDYUV2RGBLINE(8)
     LOADCHROMA(0);
-    PUTRGBA(dst_1,py_1,pa_1,0,0);
-    PUTRGBA(dst_2,py_2,pa_2,0,0);
+    PUTRGBA(dst_1, py_1, pa_1, 0, 0);
+    PUTRGBA(dst_2, py_2, pa_2, 0, 0);
 
     LOADCHROMA(1);
-    PUTRGBA(dst_2,py_2,pa_2,1,0);
-    PUTRGBA(dst_1,py_1,pa_1,1,0);
+    PUTRGBA(dst_2, py_2, pa_2, 1, 0);
+    PUTRGBA(dst_1, py_1, pa_1, 1, 0);
 ENDYUV2RGBFUNC()
 
 YUV2RGBFUNC(yuv2rgb_c_24_rgb, uint8_t, 0)
     LOADCHROMA(0);
-    PUTRGB24(dst_1,py_1,0);
-    PUTRGB24(dst_2,py_2,0);
+    PUTRGB24(dst_1, py_1, 0);
+    PUTRGB24(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB24(dst_2,py_2,1);
-    PUTRGB24(dst_1,py_1,1);
+    PUTRGB24(dst_2, py_2, 1);
+    PUTRGB24(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTRGB24(dst_1,py_1,2);
-    PUTRGB24(dst_2,py_2,2);
+    PUTRGB24(dst_1, py_1, 2);
+    PUTRGB24(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTRGB24(dst_2,py_2,3);
-    PUTRGB24(dst_1,py_1,3);
+    PUTRGB24(dst_2, py_2, 3);
+    PUTRGB24(dst_1, py_1, 3);
 ENDYUV2RGBLINE(24)
     LOADCHROMA(0);
-    PUTRGB24(dst_1,py_1,0);
-    PUTRGB24(dst_2,py_2,0);
+    PUTRGB24(dst_1, py_1, 0);
+    PUTRGB24(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB24(dst_2,py_2,1);
-    PUTRGB24(dst_1,py_1,1);
+    PUTRGB24(dst_2, py_2, 1);
+    PUTRGB24(dst_1, py_1, 1);
 ENDYUV2RGBFUNC()
 
 // only trivial mods from yuv2rgb_c_24_rgb
 YUV2RGBFUNC(yuv2rgb_c_24_bgr, uint8_t, 0)
     LOADCHROMA(0);
-    PUTBGR24(dst_1,py_1,0);
-    PUTBGR24(dst_2,py_2,0);
+    PUTBGR24(dst_1, py_1, 0);
+    PUTBGR24(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTBGR24(dst_2,py_2,1);
-    PUTBGR24(dst_1,py_1,1);
+    PUTBGR24(dst_2, py_2, 1);
+    PUTBGR24(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTBGR24(dst_1,py_1,2);
-    PUTBGR24(dst_2,py_2,2);
+    PUTBGR24(dst_1, py_1, 2);
+    PUTBGR24(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTBGR24(dst_2,py_2,3);
-    PUTBGR24(dst_1,py_1,3);
+    PUTBGR24(dst_2, py_2, 3);
+    PUTBGR24(dst_1, py_1, 3);
 ENDYUV2RGBLINE(24)
     LOADCHROMA(0);
-    PUTBGR24(dst_1,py_1,0);
-    PUTBGR24(dst_2,py_2,0);
+    PUTBGR24(dst_1, py_1, 0);
+    PUTBGR24(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTBGR24(dst_2,py_2,1);
-    PUTBGR24(dst_1,py_1,1);
+    PUTBGR24(dst_2, py_2, 1);
+    PUTBGR24(dst_1, py_1, 1);
 ENDYUV2RGBFUNC()
 
 // This is exactly the same code as yuv2rgb_c_32 except for the types of
 // r, g, b, dst_1, dst_2
 YUV2RGBFUNC(yuv2rgb_c_16, uint16_t, 0)
     LOADCHROMA(0);
-    PUTRGB(dst_1,py_1,0);
-    PUTRGB(dst_2,py_2,0);
+    PUTRGB(dst_1, py_1, 0);
+    PUTRGB(dst_2, py_2, 0);
 
     LOADCHROMA(1);
-    PUTRGB(dst_2,py_2,1);
-    PUTRGB(dst_1,py_1,1);
+    PUTRGB(dst_2, py_2, 1);
+    PUTRGB(dst_1, py_1, 1);
 
     LOADCHROMA(2);
-    PUTRGB(dst_1,py_1,2);
-    PUTRGB(dst_2,py_2,2);
+    PUTRGB(dst_1, py_1, 2);
+    PUTRGB(dst_2, py_2, 2);
 
     LOADCHROMA(3);
-    PUTRGB(dst_2,py_2,3);
-    PUTRGB(dst_1,py_1,3);
+    PUTRGB(dst_2, py_2, 3);
+    PUTRGB(dst_1, py_1, 3);
 CLOSEYUV2RGBFUNC(8)
 
 // r, g, b, dst_1, dst_2
 YUV2RGBFUNC(yuv2rgb_c_12_ordered_dither, uint16_t, 0)
-    const uint8_t *d16 = dither_4x4_16[y&3];
-#define PUTRGB12(dst,src,i,o)                                   \
-    Y = src[2*i];                                               \
-    dst[2*i]   = r[Y+d16[0+o]] + g[Y+d16[0+o]] + b[Y+d16[0+o]]; \
-    Y = src[2*i+1];                                             \
-    dst[2*i+1] = r[Y+d16[1+o]] + g[Y+d16[1+o]] + b[Y+d16[1+o]];
+    const uint8_t *d16 = dither_4x4_16[y & 3];
+
+#define PUTRGB12(dst, src, i, o)                    \
+    Y              = src[2 * i];                    \
+    dst[2 * i]     = r[Y + d16[0 + o]] +            \
+                     g[Y + d16[0 + o]] +            \
+                     b[Y + d16[0 + o]];             \
+    Y              = src[2 * i + 1];                \
+    dst[2 * i + 1] = r[Y + d16[1 + o]] +            \
+                     g[Y + d16[1 + o]] +            \
+                     b[Y + d16[1 + o]];
 
     LOADCHROMA(0);
-    PUTRGB12(dst_1,py_1,0,0);
-    PUTRGB12(dst_2,py_2,0,0+8);
+    PUTRGB12(dst_1, py_1, 0, 0);
+    PUTRGB12(dst_2, py_2, 0, 0 + 8);
 
     LOADCHROMA(1);
-    PUTRGB12(dst_2,py_2,1,2+8);
-    PUTRGB12(dst_1,py_1,1,2);
+    PUTRGB12(dst_2, py_2, 1, 2 + 8);
+    PUTRGB12(dst_1, py_1, 1, 2);
 
     LOADCHROMA(2);
-    PUTRGB12(dst_1,py_1,2,4);
-    PUTRGB12(dst_2,py_2,2,4+8);
+    PUTRGB12(dst_1, py_1, 2, 4);
+    PUTRGB12(dst_2, py_2, 2, 4 + 8);
 
     LOADCHROMA(3);
-    PUTRGB12(dst_2,py_2,3,6+8);
-    PUTRGB12(dst_1,py_1,3,6);
+    PUTRGB12(dst_2, py_2, 3, 6 + 8);
+    PUTRGB12(dst_1, py_1, 3, 6);
 CLOSEYUV2RGBFUNC(8)
 
 // r, g, b, dst_1, dst_2
 YUV2RGBFUNC(yuv2rgb_c_8_ordered_dither, uint8_t, 0)
-    const uint8_t *d32 = dither_8x8_32[y&7];
-    const uint8_t *d64 = dither_8x8_73[y&7];
-#define PUTRGB8(dst,src,i,o)                                    \
-    Y = src[2*i];                                               \
-    dst[2*i]   = r[Y+d32[0+o]] + g[Y+d32[0+o]] + b[Y+d64[0+o]]; \
-    Y = src[2*i+1];                                             \
-    dst[2*i+1] = r[Y+d32[1+o]] + g[Y+d32[1+o]] + b[Y+d64[1+o]];
+    const uint8_t *d32 = dither_8x8_32[y & 7];
+    const uint8_t *d64 = dither_8x8_73[y & 7];
+
+#define PUTRGB8(dst, src, i, o)                     \
+    Y              = src[2 * i];                    \
+    dst[2 * i]     = r[Y + d32[0 + o]] +            \
+                     g[Y + d32[0 + o]] +            \
+                     b[Y + d64[0 + o]];             \
+    Y              = src[2 * i + 1];                \
+    dst[2 * i + 1] = r[Y + d32[1 + o]] +            \
+                     g[Y + d32[1 + o]] +            \
+                     b[Y + d64[1 + o]];
 
     LOADCHROMA(0);
-    PUTRGB8(dst_1,py_1,0,0);
-    PUTRGB8(dst_2,py_2,0,0+8);
+    PUTRGB8(dst_1, py_1, 0, 0);
+    PUTRGB8(dst_2, py_2, 0, 0 + 8);
 
     LOADCHROMA(1);
-    PUTRGB8(dst_2,py_2,1,2+8);
-    PUTRGB8(dst_1,py_1,1,2);
+    PUTRGB8(dst_2, py_2, 1, 2 + 8);
+    PUTRGB8(dst_1, py_1, 1, 2);
 
     LOADCHROMA(2);
-    PUTRGB8(dst_1,py_1,2,4);
-    PUTRGB8(dst_2,py_2,2,4+8);
+    PUTRGB8(dst_1, py_1, 2, 4);
+    PUTRGB8(dst_2, py_2, 2, 4 + 8);
 
     LOADCHROMA(3);
-    PUTRGB8(dst_2,py_2,3,6+8);
-    PUTRGB8(dst_1,py_1,3,6);
+    PUTRGB8(dst_2, py_2, 3, 6 + 8);
+    PUTRGB8(dst_1, py_1, 3, 6);
 CLOSEYUV2RGBFUNC(8)
 
 YUV2RGBFUNC(yuv2rgb_c_4_ordered_dither, uint8_t, 0)
-    const uint8_t *d64 =  dither_8x8_73[y&7];
-    const uint8_t *d128 = dither_8x8_220[y&7];
+    const uint8_t * d64 = dither_8x8_73[y & 7];
+    const uint8_t *d128 = dither_8x8_220[y & 7];
     int acc;
 
-#define PUTRGB4D(dst,src,i,o)                                     \
-    Y = src[2*i];                                                 \
-    acc = r[Y+d128[0+o]] + g[Y+d64[0+o]] + b[Y+d128[0+o]];        \
-    Y = src[2*i+1];                                               \
-    acc |= (r[Y+d128[1+o]] + g[Y+d64[1+o]] + b[Y+d128[1+o]])<<4;  \
-    dst[i]= acc;
+#define PUTRGB4D(dst, src, i, o)                    \
+    Y      = src[2 * i];                            \
+    acc    = r[Y + d128[0 + o]] +                   \
+             g[Y +  d64[0 + o]] +                   \
+             b[Y + d128[0 + o]];                    \
+    Y      = src[2 * i + 1];                        \
+    acc   |= (r[Y + d128[1 + o]] +                  \
+              g[Y +  d64[1 + o]] +                  \
+              b[Y + d128[1 + o]]) << 4;             \
+    dst[i] = acc;
 
     LOADCHROMA(0);
-    PUTRGB4D(dst_1,py_1,0,0);
-    PUTRGB4D(dst_2,py_2,0,0+8);
+    PUTRGB4D(dst_1, py_1, 0, 0);
+    PUTRGB4D(dst_2, py_2, 0, 0 + 8);
 
     LOADCHROMA(1);
-    PUTRGB4D(dst_2,py_2,1,2+8);
-    PUTRGB4D(dst_1,py_1,1,2);
+    PUTRGB4D(dst_2, py_2, 1, 2 + 8);
+    PUTRGB4D(dst_1, py_1, 1, 2);
 
     LOADCHROMA(2);
-    PUTRGB4D(dst_1,py_1,2,4);
-    PUTRGB4D(dst_2,py_2,2,4+8);
+    PUTRGB4D(dst_1, py_1, 2, 4);
+    PUTRGB4D(dst_2, py_2, 2, 4 + 8);
 
     LOADCHROMA(3);
-    PUTRGB4D(dst_2,py_2,3,6+8);
-    PUTRGB4D(dst_1,py_1,3,6);
+    PUTRGB4D(dst_2, py_2, 3, 6 + 8);
+    PUTRGB4D(dst_1, py_1, 3, 6);
 CLOSEYUV2RGBFUNC(4)
 
 YUV2RGBFUNC(yuv2rgb_c_4b_ordered_dither, uint8_t, 0)
-    const uint8_t *d64 =  dither_8x8_73[y&7];
-    const uint8_t *d128 = dither_8x8_220[y&7];
-
-#define PUTRGB4DB(dst,src,i,o)                                    \
-    Y = src[2*i];                                                 \
-    dst[2*i]   = r[Y+d128[0+o]] + g[Y+d64[0+o]] + b[Y+d128[0+o]]; \
-    Y = src[2*i+1];                                               \
-    dst[2*i+1] = r[Y+d128[1+o]] + g[Y+d64[1+o]] + b[Y+d128[1+o]];
+    const uint8_t *d64  = dither_8x8_73[y & 7];
+    const uint8_t *d128 = dither_8x8_220[y & 7];
+
+#define PUTRGB4DB(dst, src, i, o)                   \
+    Y              = src[2 * i];                    \
+    dst[2 * i]     = r[Y + d128[0 + o]] +           \
+                     g[Y +  d64[0 + o]] +           \
+                     b[Y + d128[0 + o]];            \
+    Y              = src[2 * i + 1];                \
+    dst[2 * i + 1] = r[Y + d128[1 + o]] +           \
+                     g[Y +  d64[1 + o]] +           \
+                     b[Y + d128[1 + o]];
 
     LOADCHROMA(0);
-    PUTRGB4DB(dst_1,py_1,0,0);
-    PUTRGB4DB(dst_2,py_2,0,0+8);
+    PUTRGB4DB(dst_1, py_1, 0, 0);
+    PUTRGB4DB(dst_2, py_2, 0, 0 + 8);
 
     LOADCHROMA(1);
-    PUTRGB4DB(dst_2,py_2,1,2+8);
-    PUTRGB4DB(dst_1,py_1,1,2);
+    PUTRGB4DB(dst_2, py_2, 1, 2 + 8);
+    PUTRGB4DB(dst_1, py_1, 1, 2);
 
     LOADCHROMA(2);
-    PUTRGB4DB(dst_1,py_1,2,4);
-    PUTRGB4DB(dst_2,py_2,2,4+8);
+    PUTRGB4DB(dst_1, py_1, 2, 4);
+    PUTRGB4DB(dst_2, py_2, 2, 4 + 8);
 
     LOADCHROMA(3);
-    PUTRGB4DB(dst_2,py_2,3,6+8);
-    PUTRGB4DB(dst_1,py_1,3,6);
+    PUTRGB4DB(dst_2, py_2, 3, 6 + 8);
+    PUTRGB4DB(dst_1, py_1, 3, 6);
 CLOSEYUV2RGBFUNC(8)
 
 YUV2RGBFUNC(yuv2rgb_c_1_ordered_dither, uint8_t, 0)
-        const uint8_t *d128 = dither_8x8_220[y&7];
-        char out_1 = 0, out_2 = 0;
-        g= c->table_gU[128] + c->table_gV[128];
+    const uint8_t *d128 = dither_8x8_220[y & 7];
+    char out_1 = 0, out_2 = 0;
+    g = c->table_gU[128] + c->table_gV[128];
 
-#define PUTRGB1(out,src,i,o)    \
-    Y = src[2*i];               \
-    out+= out + g[Y+d128[0+o]]; \
-    Y = src[2*i+1];             \
-    out+= out + g[Y+d128[1+o]];
+#define PUTRGB1(out, src, i, o)                     \
+    Y    = src[2 * i];                              \
+    out += out + g[Y + d128[0 + o]];                \
+    Y    = src[2 * i + 1];                          \
+    out += out + g[Y + d128[1 + o]];
 
-    PUTRGB1(out_1,py_1,0,0);
-    PUTRGB1(out_2,py_2,0,0+8);
+    PUTRGB1(out_1, py_1, 0, 0);
+    PUTRGB1(out_2, py_2, 0, 0 + 8);
 
-    PUTRGB1(out_2,py_2,1,2+8);
-    PUTRGB1(out_1,py_1,1,2);
+    PUTRGB1(out_2, py_2, 1, 2 + 8);
+    PUTRGB1(out_1, py_1, 1, 2);
 
-    PUTRGB1(out_1,py_1,2,4);
-    PUTRGB1(out_2,py_2,2,4+8);
+    PUTRGB1(out_1, py_1, 2, 4);
+    PUTRGB1(out_2, py_2, 2, 4 + 8);
 
-    PUTRGB1(out_2,py_2,3,6+8);
-    PUTRGB1(out_1,py_1,3,6);
+    PUTRGB1(out_2, py_2, 3, 6 + 8);
+    PUTRGB1(out_1, py_1, 3, 6);
 
-    dst_1[0]= out_1;
-    dst_2[0]= out_2;
+    dst_1[0] = out_1;
+    dst_2[0] = out_2;
 CLOSEYUV2RGBFUNC(1)
 
 SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
 {
     SwsFunc t = NULL;
 
-    if (HAVE_MMX) {
+    if (HAVE_MMX)
         t = ff_yuv2rgb_init_mmx(c);
-    } else if (HAVE_VIS) {
+    else if (HAVE_VIS)
         t = ff_yuv2rgb_init_vis(c);
-    } else if (HAVE_ALTIVEC) {
+    else if (HAVE_ALTIVEC)
         t = ff_yuv2rgb_init_altivec(c);
-    } else if (ARCH_BFIN) {
+    else if (ARCH_BFIN)
         t = ff_yuv2rgb_get_func_ptr_bfin(c);
-    }
 
     if (t)
         return t;
 
-    av_log(c, AV_LOG_WARNING, "No accelerated colorspace conversion found from %s to %s.\n", sws_format_name(c->srcFormat), sws_format_name(c->dstFormat));
+    av_log(c, AV_LOG_WARNING,
+           "No accelerated colorspace conversion found from %s to %s.\n",
+           sws_format_name(c->srcFormat), sws_format_name(c->dstFormat));
 
     switch (c->dstFormat) {
     case PIX_FMT_BGR48BE:
-    case PIX_FMT_BGR48LE:    return yuv2rgb_c_bgr48;
+    case PIX_FMT_BGR48LE:
+        return yuv2rgb_c_bgr48;
     case PIX_FMT_RGB48BE:
-    case PIX_FMT_RGB48LE:    return yuv2rgb_c_48;
+    case PIX_FMT_RGB48LE:
+        return yuv2rgb_c_48;
     case PIX_FMT_ARGB:
-    case PIX_FMT_ABGR:       if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) return yuva2argb_c;
+    case PIX_FMT_ABGR:
+        if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P)
+            return yuva2argb_c;
     case PIX_FMT_RGBA:
-    case PIX_FMT_BGRA:       return (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P) ? yuva2rgba_c : yuv2rgb_c_32;
-    case PIX_FMT_RGB24:      return yuv2rgb_c_24_rgb;
-    case PIX_FMT_BGR24:      return yuv2rgb_c_24_bgr;
+    case PIX_FMT_BGRA:
+        if (CONFIG_SWSCALE_ALPHA && c->srcFormat == PIX_FMT_YUVA420P)
+            return yuva2rgba_c;
+        else
+            return yuv2rgb_c_32;
+    case PIX_FMT_RGB24:
+        return yuv2rgb_c_24_rgb;
+    case PIX_FMT_BGR24:
+        return yuv2rgb_c_24_bgr;
     case PIX_FMT_RGB565:
     case PIX_FMT_BGR565:
     case PIX_FMT_RGB555:
-    case PIX_FMT_BGR555:     return yuv2rgb_c_16;
+    case PIX_FMT_BGR555:
+        return yuv2rgb_c_16;
     case PIX_FMT_RGB444:
-    case PIX_FMT_BGR444:     return yuv2rgb_c_12_ordered_dither;
+    case PIX_FMT_BGR444:
+        return yuv2rgb_c_12_ordered_dither;
     case PIX_FMT_RGB8:
-    case PIX_FMT_BGR8:       return yuv2rgb_c_8_ordered_dither;
+    case PIX_FMT_BGR8:
+        return yuv2rgb_c_8_ordered_dither;
     case PIX_FMT_RGB4:
-    case PIX_FMT_BGR4:       return yuv2rgb_c_4_ordered_dither;
+    case PIX_FMT_BGR4:
+        return yuv2rgb_c_4_ordered_dither;
     case PIX_FMT_RGB4_BYTE:
-    case PIX_FMT_BGR4_BYTE:  return yuv2rgb_c_4b_ordered_dither;
-    case PIX_FMT_MONOBLACK:  return yuv2rgb_c_1_ordered_dither;
+    case PIX_FMT_BGR4_BYTE:
+        return yuv2rgb_c_4b_ordered_dither;
+    case PIX_FMT_MONOBLACK:
+        return yuv2rgb_c_1_ordered_dither;
     default:
         assert(0);
     }
     return NULL;
 }
 
-static void fill_table(uint8_t* table[256], const int elemsize, const int inc, void *y_tab)
+static void fill_table(uint8_t *table[256], const int elemsize,
+                       const int inc, void *y_tab)
 {
     int i;
-    int64_t cb = 0;
+    int64_t cb       = 0;
     uint8_t *y_table = y_tab;
 
     y_table -= elemsize * (inc >> 9);
 
     for (i = 0; i < 256; i++) {
         table[i] = y_table + elemsize * (cb >> 16);
-        cb += inc;
+        cb      += inc;
     }
 }
 
@@ -569,44 +614,49 @@ static void fill_gv_table(int table[256], const int elemsize, const int inc)
 {
     int i;
     int64_t cb = 0;
-    int off = -(inc >> 9);
+    int off    = -(inc >> 9);
 
     for (i = 0; i < 256; i++) {
         table[i] = elemsize * (off + (cb >> 16));
-        cb += inc;
+        cb      += inc;
     }
 }
 
 static uint16_t roundToInt16(int64_t f)
 {
-    int r= (f + (1<<15))>>16;
-         if (r<-0x7FFF) return 0x8000;
-    else if (r> 0x7FFF) return 0x7FFF;
-    else                return r;
+    int r = (f + (1 << 15)) >> 16;
+
+    if (r < -0x7FFF)
+        return 0x8000;
+    else if (r > 0x7FFF)
+        return 0x7FFF;
+    else
+        return r;
 }
 
-av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int fullRange,
-                                     int brightness, int contrast, int saturation)
+av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
+                                     int fullRange, int brightness,
+                                     int contrast, int saturation)
 {
-    const int isRgb =      c->dstFormat==PIX_FMT_RGB32
-                        || c->dstFormat==PIX_FMT_RGB32_1
-                        || c->dstFormat==PIX_FMT_BGR24
-                        || c->dstFormat==PIX_FMT_RGB565BE
-                        || c->dstFormat==PIX_FMT_RGB565LE
-                        || c->dstFormat==PIX_FMT_RGB555BE
-                        || c->dstFormat==PIX_FMT_RGB555LE
-                        || c->dstFormat==PIX_FMT_RGB444BE
-                        || c->dstFormat==PIX_FMT_RGB444LE
-                        || c->dstFormat==PIX_FMT_RGB8
-                        || c->dstFormat==PIX_FMT_RGB4
-                        || c->dstFormat==PIX_FMT_RGB4_BYTE
-                        || c->dstFormat==PIX_FMT_MONOBLACK;
-    const int isNotNe =    c->dstFormat==PIX_FMT_NE(RGB565LE,RGB565BE)
-                        || c->dstFormat==PIX_FMT_NE(RGB555LE,RGB555BE)
-                        || c->dstFormat==PIX_FMT_NE(RGB444LE,RGB444BE)
-                        || c->dstFormat==PIX_FMT_NE(BGR565LE,BGR565BE)
-                        || c->dstFormat==PIX_FMT_NE(BGR555LE,BGR555BE)
-                        || c->dstFormat==PIX_FMT_NE(BGR444LE,BGR444BE);
+    const int isRgb = c->dstFormat == PIX_FMT_RGB32     ||
+                      c->dstFormat == PIX_FMT_RGB32_1   ||
+                      c->dstFormat == PIX_FMT_BGR24     ||
+                      c->dstFormat == PIX_FMT_RGB565BE  ||
+                      c->dstFormat == PIX_FMT_RGB565LE  ||
+                      c->dstFormat == PIX_FMT_RGB555BE  ||
+                      c->dstFormat == PIX_FMT_RGB555LE  ||
+                      c->dstFormat == PIX_FMT_RGB444BE  ||
+                      c->dstFormat == PIX_FMT_RGB444LE  ||
+                      c->dstFormat == PIX_FMT_RGB8      ||
+                      c->dstFormat == PIX_FMT_RGB4      ||
+                      c->dstFormat == PIX_FMT_RGB4_BYTE ||
+                      c->dstFormat == PIX_FMT_MONOBLACK;
+    const int isNotNe = c->dstFormat == PIX_FMT_NE(RGB565LE, RGB565BE) ||
+                        c->dstFormat == PIX_FMT_NE(RGB555LE, RGB555BE) ||
+                        c->dstFormat == PIX_FMT_NE(RGB444LE, RGB444BE) ||
+                        c->dstFormat == PIX_FMT_NE(BGR565LE, BGR565BE) ||
+                        c->dstFormat == PIX_FMT_NE(BGR555LE, BGR555BE) ||
+                        c->dstFormat == PIX_FMT_NE(BGR444LE, BGR444BE);
     const int bpp = c->dstFormatBpp;
     uint8_t *y_table;
     uint16_t *y_table16;
@@ -618,43 +668,42 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
     int64_t cbu =  inv_table[1];
     int64_t cgu = -inv_table[2];
     int64_t cgv = -inv_table[3];
-    int64_t cy  = 1<<16;
+    int64_t cy  = 1 << 16;
     int64_t oy  = 0;
-
-    int64_t yb = 0;
+    int64_t yb  = 0;
 
     if (!fullRange) {
-        cy = (cy*255) / 219;
-        oy = 16<<16;
+        cy = (cy * 255) / 219;
+        oy = 16 << 16;
     } else {
-        crv = (crv*224) / 255;
-        cbu = (cbu*224) / 255;
-        cgu = (cgu*224) / 255;
-        cgv = (cgv*224) / 255;
+        crv = (crv * 224) / 255;
+        cbu = (cbu * 224) / 255;
+        cgu = (cgu * 224) / 255;
+        cgv = (cgv * 224) / 255;
     }
 
-    cy  = (cy *contrast             ) >> 16;
-    crv = (crv*contrast * saturation) >> 32;
-    cbu = (cbu*contrast * saturation) >> 32;
-    cgu = (cgu*contrast * saturation) >> 32;
-    cgv = (cgv*contrast * saturation) >> 32;
-    oy -= 256*brightness;
-
-    c->uOffset=   0x0400040004000400LL;
-    c->vOffset=   0x0400040004000400LL;
-    c->yCoeff=    roundToInt16(cy *8192) * 0x0001000100010001ULL;
-    c->vrCoeff=   roundToInt16(crv*8192) * 0x0001000100010001ULL;
-    c->ubCoeff=   roundToInt16(cbu*8192) * 0x0001000100010001ULL;
-    c->vgCoeff=   roundToInt16(cgv*8192) * 0x0001000100010001ULL;
-    c->ugCoeff=   roundToInt16(cgu*8192) * 0x0001000100010001ULL;
-    c->yOffset=   roundToInt16(oy *   8) * 0x0001000100010001ULL;
-
-    c->yuv2rgb_y_coeff  = (int16_t)roundToInt16(cy <<13);
-    c->yuv2rgb_y_offset = (int16_t)roundToInt16(oy << 9);
-    c->yuv2rgb_v2r_coeff= (int16_t)roundToInt16(crv<<13);
-    c->yuv2rgb_v2g_coeff= (int16_t)roundToInt16(cgv<<13);
-    c->yuv2rgb_u2g_coeff= (int16_t)roundToInt16(cgu<<13);
-    c->yuv2rgb_u2b_coeff= (int16_t)roundToInt16(cbu<<13);
+    cy   = (cy  * contrast)              >> 16;
+    crv  = (crv * contrast * saturation) >> 32;
+    cbu  = (cbu * contrast * saturation) >> 32;
+    cgu  = (cgu * contrast * saturation) >> 32;
+    cgv  = (cgv * contrast * saturation) >> 32;
+    oy  -= 256 * brightness;
+
+    c->uOffset = 0x0400040004000400LL;
+    c->vOffset = 0x0400040004000400LL;
+    c->yCoeff  = roundToInt16(cy  * 8192) * 0x0001000100010001ULL;
+    c->vrCoeff = roundToInt16(crv * 8192) * 0x0001000100010001ULL;
+    c->ubCoeff = roundToInt16(cbu * 8192) * 0x0001000100010001ULL;
+    c->vgCoeff = roundToInt16(cgv * 8192) * 0x0001000100010001ULL;
+    c->ugCoeff = roundToInt16(cgu * 8192) * 0x0001000100010001ULL;
+    c->yOffset = roundToInt16(oy  *    8) * 0x0001000100010001ULL;
+
+    c->yuv2rgb_y_coeff   = (int16_t)roundToInt16(cy  << 13);
+    c->yuv2rgb_y_offset  = (int16_t)roundToInt16(oy  <<  9);
+    c->yuv2rgb_v2r_coeff = (int16_t)roundToInt16(crv << 13);
+    c->yuv2rgb_v2g_coeff = (int16_t)roundToInt16(cgv << 13);
+    c->yuv2rgb_u2g_coeff = (int16_t)roundToInt16(cgu << 13);
+    c->yuv2rgb_u2b_coeff = (int16_t)roundToInt16(cbu << 13);
 
     //scale coefficients by cy
     crv = ((crv << 16) + 0x8000) / cy;
@@ -667,28 +716,28 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
     switch (bpp) {
     case 1:
         c->yuvTable = av_malloc(1024);
-        y_table = c->yuvTable;
-        yb = -(384<<16) - oy;
-        for (i = 0; i < 1024-110; i++) {
-            y_table[i+110] = av_clip_uint8((yb + 0x8000) >> 16) >> 7;
-            yb += cy;
+        y_table     = c->yuvTable;
+        yb = -(384 << 16) - oy;
+        for (i = 0; i < 1024 - 110; i++) {
+            y_table[i + 110]  = av_clip_uint8((yb + 0x8000) >> 16) >> 7;
+            yb               += cy;
         }
         fill_table(c->table_gU, 1, cgu, y_table + yoffs);
         fill_gv_table(c->table_gV, 1, cgv);
         break;
     case 4:
-    case 4|128:
-        rbase = isRgb ? 3 : 0;
-        gbase = 1;
-        bbase = isRgb ? 0 : 3;
-        c->yuvTable = av_malloc(1024*3);
-        y_table = c->yuvTable;
-        yb = -(384<<16) - oy;
-        for (i = 0; i < 1024-110; i++) {
-            int yval = av_clip_uint8((yb + 0x8000) >> 16);
-            y_table[i+110     ] =  (yval >> 7)       << rbase;
-            y_table[i+ 37+1024] = ((yval + 43) / 85) << gbase;
-            y_table[i+110+2048] =  (yval >> 7)       << bbase;
+    case 4 | 128:
+        rbase       = isRgb ? 3 : 0;
+        gbase       = 1;
+        bbase       = isRgb ? 0 : 3;
+        c->yuvTable = av_malloc(1024 * 3);
+        y_table     = c->yuvTable;
+        yb = -(384 << 16) - oy;
+        for (i = 0; i < 1024 - 110; i++) {
+            int yval                = av_clip_uint8((yb + 0x8000) >> 16);
+            y_table[i + 110]        = (yval >> 7)        << rbase;
+            y_table[i +  37 + 1024] = ((yval + 43) / 85) << gbase;
+            y_table[i + 110 + 2048] = (yval >> 7)        << bbase;
             yb += cy;
         }
         fill_table(c->table_rV, 1, crv, y_table + yoffs);
@@ -697,17 +746,17 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
         fill_gv_table(c->table_gV, 1, cgv);
         break;
     case 8:
-        rbase = isRgb ? 5 : 0;
-        gbase = isRgb ? 2 : 3;
-        bbase = isRgb ? 0 : 6;
-        c->yuvTable = av_malloc(1024*3);
-        y_table = c->yuvTable;
-        yb = -(384<<16) - oy;
-        for (i = 0; i < 1024-38; i++) {
-            int yval = av_clip_uint8((yb + 0x8000) >> 16);
-            y_table[i+16     ] = ((yval + 18) / 36) << rbase;
-            y_table[i+16+1024] = ((yval + 18) / 36) << gbase;
-            y_table[i+37+2048] = ((yval + 43) / 85) << bbase;
+        rbase       = isRgb ? 5 : 0;
+        gbase       = isRgb ? 2 : 3;
+        bbase       = isRgb ? 0 : 6;
+        c->yuvTable = av_malloc(1024 * 3);
+        y_table     = c->yuvTable;
+        yb = -(384 << 16) - oy;
+        for (i = 0; i < 1024 - 38; i++) {
+            int yval               = av_clip_uint8((yb + 0x8000) >> 16);
+            y_table[i + 16]        = ((yval + 18) / 36) << rbase;
+            y_table[i + 16 + 1024] = ((yval + 18) / 36) << gbase;
+            y_table[i + 37 + 2048] = ((yval + 43) / 85) << bbase;
             yb += cy;
         }
         fill_table(c->table_rV, 1, crv, y_table + yoffs);
@@ -716,21 +765,21 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
         fill_gv_table(c->table_gV, 1, cgv);
         break;
     case 12:
-        rbase = isRgb ? 8 : 0;
-        gbase = 4;
-        bbase = isRgb ? 0 : 8;
-        c->yuvTable = av_malloc(1024*3*2);
-        y_table16 = c->yuvTable;
-        yb = -(384<<16) - oy;
+        rbase       = isRgb ? 8 : 0;
+        gbase       = 4;
+        bbase       = isRgb ? 0 : 8;
+        c->yuvTable = av_malloc(1024 * 3 * 2);
+        y_table16   = c->yuvTable;
+        yb = -(384 << 16) - oy;
         for (i = 0; i < 1024; i++) {
-            uint8_t yval = av_clip_uint8((yb + 0x8000) >> 16);
-            y_table16[i     ] = (yval >> 4) << rbase;
-            y_table16[i+1024] = (yval >> 4) << gbase;
-            y_table16[i+2048] = (yval >> 4) << bbase;
+            uint8_t yval        = av_clip_uint8((yb + 0x8000) >> 16);
+            y_table16[i]        = (yval >> 4) << rbase;
+            y_table16[i + 1024] = (yval >> 4) << gbase;
+            y_table16[i + 2048] = (yval >> 4) << bbase;
             yb += cy;
         }
         if (isNotNe)
-            for (i = 0; i < 1024*3; i++)
+            for (i = 0; i < 1024 * 3; i++)
                 y_table16[i] = av_bswap16(y_table16[i]);
         fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
         fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
@@ -739,21 +788,21 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
         break;
     case 15:
     case 16:
-        rbase = isRgb ? bpp - 5 : 0;
-        gbase = 5;
-        bbase = isRgb ? 0 : (bpp - 5);
-        c->yuvTable = av_malloc(1024*3*2);
-        y_table16 = c->yuvTable;
-        yb = -(384<<16) - oy;
+        rbase       = isRgb ? bpp - 5 : 0;
+        gbase       = 5;
+        bbase       = isRgb ? 0 : (bpp - 5);
+        c->yuvTable = av_malloc(1024 * 3 * 2);
+        y_table16   = c->yuvTable;
+        yb = -(384 << 16) - oy;
         for (i = 0; i < 1024; i++) {
-            uint8_t yval = av_clip_uint8((yb + 0x8000) >> 16);
-            y_table16[i     ] = (yval >> 3)          << rbase;
-            y_table16[i+1024] = (yval >> (18 - bpp)) << gbase;
-            y_table16[i+2048] = (yval >> 3)          << bbase;
+            uint8_t yval        = av_clip_uint8((yb + 0x8000) >> 16);
+            y_table16[i]        = (yval >> 3)          << rbase;
+            y_table16[i + 1024] = (yval >> (18 - bpp)) << gbase;
+            y_table16[i + 2048] = (yval >> 3)          << bbase;
             yb += cy;
         }
-        if(isNotNe)
-            for (i = 0; i < 1024*3; i++)
+        if (isNotNe)
+            for (i = 0; i < 1024 * 3; i++)
                 y_table16[i] = av_bswap16(y_table16[i]);
         fill_table(c->table_rV, 2, crv, y_table16 + yoffs);
         fill_table(c->table_gU, 2, cgu, y_table16 + yoffs + 1024);
@@ -763,11 +812,11 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
     case 24:
     case 48:
         c->yuvTable = av_malloc(1024);
-        y_table = c->yuvTable;
-        yb = -(384<<16) - oy;
+        y_table     = c->yuvTable;
+        yb = -(384 << 16) - oy;
         for (i = 0; i < 1024; i++) {
-            y_table[i] = av_clip_uint8((yb + 0x8000) >> 16);
-            yb += cy;
+            y_table[i]  = av_clip_uint8((yb + 0x8000) >> 16);
+            yb         += cy;
         }
         fill_table(c->table_rV, 1, crv, y_table + yoffs);
         fill_table(c->table_gU, 1, cgu, y_table + yoffs);
@@ -775,21 +824,23 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4], int
         fill_gv_table(c->table_gV, 1, cgv);
         break;
     case 32:
-        base = (c->dstFormat == PIX_FMT_RGB32_1 || c->dstFormat == PIX_FMT_BGR32_1) ? 8 : 0;
-        rbase = base + (isRgb ? 16 : 0);
-        gbase = base + 8;
-        bbase = base + (isRgb ? 0 : 16);
+        base      = (c->dstFormat == PIX_FMT_RGB32_1 ||
+                     c->dstFormat == PIX_FMT_BGR32_1) ? 8 : 0;
+        rbase     = base + (isRgb ? 16 : 0);
+        gbase     = base + 8;
+        bbase     = base + (isRgb ? 0 : 16);
         needAlpha = CONFIG_SWSCALE_ALPHA && isALPHA(c->srcFormat);
         if (!needAlpha)
             abase = (base + 24) & 31;
-        c->yuvTable = av_malloc(1024*3*4);
-        y_table32 = c->yuvTable;
-        yb = -(384<<16) - oy;
+        c->yuvTable = av_malloc(1024 * 3 * 4);
+        y_table32   = c->yuvTable;
+        yb = -(384 << 16) - oy;
         for (i = 0; i < 1024; i++) {
-            unsigned yval = av_clip_uint8((yb + 0x8000) >> 16);
-            y_table32[i     ] = (yval << rbase) + (needAlpha ? 0 : (255u << abase));
-            y_table32[i+1024] = yval << gbase;
-            y_table32[i+2048] = yval << bbase;
+            unsigned yval       = av_clip_uint8((yb + 0x8000) >> 16);
+            y_table32[i]        = (yval << rbase) +
+                                  (needAlpha ? 0 : (255u << abase));
+            y_table32[i + 1024] =  yval << gbase;
+            y_table32[i + 2048] =  yval << bbase;
             yb += cy;
         }
         fill_table(c->table_rV, 4, crv, y_table32 + yoffs);