mplayer.hg: libswscale/swscale.c comparison

comparison libswscale/swscale.c @ 29481:c080f1f5c07e

Cosmetics: - Place curly brackets in the same line as while/for/if/switch/else/do; - Place curly brackets at column 0 in the next line starting a function.

author	ramiro
date	Sun, 16 Aug 2009 21:11:28 +0000
parents	a4d8dee13834
children	335da85c454c

comparison

equal deleted inserted replaced

-:a4d8dee13834
+:c080f1f5c07e
 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
 const int16_t **alpSrc, uint8_t *dest, uint8_t *uDest, uint8_t *vDest, uint8_t *aDest, int dstW, int chrDstW)
 {
 //FIXME Optimize (just quickly written not optimized..)
 int i;
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int val=1<<18;
 int j;
 for (j=0; j<lumFilterSize; j++)
 val += lumSrc[j][i] * lumFilter[j];
 dest[i]= av_clip_uint8(val>>19);
 }
 if (uDest)
-for (i=0; i<chrDstW; i++)
+for (i=0; i<chrDstW; i++) {
-{
 int u=1<<18;
 int v=1<<18;
 int j;
-for (j=0; j<chrFilterSize; j++)
+for (j=0; j<chrFilterSize; j++) {
-{
 u += chrSrc[j][i] * chrFilter[j];
 v += chrSrc[j][i + VOFW] * chrFilter[j];
 }
 uDest[i]= av_clip_uint8(u>>19);
 vDest[i]= av_clip_uint8(v>>19);
 }
 if (CONFIG_SWSCALE_ALPHA && aDest)
-for (i=0; i<dstW; i++){
+for (i=0; i<dstW; i++) {
 int val=1<<18;
 int j;
 for (j=0; j<lumFilterSize; j++)
 val += alpSrc[j][i] * lumFilter[j];
 const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
 uint8_t *dest, uint8_t *uDest, int dstW, int chrDstW, int dstFormat)
 {
 //FIXME Optimize (just quickly written not optimized..)
 int i;
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int val=1<<18;
 int j;
 for (j=0; j<lumFilterSize; j++)
 val += lumSrc[j][i] * lumFilter[j];
 if (!uDest)
 return;
 if (dstFormat == PIX_FMT_NV12)
-for (i=0; i<chrDstW; i++)
+for (i=0; i<chrDstW; i++) {
-{
 int u=1<<18;
 int v=1<<18;
 int j;
-for (j=0; j<chrFilterSize; j++)
+for (j=0; j<chrFilterSize; j++) {
-{
 u += chrSrc[j][i] * chrFilter[j];
 v += chrSrc[j][i + VOFW] * chrFilter[j];
 }
 uDest[2*i]= av_clip_uint8(u>>19);
 uDest[2*i+1]= av_clip_uint8(v>>19);
 }
 else
-for (i=0; i<chrDstW; i++)
+for (i=0; i<chrDstW; i++) {
-{
 int u=1<<18;
 int v=1<<18;
 int j;
-for (j=0; j<chrFilterSize; j++)
+for (j=0; j<chrFilterSize; j++) {
-{
 u += chrSrc[j][i] * chrFilter[j];
 v += chrSrc[j][i + VOFW] * chrFilter[j];
 }
 uDest[2*i]= av_clip_uint8(v>>19);
 uDest[2*i+1]= av_clip_uint8(u>>19);
 }
 }
 #define YSCALE_YUV_2_PACKEDX_NOCLIP_C(type,alpha) \
-for (i=0; i<(dstW>>1); i++){\
+for (i=0; i<(dstW>>1); i++) {\
 int j;\
 int Y1 = 1<<18;\
 int Y2 = 1<<18;\
 int U  = 1<<18;\
 int V  = 1<<18;\
 int av_unused A1, A2;\
 type av_unused *r, *b, *g;\
 const int i2= 2*i;\
 \
-for (j=0; j<lumFilterSize; j++)\
+for (j=0; j<lumFilterSize; j++) {\
-{\
 Y1 += lumSrc[j][i2] * lumFilter[j];\
 Y2 += lumSrc[j][i2+1] * lumFilter[j];\
 }\
-for (j=0; j<chrFilterSize; j++)\
+for (j=0; j<chrFilterSize; j++) {\
-{\
 U += chrSrc[j][i] * chrFilter[j];\
 V += chrSrc[j][i+VOFW] * chrFilter[j];\
 }\
 Y1>>=19;\
 Y2>>=19;\
 U >>=19;\
 V >>=19;\
-if (alpha){\
+if (alpha) {\
 A1 = 1<<18;\
 A2 = 1<<18;\
-for (j=0; j<lumFilterSize; j++){\
+for (j=0; j<lumFilterSize; j++) {\
 A1 += alpSrc[j][i2  ] * lumFilter[j];\
 A2 += alpSrc[j][i2+1] * lumFilter[j];\
 }\
 A1>>=19;\
 A2>>=19;\
 }\
 #define YSCALE_YUV_2_PACKEDX_C(type,alpha) \
 YSCALE_YUV_2_PACKEDX_NOCLIP_C(type,alpha)\
-if ((Y1|Y2|U|V)&256)\
+if ((Y1|Y2|U|V)&256) {\
-{\
 if (Y1>255)   Y1=255; \
 else if (Y1<0)Y1=0;   \
 if (Y2>255)   Y2=255; \
 else if (Y2<0)Y2=0;   \
 if (U>255)    U=255;  \
 else if (U<0) U=0;    \
 if (V>255)    V=255;  \
 else if (V<0) V=0;    \
 }\
-if (alpha && ((A1|A2)&256)){\
+if (alpha && ((A1|A2)&256)) {\
 A1=av_clip_uint8(A1);\
 A2=av_clip_uint8(A2);\
 }
 #define YSCALE_YUV_2_PACKEDX_FULL_C(rnd,alpha) \
-for (i=0; i<dstW; i++){\
+for (i=0; i<dstW; i++) {\
 int j;\
 int Y = 0;\
 int U = -128<<19;\
 int V = -128<<19;\
 int av_unused A;\
 int R,G,B;\
 \
-for (j=0; j<lumFilterSize; j++){\
+for (j=0; j<lumFilterSize; j++) {\
 Y += lumSrc[j][i     ] * lumFilter[j];\
 }\
-for (j=0; j<chrFilterSize; j++){\
+for (j=0; j<chrFilterSize; j++) {\
 U += chrSrc[j][i     ] * chrFilter[j];\
 V += chrSrc[j][i+VOFW] * chrFilter[j];\
 }\
 Y >>=10;\
 U >>=10;\
 V >>=10;\
-if (alpha){\
+if (alpha) {\
 A = rnd;\
 for (j=0; j<lumFilterSize; j++)\
 A += alpSrc[j][i     ] * lumFilter[j];\
 A >>=19;\
 if (A&256)\
 Y*= c->yuv2rgb_y_coeff;\
 Y+= rnd;\
 R= Y + V*c->yuv2rgb_v2r_coeff;\
 G= Y + V*c->yuv2rgb_v2g_coeff + U*c->yuv2rgb_u2g_coeff;\
 B= Y +                          U*c->yuv2rgb_u2b_coeff;\
-if ((R|G|B)&(0xC0000000)){\
+if ((R|G|B)&(0xC0000000)) {\
 if (R>=(256<<22))   R=(256<<22)-1; \
 else if (R<0)R=0;   \
 if (G>=(256<<22))   G=(256<<22)-1; \
 else if (G<0)G=0;   \
 if (B>=(256<<22))   B=(256<<22)-1; \
 else if (B<0)B=0;   \
 }\
 #define YSCALE_YUV_2_GRAY16_C \
-for (i=0; i<(dstW>>1); i++){\
+for (i=0; i<(dstW>>1); i++) {\
 int j;\
 int Y1 = 1<<18;\
 int Y2 = 1<<18;\
 int U  = 1<<18;\
 int V  = 1<<18;\
 \
 const int i2= 2*i;\
 \
-for (j=0; j<lumFilterSize; j++)\
+for (j=0; j<lumFilterSize; j++) {\
-{\
 Y1 += lumSrc[j][i2] * lumFilter[j];\
 Y2 += lumSrc[j][i2+1] * lumFilter[j];\
 }\
 Y1>>=11;\
 Y2>>=11;\
-if ((Y1|Y2|U|V)&65536)\
+if ((Y1|Y2|U|V)&65536) {\
-{\
 if (Y1>65535)   Y1=65535; \
 else if (Y1<0)Y1=0;   \
 if (Y2>65535)   Y2=65535; \
 else if (Y2<0)Y2=0;   \
 }
 r = (type *)c->table_rV[V];   \
 g = (type *)(c->table_gU[U] + c->table_gV[V]); \
 b = (type *)c->table_bU[U];   \
 #define YSCALE_YUV_2_PACKED2_C(type,alpha)   \
-for (i=0; i<(dstW>>1); i++){ \
+for (i=0; i<(dstW>>1); i++) { \
 const int i2= 2*i;       \
 int Y1= (buf0[i2  ]*yalpha1+buf1[i2  ]*yalpha)>>19;           \
 int Y2= (buf0[i2+1]*yalpha1+buf1[i2+1]*yalpha)>>19;           \
 int U= (uvbuf0[i     ]*uvalpha1+uvbuf1[i     ]*uvalpha)>>19;  \
 int V= (uvbuf0[i+VOFW]*uvalpha1+uvbuf1[i+VOFW]*uvalpha)>>19;  \
 type av_unused *r, *b, *g;                                    \
 int av_unused A1, A2;                                         \
-if (alpha){\
+if (alpha) {\
 A1= (abuf0[i2  ]*yalpha1+abuf1[i2  ]*yalpha)>>19;         \
 A2= (abuf0[i2+1]*yalpha1+abuf1[i2+1]*yalpha)>>19;         \
 }\
 #define YSCALE_YUV_2_GRAY16_2_C   \
-for (i=0; i<(dstW>>1); i++){ \
+for (i=0; i<(dstW>>1); i++) { \
 const int i2= 2*i;       \
 int Y1= (buf0[i2  ]*yalpha1+buf1[i2  ]*yalpha)>>11;           \
 int Y2= (buf0[i2+1]*yalpha1+buf1[i2+1]*yalpha)>>11;           \
 #define YSCALE_YUV_2_RGB2_C(type,alpha) \
 r = (type *)c->table_rV[V];\
 g = (type *)(c->table_gU[U] + c->table_gV[V]);\
 b = (type *)c->table_bU[U];\
 #define YSCALE_YUV_2_PACKED1_C(type,alpha) \
-for (i=0; i<(dstW>>1); i++){\
+for (i=0; i<(dstW>>1); i++) {\
 const int i2= 2*i;\
 int Y1= buf0[i2  ]>>7;\
 int Y2= buf0[i2+1]>>7;\
 int U= (uvbuf1[i     ])>>7;\
 int V= (uvbuf1[i+VOFW])>>7;\
 type av_unused *r, *b, *g;\
 int av_unused A1, A2;\
-if (alpha){\
+if (alpha) {\
 A1= abuf0[i2  ]>>7;\
 A2= abuf0[i2+1]>>7;\
 }\
 #define YSCALE_YUV_2_GRAY16_1_C \
-for (i=0; i<(dstW>>1); i++){\
+for (i=0; i<(dstW>>1); i++) {\
 const int i2= 2*i;\
 int Y1= buf0[i2  ]<<1;\
 int Y2= buf0[i2+1]<<1;\
 #define YSCALE_YUV_2_RGB1_C(type,alpha) \
 r = (type *)c->table_rV[V];\
 g = (type *)(c->table_gU[U] + c->table_gV[V]);\
 b = (type *)c->table_bU[U];\
 #define YSCALE_YUV_2_PACKED1B_C(type,alpha) \
-for (i=0; i<(dstW>>1); i++){\
+for (i=0; i<(dstW>>1); i++) {\
 const int i2= 2*i;\
 int Y1= buf0[i2  ]>>7;\
 int Y2= buf0[i2+1]>>7;\
 int U= (uvbuf0[i     ] + uvbuf1[i     ])>>8;\
 int V= (uvbuf0[i+VOFW] + uvbuf1[i+VOFW])>>8;\
 type av_unused *r, *b, *g;\
 int av_unused A1, A2;\
-if (alpha){\
+if (alpha) {\
 A1= abuf0[i2  ]>>7;\
 A2= abuf0[i2+1]>>7;\
 }\
 #define YSCALE_YUV_2_RGB1B_C(type,alpha) \
 b = (type *)c->table_bU[U];\
 #define YSCALE_YUV_2_MONO2_C \
 const uint8_t * const d128=dither_8x8_220[y&7];\
 uint8_t *g= c->table_gU[128] + c->table_gV[128];\
-for (i=0; i<dstW-7; i+=8){\
+for (i=0; i<dstW-7; i+=8) {\
 int acc;\
 acc =       g[((buf0[i  ]*yalpha1+buf1[i  ]*yalpha)>>19) + d128[0]];\
 acc+= acc + g[((buf0[i+1]*yalpha1+buf1[i+1]*yalpha)>>19) + d128[1]];\
 acc+= acc + g[((buf0[i+2]*yalpha1+buf1[i+2]*yalpha)>>19) + d128[2]];\
 acc+= acc + g[((buf0[i+3]*yalpha1+buf1[i+3]*yalpha)>>19) + d128[3]];\
 #define YSCALE_YUV_2_MONOX_C \
 const uint8_t * const d128=dither_8x8_220[y&7];\
 uint8_t *g= c->table_gU[128] + c->table_gV[128];\
 int acc=0;\
-for (i=0; i<dstW-1; i+=2){\
+for (i=0; i<dstW-1; i+=2) {\
 int j;\
 int Y1=1<<18;\
 int Y2=1<<18;\
 \
-for (j=0; j<lumFilterSize; j++)\
+for (j=0; j<lumFilterSize; j++) {\
-{\
 Y1 += lumSrc[j][i] * lumFilter[j];\
 Y2 += lumSrc[j][i+1] * lumFilter[j];\
 }\
 Y1>>=19;\
 Y2>>=19;\
-if ((Y1|Y2)&256)\
+if ((Y1|Y2)&256) {\
-{\
 if (Y1>255)   Y1=255;\
 else if (Y1<0)Y1=0;\
 if (Y2>255)   Y2=255;\
 else if (Y2<0)Y2=0;\
 }\
 acc+= acc + g[Y1+d128[(i+0)&7]];\
 acc+= acc + g[Y2+d128[(i+1)&7]];\
-if ((i&7)==6){\
+if ((i&7)==6) {\
 ((uint8_t*)dest)[0]= c->dstFormat == PIX_FMT_MONOBLACK ? acc : ~acc;\
 dest++;\
 }\
 }
 #define YSCALE_YUV_2_ANYRGB_C(func, func2, func_g16, func_monoblack)\
-switch(c->dstFormat)\
+switch(c->dstFormat) {\
-{\
 case PIX_FMT_RGB48BE:\
 case PIX_FMT_RGB48LE:\
 func(uint8_t,0)\
 ((uint8_t*)dest)[ 0]= r[Y1];\
 ((uint8_t*)dest)[ 1]= r[Y1];\
 dest+=12;\
 }\
 break;\
 case PIX_FMT_RGBA:\
 case PIX_FMT_BGRA:\
-if (CONFIG_SMALL){\
+if (CONFIG_SMALL) {\
 int needAlpha = CONFIG_SWSCALE_ALPHA && c->alpPixBuf;\
 func(uint32_t,needAlpha)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1] + (needAlpha ? (A1<<24) : 0);\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2] + (needAlpha ? (A2<<24) : 0);\
 }\
-}else{\
+} else {\
-if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf){\
+if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) {\
 func(uint32_t,1)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1] + (A1<<24);\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2] + (A2<<24);\
 }\
-}else{\
+} else {\
 func(uint32_t,0)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1];\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2];\
 }\
 }\
 }\
 break;\
 case PIX_FMT_ARGB:\
 case PIX_FMT_ABGR:\
-if (CONFIG_SMALL){\
+if (CONFIG_SMALL) {\
 int needAlpha = CONFIG_SWSCALE_ALPHA && c->alpPixBuf;\
 func(uint32_t,needAlpha)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1] + (needAlpha ? A1 : 0);\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2] + (needAlpha ? A2 : 0);\
 }\
-}else{\
+} else {\
-if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf){\
+if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) {\
 func(uint32_t,1)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1] + A1;\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2] + A2;\
 }\
-}else{\
+} else {\
 func(uint32_t,0)\
 ((uint32_t*)dest)[i2+0]= r[Y1] + g[Y1] + b[Y1];\
 ((uint32_t*)dest)[i2+1]= r[Y2] + g[Y2] + b[Y2];\
 }\
 }\
 {
 int i;
 int step= fmt_depth(c->dstFormat)/8;
 int aidx= 3;
-switch(c->dstFormat){
+switch(c->dstFormat) {
 case PIX_FMT_ARGB:
 dest++;
 aidx= 0;
 case PIX_FMT_RGB24:
 aidx--;
 case PIX_FMT_RGBA:
-if (CONFIG_SMALL){
+if (CONFIG_SMALL) {
 int needAlpha = CONFIG_SWSCALE_ALPHA && c->alpPixBuf;
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, needAlpha)
 dest[aidx]= needAlpha ? A : 255;
 dest[0]= R>>22;
 dest[1]= G>>22;
 dest[2]= B>>22;
 dest+= step;
 }
-}else{
+} else {
-if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf){
+if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) {
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, 1)
 dest[aidx]= A;
 dest[0]= R>>22;
 dest[1]= G>>22;
 dest[2]= B>>22;
 dest+= step;
 }
-}else{
+} else {
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, 0)
 dest[aidx]= 255;
 dest[0]= R>>22;
 dest[1]= G>>22;
 dest[2]= B>>22;
 dest++;
 aidx= 0;
 case PIX_FMT_BGR24:
 aidx--;
 case PIX_FMT_BGRA:
-if (CONFIG_SMALL){
+if (CONFIG_SMALL) {
 int needAlpha = CONFIG_SWSCALE_ALPHA && c->alpPixBuf;
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, needAlpha)
 dest[aidx]= needAlpha ? A : 255;
 dest[0]= B>>22;
 dest[1]= G>>22;
 dest[2]= R>>22;
 dest+= step;
 }
-}else{
+} else {
-if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf){
+if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) {
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, 1)
 dest[aidx]= A;
 dest[0]= B>>22;
 dest[1]= G>>22;
 dest[2]= R>>22;
 dest+= step;
 }
-}else{
+} else {
 YSCALE_YUV_2_RGBX_FULL_C(1<<21, 0)
 dest[aidx]= 255;
 dest[0]= B>>22;
 dest[1]= G>>22;
 dest[2]= R>>22;
 default:
 assert(0);
 }
 }
-static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, uint8_t val){
+static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, uint8_t val)
+{
 int i;
 uint8_t *ptr = plane + stride*y;
-for (i=0; i<height; i++){
+for (i=0; i<height; i++) {
 memset(ptr, val, width);
 ptr += stride;
 }
 }
 #define BGR2Y(type, name, shr, shg, shb, maskr, maskg, maskb, RY, GY, BY, S)\
 static inline void name(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)\
 {\
 int i;\
-for (i=0; i<width; i++)\
+for (i=0; i<width; i++) {\
-{\
 int b= (((const type*)src)[i]>>shb)&maskb;\
 int g= (((const type*)src)[i]>>shg)&maskg;\
 int r= (((const type*)src)[i]>>shr)&maskr;\
 \
 dst[i]= (((RY)*r + (GY)*g + (BY)*b + (33<<((S)-1)))>>(S));\
 BGR2Y(uint16_t, bgr16ToY, 0, 0, 0, 0x001F, 0x07E0, 0xF800, RY<<11, GY<<5, BY    , RGB2YUV_SHIFT+8)
 BGR2Y(uint16_t, bgr15ToY, 0, 0, 0, 0x001F, 0x03E0, 0x7C00, RY<<10, GY<<5, BY    , RGB2YUV_SHIFT+7)
 BGR2Y(uint16_t, rgb16ToY, 0, 0, 0, 0xF800, 0x07E0, 0x001F, RY    , GY<<5, BY<<11, RGB2YUV_SHIFT+8)
 BGR2Y(uint16_t, rgb15ToY, 0, 0, 0, 0x7C00, 0x03E0, 0x001F, RY    , GY<<5, BY<<10, RGB2YUV_SHIFT+7)
-static inline void abgrToA(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused){
+static inline void abgrToA(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
+{
 int i;
-for (i=0; i<width; i++){
+for (i=0; i<width; i++) {
 dst[i]= src[4*i];
 }
 }
 #define BGR2UV(type, name, shr, shg, shb, maska, maskr, maskg, maskb, RU, GU, BU, RV, GV, BV, S)\
 static inline void name(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, long width, uint32_t *unused)\
 {\
 int i;\
-for (i=0; i<width; i++)\
+for (i=0; i<width; i++) {\
-{\
 int b= (((const type*)src)[i]&maskb)>>shb;\
 int g= (((const type*)src)[i]&maskg)>>shg;\
 int r= (((const type*)src)[i]&maskr)>>shr;\
 \
 dstU[i]= ((RU)*r + (GU)*g + (BU)*b + (257<<((S)-1)))>>(S);\
 }\
 }\
 static inline void name ## _half(uint8_t *dstU, uint8_t *dstV, const uint8_t *src, const uint8_t *dummy, long width, uint32_t *unused)\
 {\
 int i;\
-for (i=0; i<width; i++)\
+for (i=0; i<width; i++) {\
-{\
 int pix0= ((const type*)src)[2*i+0];\
 int pix1= ((const type*)src)[2*i+1];\
 int g= (pix0&~(maskr|maskb))+(pix1&~(maskr|maskb));\
 int b= ((pix0+pix1-g)&(maskb|(2*maskb)))>>shb;\
 int r= ((pix0+pix1-g)&(maskr|(2*maskr)))>>shr;\
 BGR2UV(uint16_t, rgb15ToUV, 0, 0, 0,          0,   0x7C00, 0x03E0,   0x001F, RU    , GU<<5, BU<<10, RV    , GV<<5, BV<<10, RGB2YUV_SHIFT+7)
 static inline void palToY(uint8_t *dst, const uint8_t *src, long width, uint32_t *pal)
 {
 int i;
-for (i=0; i<width; i++)
+for (i=0; i<width; i++) {
-{
 int d= src[i];
 dst[i]= pal[d] & 0xFF;
 }
 }
 const uint8_t *src1, const uint8_t *src2,
 long width, uint32_t *pal)
 {
 int i;
 assert(src1 == src2);
-for (i=0; i<width; i++)
+for (i=0; i<width; i++) {
-{
 int p= pal[src1[i]];
 dstU[i]= p>>8;
 dstV[i]= p>>16;
 }
 }
 static inline void monowhite2Y(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
 {
 int i, j;
-for (i=0; i<width/8; i++){
+for (i=0; i<width/8; i++) {
 int d= ~src[i];
 for(j=0; j<8; j++)
 dst[8*i+j]= ((d>>(7-j))&1)*255;
 }
 }
 static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uint32_t *unused)
 {
 int i, j;
-for (i=0; i<width/8; i++){
+for (i=0; i<width/8; i++) {
 int d= src[i];
 for(j=0; j<8; j++)
 dst[8*i+j]= ((d>>(7-j))&1)*255;
 }
 }
 #endif
 // NOTE: the +1 is for the MMX scaler which reads over the end
 *filterPos = av_malloc((dstW+1)*sizeof(int16_t));
-if (FFABS(xInc - 0x10000) <10) // unscaled
+if (FFABS(xInc - 0x10000) <10) { // unscaled
-{
 int i;
 filterSize= 1;
 filter= av_mallocz(dstW*sizeof(*filter)*filterSize);
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 filter[i*filterSize]= fone;
 (*filterPos)[i]=i;
 }
-}
+} else if (flags&SWS_POINT) { // lame looking point sampling mode
-else if (flags&SWS_POINT) // lame looking point sampling mode
-{
 int i;
 int xDstInSrc;
 filterSize= 1;
 filter= av_malloc(dstW*sizeof(*filter)*filterSize);
 xDstInSrc= xInc/2 - 0x8000;
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int xx= (xDstInSrc - ((filterSize-1)<<15) + (1<<15))>>16;
 (*filterPos)[i]= xx;
 filter[i]= fone;
 xDstInSrc+= xInc;
 }
-}
+} else if ((xInc <= (1<<16) && (flags&SWS_AREA)) || (flags&SWS_FAST_BILINEAR)) { // bilinear upscale
-else if ((xInc <= (1<<16) && (flags&SWS_AREA)) || (flags&SWS_FAST_BILINEAR)) // bilinear upscale
-{
 int i;
 int xDstInSrc;
 filterSize= 2;
 filter= av_malloc(dstW*sizeof(*filter)*filterSize);
 xDstInSrc= xInc/2 - 0x8000;
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int xx= (xDstInSrc - ((filterSize-1)<<15) + (1<<15))>>16;
 int j;
 (*filterPos)[i]= xx;
 //bilinear upscale / linear interpolate / area averaging
-for (j=0; j<filterSize; j++)
+for (j=0; j<filterSize; j++) {
-{
 int64_t coeff= fone - FFABS((xx<<16) - xDstInSrc)*(fone>>16);
 if (coeff<0) coeff=0;
 filter[i*filterSize + j]= coeff;
 xx++;
 }
 xDstInSrc+= xInc;
 }
-}
+} else {
-else
-{
 int xDstInSrc;
 int sizeFactor;
 if      (flags&SWS_BICUBIC)      sizeFactor=  4;
 else if (flags&SWS_X)            sizeFactor=  8;
 if (filterSize > srcW-2) filterSize=srcW-2;
 filter= av_malloc(dstW*sizeof(*filter)*filterSize);
 xDstInSrc= xInc - 0x10000;
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int xx= (xDstInSrc - ((filterSize-2)<<16)) / (1<<17);
 int j;
 (*filterPos)[i]= xx;
-for (j=0; j<filterSize; j++)
+for (j=0; j<filterSize; j++) {
-{
 int64_t d= ((int64_t)FFABS((xx<<17) - xDstInSrc))<<13;
 double floatd;
 int64_t coeff;
 if (xInc > 1<<16)
 d= d*dstW/srcW;
 floatd= d * (1.0/(1<<30));
-if (flags & SWS_BICUBIC)
+if (flags & SWS_BICUBIC) {
-{
 int64_t B= (param[0] != SWS_PARAM_DEFAULT ? param[0] :   0) * (1<<24);
 int64_t C= (param[1] != SWS_PARAM_DEFAULT ? param[1] : 0.6) * (1<<24);
 int64_t dd = ( d*d)>>30;
 int64_t ddd= (dd*d)>>30;
 coeff = (-B-6*C)*ddd + (6*B+30*C)*dd + (-12*B-48*C)*d + (8*B+24*C)*(1<<30);
 else
 coeff=0.0;
 coeff *= fone>>(30+24);
 }
-/*                else if (flags & SWS_X)
+/*                else if (flags & SWS_X) {
-{
 double p= param ? param*0.01 : 0.3;
 coeff = d ? sin(d*PI)/(d*PI) : 1.0;
 coeff*= pow(2.0, - p*d*d);
 }*/
-else if (flags & SWS_X)
+else if (flags & SWS_X) {
-{
 double A= param[0] != SWS_PARAM_DEFAULT ? param[0] : 1.0;
 double c;
 if (floatd<1.0)
 c = cos(floatd*PI);
 else
 c=-1.0;
 if (c<0.0)      c= -pow(-c, A);
 else            c=  pow( c, A);
 coeff= (c*0.5 + 0.5)*fone;
-}
+} else if (flags & SWS_AREA) {
-else if (flags & SWS_AREA)
-{
 int64_t d2= d - (1<<29);
 if      (d2*xInc < -(1LL<<(29+16))) coeff= 1.0 * (1LL<<(30+16));
 else if (d2*xInc <  (1LL<<(29+16))) coeff= -d2*xInc + (1LL<<(29+16));
 else coeff=0.0;
 coeff *= fone>>(30+16);
-}
+} else if (flags & SWS_GAUSS) {
-else if (flags & SWS_GAUSS)
-{
 double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0;
 coeff = (pow(2.0, - p*floatd*floatd))*fone;
-}
+} else if (flags & SWS_SINC) {
-else if (flags & SWS_SINC)
-{
 coeff = (d ? sin(floatd*PI)/(floatd*PI) : 1.0)*fone;
-}
+} else if (flags & SWS_LANCZOS) {
-else if (flags & SWS_LANCZOS)
-{
 double p= param[0] != SWS_PARAM_DEFAULT ? param[0] : 3.0;
 coeff = (d ? sin(floatd*PI)*sin(floatd*PI/p)/(floatd*floatd*PI*PI/p) : 1.0)*fone;
 if (floatd>p) coeff=0;
-}
+} else if (flags & SWS_BILINEAR) {
-else if (flags & SWS_BILINEAR)
-{
 coeff= (1<<30) - d;
 if (coeff<0) coeff=0;
 coeff *= fone >> 30;
-}
+} else if (flags & SWS_SPLINE) {
-else if (flags & SWS_SPLINE)
-{
 double p=-2.196152422706632;
 coeff = getSplineCoeff(1.0, 0.0, p, -p-1.0, floatd) * fone;
-}
+} else {
-else {
 coeff= 0.0; //GCC warning killer
 assert(0);
 }
 filter[i*filterSize + j]= coeff;
 if (srcFilter) filter2Size+= srcFilter->length - 1;
 if (dstFilter) filter2Size+= dstFilter->length - 1;
 assert(filter2Size>0);
 filter2= av_mallocz(filter2Size*dstW*sizeof(*filter2));
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int j, k;
-if(srcFilter){
+if(srcFilter) {
-for (k=0; k<srcFilter->length; k++){
+for (k=0; k<srcFilter->length; k++) {
 for (j=0; j<filterSize; j++)
 filter2[i*filter2Size + k + j] += srcFilter->coeff[k]*filter[i*filterSize + j];
 }
-}else{
+} else {
 for (j=0; j<filterSize; j++)
 filter2[i*filter2Size + j]= filter[i*filterSize + j];
 }
 //FIXME dstFilter
 av_freep(&filter);
 /* try to reduce the filter-size (step1 find size and shift left) */
 // Assume it is near normalized (*0.5 or *2.0 is OK but * 0.001 is not).
 minFilterSize= 0;
-for (i=dstW-1; i>=0; i--)
+for (i=dstW-1; i>=0; i--) {
-{
 int min= filter2Size;
 int j;
 int64_t cutOff=0.0;
 /* get rid off near zero elements on the left by shifting left */
-for (j=0; j<filter2Size; j++)
+for (j=0; j<filter2Size; j++) {
-{
 int k;
 cutOff += FFABS(filter2[i*filter2Size]);
 if (cutOff > SWS_MAX_REDUCE_CUTOFF*fone) break;
 (*filterPos)[i]++;
 }
 cutOff=0;
 /* count near zeros on the right */
-for (j=filter2Size-1; j>0; j--)
+for (j=filter2Size-1; j>0; j--) {
-{
 cutOff += FFABS(filter2[i*filter2Size + j]);
 if (cutOff > SWS_MAX_REDUCE_CUTOFF*fone) break;
 min--;
 }
 *outFilterSize= filterSize;
 if (flags&SWS_PRINT_INFO)
 av_log(NULL, AV_LOG_VERBOSE, "SwScaler: reducing / aligning filtersize %d -> %d\n", filter2Size, filterSize);
 /* try to reduce the filter-size (step2 reduce it) */
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int j;
-for (j=0; j<filterSize; j++)
+for (j=0; j<filterSize; j++) {
-{
 if (j>=filter2Size) filter[i*filterSize + j]= 0;
 else               filter[i*filterSize + j]= filter2[i*filter2Size + j];
 if((flags & SWS_BITEXACT) && j>=minFilterSize)
 filter[i*filterSize + j]= 0;
 }
 //FIXME try to align filterPos if possible
 //fix borders
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int j;
-if ((*filterPos)[i] < 0)
+if ((*filterPos)[i] < 0) {
-{
 // move filter coefficients left to compensate for filterPos
-for (j=1; j<filterSize; j++)
+for (j=1; j<filterSize; j++) {
-{
 int left= FFMAX(j + (*filterPos)[i], 0);
 filter[i*filterSize + left] += filter[i*filterSize + j];
 filter[i*filterSize + j]=0;
 }
 (*filterPos)[i]= 0;
 }
-if ((*filterPos)[i] + filterSize > srcW)
+if ((*filterPos)[i] + filterSize > srcW) {
-{
 int shift= (*filterPos)[i] + filterSize - srcW;
 // move filter coefficients right to compensate for filterPos
-for (j=filterSize-2; j>=0; j--)
+for (j=filterSize-2; j>=0; j--) {
-{
 int right= FFMIN(j + shift, filterSize-1);
 filter[i*filterSize +right] += filter[i*filterSize +j];
 filter[i*filterSize +j]=0;
 }
 (*filterPos)[i]= srcW - filterSize;
 // Note the +1 is for the MMX scaler which reads over the end
 /* align at 16 for AltiVec (needed by hScale_altivec_real) */
 *outFilter= av_mallocz(*outFilterSize*(dstW+1)*sizeof(int16_t));
 /* normalize & store in outFilter */
-for (i=0; i<dstW; i++)
+for (i=0; i<dstW; i++) {
-{
 int j;
 int64_t error=0;
 int64_t sum=0;
-for (j=0; j<filterSize; j++)
+for (j=0; j<filterSize; j++) {
-{
 sum+= filter[i*filterSize + j];
 }
 sum= (sum + one/2)/ one;
-for (j=0; j<*outFilterSize; j++)
+for (j=0; j<*outFilterSize; j++) {
-{
 int64_t v= filter[i*filterSize + j] + error;
 int intV= ROUNDED_DIV(v, sum);
 (*outFilter)[i*(*outFilterSize) + j]= intV;
 error= v - intV*sum;
 }
 }
 (*filterPos)[dstW]= (*filterPos)[dstW-1]; // the MMX scaler will read over the end
-for (i=0; i<*outFilterSize; i++)
+for (i=0; i<*outFilterSize; i++) {
-{
 int j= dstW*(*outFilterSize);
 (*outFilter)[j + i]= (*outFilter)[j + i - (*outFilterSize)];
 }
 ret=0;
 );
 xpos= 0; //lumXInc/2 - 0x8000; // difference between pixel centers
 fragmentPos=0;
-for (i=0; i<dstW/numSplits; i++)
+for (i=0; i<dstW/numSplits; i++) {
-{
 int xx=xpos>>16;
-if ((i&3) == 0)
+if ((i&3) == 0) {
-{
 int a=0;
 int b=((xpos+xInc)>>16) - xx;
 int c=((xpos+xInc*2)>>16) - xx;
 int d=((xpos+xInc*3)>>16) - xx;
 int inc                = (d+1<4);
 a | (b<<2) | (c<<4) | (d<<6);
 if (i+4-inc>=dstW) shift=maxShift; //avoid overread
 else if ((filterPos[i/2]&3) <= maxShift) shift=filterPos[i/2]&3; //Align
-if (shift && i>=shift)
+if (shift && i>=shift) {
-{
 filterCode[fragmentPos + imm8OfPShufW1]+= 0x55*shift;
 filterCode[fragmentPos + imm8OfPShufW2]+= 0x55*shift;
 filterPos[i/2]-=shift;
 }
 }
 return fragmentPos + 1;
 }
 #endif /* COMPILE_MMX2 */
-static void globalInit(void){
+static void globalInit(void)
+{
 // generating tables:
 int i;
-for (i=0; i<768; i++){
+for (i=0; i<768; i++) {
 int c= av_clip_uint8(i-256);
 clip_table[i]=c;
 }
 }
 #endif
 #endif //!CONFIG_RUNTIME_CPUDETECT
 }
 static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 /* Copy Y plane */
 if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
 memcpy(dst, src[0], srcSliceH*dstStride[0]);
-else
+else {
-{
 int i;
 const uint8_t *srcPtr= src[0];
 uint8_t *dstPtr= dst;
-for (i=0; i<srcSliceH; i++)
+for (i=0; i<srcSliceH; i++) {
-{
 memcpy(dstPtr, srcPtr, c->srcW);
 srcPtr+= srcStride[0];
 dstPtr+= dstStride[0];
 }
 }
 return srcSliceH;
 }
 static int PlanarToYuy2Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
 return srcSliceH;
 }
 static int PlanarToUyvyWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
 return srcSliceH;
 }
 static int YUV422PToYuy2Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 yuv422ptoyuy2(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]);
 return srcSliceH;
 }
 static int YUV422PToUyvyWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
 yuv422ptouyvy(src[0],src[1],src[2],dst,c->srcW,srcSliceH,srcStride[0],srcStride[1],dstStride[0]);
 return srcSliceH;
 }
 static int YUYV2YUV420Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
 uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
 uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
 yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 return srcSliceH;
 }
 static int YUYV2YUV422Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
 uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
 uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
 yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 return srcSliceH;
 }
 static int UYVY2YUV420Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
 uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY/2;
 uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY/2;
 uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 return srcSliceH;
 }
 static int UYVY2YUV422Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dstParam[], int dstStride[]){
+int srcSliceH, uint8_t* dstParam[], int dstStride[])
+{
 uint8_t *ydst=dstParam[0] + dstStride[0]*srcSliceY;
 uint8_t *udst=dstParam[1] + dstStride[1]*srcSliceY;
 uint8_t *vdst=dstParam[2] + dstStride[2]*srcSliceY;
 uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0], dstStride[1], srcStride[0]);
 return srcSliceH;
 }
 static int pal2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 const enum PixelFormat srcFormat= c->srcFormat;
 const enum PixelFormat dstFormat= c->dstFormat;
 void (*conv)(const uint8_t *src, uint8_t *dst, long num_pixels,
 const uint8_t *palette)=NULL;
 int i;
 if (!usePal(srcFormat))
 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
 sws_format_name(srcFormat), sws_format_name(dstFormat));
-switch(dstFormat){
+switch(dstFormat) {
 case PIX_FMT_RGB32  : conv = palette8topacked32; break;
 case PIX_FMT_BGR32  : conv = palette8topacked32; break;
 case PIX_FMT_BGR32_1: conv = palette8topacked32; break;
 case PIX_FMT_RGB32_1: conv = palette8topacked32; break;
 case PIX_FMT_RGB24  : conv = palette8topacked24; break;
 return srcSliceH;
 }
 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
 static int rgb2rgbWrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 const enum PixelFormat srcFormat= c->srcFormat;
 const enum PixelFormat dstFormat= c->dstFormat;
 const int srcBpp= (fmt_depth(srcFormat) + 7) >> 3;
 const int dstBpp= (fmt_depth(dstFormat) + 7) >> 3;
 const int srcId= fmt_depth(srcFormat) >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 */
 const int dstId= fmt_depth(dstFormat) >> 2;
 void (*conv)(const uint8_t *src, uint8_t *dst, long src_size)=NULL;
 /* BGR -> BGR */
 if (  (isBGR(srcFormat) && isBGR(dstFormat))
-|| (isRGB(srcFormat) && isRGB(dstFormat))){
+|| (isRGB(srcFormat) && isRGB(dstFormat))) {
-switch(srcId | (dstId<<4)){
+switch(srcId | (dstId<<4)) {
 case 0x34: conv= rgb16to15; break;
 case 0x36: conv= rgb24to15; break;
 case 0x38: conv= rgb32to15; break;
 case 0x43: conv= rgb15to16; break;
 case 0x46: conv= rgb24to16; break;
 case 0x84: conv= rgb16to32; break;
 case 0x86: conv= rgb24to32; break;
 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
 sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
 }
-}else if (  (isBGR(srcFormat) && isRGB(dstFormat))
+} else if (  (isBGR(srcFormat) && isRGB(dstFormat))
-|| (isRGB(srcFormat) && isBGR(dstFormat))){
+|| (isRGB(srcFormat) && isBGR(dstFormat))) {
-switch(srcId | (dstId<<4)){
+switch(srcId | (dstId<<4)) {
 case 0x33: conv= rgb15tobgr15; break;
 case 0x34: conv= rgb16tobgr15; break;
 case 0x36: conv= rgb24tobgr15; break;
 case 0x38: conv= rgb32tobgr15; break;
 case 0x43: conv= rgb15tobgr16; break;
 case 0x86: conv= rgb24tobgr32; break;
 case 0x88: conv= rgb32tobgr32; break;
 default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
 sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
 }
-}else{
+} else {
 av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
 sws_format_name(srcFormat), sws_format_name(dstFormat));
 }
-if(conv)
+if(conv) {
-{
 uint8_t *srcPtr= src[0];
 if(srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
 srcPtr += ALT32_CORR;
 if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
 conv(srcPtr, dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
-else
+else {
-{
 int i;
 uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
-for (i=0; i<srcSliceH; i++)
+for (i=0; i<srcSliceH; i++) {
-{
 conv(srcPtr, dstPtr, c->srcW*srcBpp);
 srcPtr+= srcStride[0];
 dstPtr+= dstStride[0];
 }
 }
 }
 return srcSliceH;
 }
 static int bgr24toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 rgb24toyv12(
 src[0],
 dst[0]+ srcSliceY    *dstStride[0],
 dst[1]+(srcSliceY>>1)*dstStride[1],
 fillPlane(dst[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
 return srcSliceH;
 }
 static int yvu9toyv12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 int i;
 /* copy Y */
 if (srcStride[0]==dstStride[0] && srcStride[0] > 0)
 memcpy(dst[0]+ srcSliceY*dstStride[0], src[0], srcStride[0]*srcSliceH);
-else{
+else {
 uint8_t *srcPtr= src[0];
 uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
-for (i=0; i<srcSliceH; i++)
+for (i=0; i<srcSliceH; i++) {
-{
 memcpy(dstPtr, srcPtr, c->srcW);
 srcPtr+= srcStride[0];
 dstPtr+= dstStride[0];
 }
 }
-if (c->dstFormat==PIX_FMT_YUV420P || c->dstFormat==PIX_FMT_YUVA420P){
+if (c->dstFormat==PIX_FMT_YUV420P || c->dstFormat==PIX_FMT_YUVA420P) {
 planar2x(src[1], dst[1] + dstStride[1]*(srcSliceY >> 1), c->chrSrcW,
 srcSliceH >> 2, srcStride[1], dstStride[1]);
 planar2x(src[2], dst[2] + dstStride[2]*(srcSliceY >> 1), c->chrSrcW,
 srcSliceH >> 2, srcStride[2], dstStride[2]);
-}else{
+} else {
 planar2x(src[1], dst[2] + dstStride[2]*(srcSliceY >> 1), c->chrSrcW,
 srcSliceH >> 2, srcStride[1], dstStride[2]);
 planar2x(src[2], dst[1] + dstStride[1]*(srcSliceY >> 1), c->chrSrcW,
 srcSliceH >> 2, srcStride[2], dstStride[1]);
 }
 static int packedCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 int srcSliceH, uint8_t* dst[], int dstStride[])
 {
 if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
 memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
-else
+else {
-{
 int i;
 uint8_t *srcPtr= src[0];
 uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
 int length=0;
 /* universal length finder */
 while(length+c->srcW <= FFABS(dstStride[0])
 && length+c->srcW <= FFABS(srcStride[0])) length+= c->srcW;
 assert(length!=0);
-for (i=0; i<srcSliceH; i++)
+for (i=0; i<srcSliceH; i++) {
-{
 memcpy(dstPtr, srcPtr, length);
 srcPtr+= srcStride[0];
 dstPtr+= dstStride[0];
 }
 }
 static int planarCopy(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
 int srcSliceH, uint8_t* dst[], int dstStride[])
 {
 int plane, i, j;
-for (plane=0; plane<4; plane++)
+for (plane=0; plane<4; plane++) {
-{
 int length= (plane==0 || plane==3) ? c->srcW  : -((-c->srcW  )>>c->chrDstHSubSample);
 int y=      (plane==0 || plane==3) ? srcSliceY: -((-srcSliceY)>>c->chrDstVSubSample);
 int height= (plane==0 || plane==3) ? srcSliceH: -((-srcSliceH)>>c->chrDstVSubSample);
 uint8_t *srcPtr= src[plane];
 uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
 if (!dst[plane]) continue;
 // ignore palette for GRAY8
 if (plane == 1 && !dst[2]) continue;
-if (!src[plane] || (plane == 1 && !src[2])){
+if (!src[plane] || (plane == 1 && !src[2])) {
 if(is16BPS(c->dstFormat))
 length*=2;
 fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
-}else
+} else {
-{
+if(is16BPS(c->srcFormat) && !is16BPS(c->dstFormat)) {
-if(is16BPS(c->srcFormat) && !is16BPS(c->dstFormat)){
 if (!isBE(c->srcFormat)) srcPtr++;
-for (i=0; i<height; i++){
+for (i=0; i<height; i++) {
 for (j=0; j<length; j++) dstPtr[j] = srcPtr[j<<1];
 srcPtr+= srcStride[plane];
 dstPtr+= dstStride[plane];
 }
-}else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)){
+} else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)) {
-for (i=0; i<height; i++){
+for (i=0; i<height; i++) {
-for (j=0; j<length; j++){
+for (j=0; j<length; j++) {
 dstPtr[ j<<1   ] = srcPtr[j];
 dstPtr[(j<<1)+1] = srcPtr[j];
 }
 srcPtr+= srcStride[plane];
 dstPtr+= dstStride[plane];
 }
-}else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
+} else if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat)
-&& isBE(c->srcFormat) != isBE(c->dstFormat)){
+&& isBE(c->srcFormat) != isBE(c->dstFormat)) {
-for (i=0; i<height; i++){
+for (i=0; i<height; i++) {
 for (j=0; j<length; j++)
 ((uint16_t*)dstPtr)[j] = bswap_16(((uint16_t*)srcPtr)[j]);
 srcPtr+= srcStride[plane];
 dstPtr+= dstStride[plane];
 }
 } else if (dstStride[plane]==srcStride[plane] && srcStride[plane] > 0)
 memcpy(dst[plane] + dstStride[plane]*y, src[plane], height*dstStride[plane]);
-else
+else {
-{
 if(is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
 length*=2;
-for (i=0; i<height; i++)
+for (i=0; i<height; i++) {
-{
 memcpy(dstPtr, srcPtr, length);
 srcPtr+= srcStride[plane];
 dstPtr+= dstStride[plane];
 }
 }
 }
 return srcSliceH;
 }
-static void getSubSampleFactors(int *h, int *v, int format){
+static void getSubSampleFactors(int *h, int *v, int format)
-switch(format){
+{
+switch(format) {
 case PIX_FMT_UYVY422:
 case PIX_FMT_YUYV422:
 *h=1;
 *v=0;
 break;
 *v=0;
 break;
 }
 }
-static uint16_t roundToInt16(int64_t f){
+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 sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation){
+int sws_setColorspaceDetails(SwsContext *c, const int inv_table[4], int srcRange, const int table[4], int dstRange, int brightness, int contrast, int saturation)
+{
 int64_t crv =  inv_table[0];
 int64_t cbu =  inv_table[1];
 int64_t cgu = -inv_table[2];
 int64_t cgv = -inv_table[3];
 int64_t cy  = 1<<16;
 if (isYUV(c->dstFormat) || isGray(c->dstFormat)) return -1;
 c->uOffset=   0x0400040004000400LL;
 c->vOffset=   0x0400040004000400LL;
-if (!srcRange){
+if (!srcRange) {
 cy= (cy*255) / 219;
 oy= 16<<16;
-}else{
+} else {
 crv= (crv*224) / 255;
 cbu= (cbu*224) / 255;
 cgu= (cgu*224) / 255;
 cgv= (cgv*224) / 255;
 }
 ff_yuv2rgb_init_tables_altivec(c, inv_table, brightness, contrast, saturation);
 #endif
 return 0;
 }
-int sws_getColorspaceDetails(SwsContext *c, int **inv_table, int *srcRange, int **table, int *dstRange, int *brightness, int *contrast, int *saturation){
+int sws_getColorspaceDetails(SwsContext *c, int **inv_table, int *srcRange, int **table, int *dstRange, int *brightness, int *contrast, int *saturation)
+{
 if (isYUV(c->dstFormat) || isGray(c->dstFormat)) return -1;
 *inv_table = c->srcColorspaceTable;
 *table     = c->dstColorspaceTable;
 *srcRange  = c->srcRange;
 && ((fmt_depth(dstFormat))<(fmt_depth(srcFormat)) || (!(isRGB(srcFormat) || isBGR(srcFormat))));
 srcRange = handle_jpeg(&srcFormat);
 dstRange = handle_jpeg(&dstFormat);
-if (!isSupportedIn(srcFormat))
+if (!isSupportedIn(srcFormat)) {
-{
 av_log(NULL, AV_LOG_ERROR, "swScaler: %s is not supported as input pixel format\n", sws_format_name(srcFormat));
 return NULL;
 }
-if (!isSupportedOut(dstFormat))
+if (!isSupportedOut(dstFormat)) {
-{
 av_log(NULL, AV_LOG_ERROR, "swScaler: %s is not supported as output pixel format\n", sws_format_name(dstFormat));
 return NULL;
 }
 i= flags & ( SWS_POINT
 |SWS_GAUSS
 |SWS_LANCZOS
 |SWS_SINC
 |SWS_SPLINE
 |SWS_BICUBLIN);
-if(!i || (i & (i-1)))
+if(!i || (i & (i-1))) {
-{
 av_log(NULL, AV_LOG_ERROR, "swScaler: Exactly one scaler algorithm must be chosen\n");
 return NULL;
 }
 /* sanity check */
-if (srcW<4 || srcH<1 || dstW<8 || dstH<1) //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
+if (srcW<4 || srcH<1 || dstW<8 || dstH<1) { //FIXME check if these are enough and try to lowwer them after fixing the relevant parts of the code
-{
 av_log(NULL, AV_LOG_ERROR, "swScaler: %dx%d -> %dx%d is invalid scaling dimension\n",
 srcW, srcH, dstW, dstH);
 return NULL;
 }
-if(srcW > VOFW || dstW > VOFW){
+if(srcW > VOFW || dstW > VOFW) {
 av_log(NULL, AV_LOG_ERROR, "swScaler: Compile-time maximum width is "AV_STRINGIFY(VOFW)" change VOF/VOFW and recompile\n");
 return NULL;
 }
 if (!dstFilter) dstFilter= &dummyFilter;
 && srcFormat!=PIX_FMT_RGB4      && srcFormat!=PIX_FMT_BGR4
 && srcFormat!=PIX_FMT_RGB4_BYTE && srcFormat!=PIX_FMT_BGR4_BYTE
 && ((dstW>>c->chrDstHSubSample) <= (srcW>>1) || (flags&(SWS_FAST_BILINEAR|SWS_POINT))))
 c->chrSrcHSubSample=1;
-if (param){
+if (param) {
 c->param[0] = param[0];
 c->param[1] = param[1];
-}else{
+} else {
 c->param[0] =
 c->param[1] = SWS_PARAM_DEFAULT;
 }
 // Note the -((-x)>>y) is so that we always round toward +inf.
 c->chrDstH= -((-dstH) >> c->chrDstVSubSample);
 sws_setColorspaceDetails(c, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT], srcRange, ff_yuv2rgb_coeffs[SWS_CS_DEFAULT] /* FIXME*/, dstRange, 0, 1<<16, 1<<16);
 /* unscaled special cases */
-if (unscaled && !usesHFilter && !usesVFilter && (srcRange == dstRange || isBGR(dstFormat) || isRGB(dstFormat)))
+if (unscaled && !usesHFilter && !usesVFilter && (srcRange == dstRange || isBGR(dstFormat) || isRGB(dstFormat))) {
-{
 /* yv12_to_nv12 */
-if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21))
+if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
-{
 c->swScale= PlanarToNV12Wrapper;
 }
 /* yuv2bgr */
 if ((srcFormat==PIX_FMT_YUV420P || srcFormat==PIX_FMT_YUV422P || srcFormat==PIX_FMT_YUVA420P) && (isBGR(dstFormat) || isRGB(dstFormat))
-&& !(flags & SWS_ACCURATE_RND) && !(dstH&1))
+&& !(flags & SWS_ACCURATE_RND) && !(dstH&1)) {
-{
 c->swScale= ff_yuv2rgb_get_func_ptr(c);
 }
-if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT))
+if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) {
-{
 c->swScale= yvu9toyv12Wrapper;
 }
 /* bgr24toYV12 */
 if (srcFormat==PIX_FMT_BGR24 && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_ACCURATE_RND))
 dstFormat == PIX_FMT_BGR32   ||
 dstFormat == PIX_FMT_BGR32_1 ||
 dstFormat == PIX_FMT_BGR24)))
 c->swScale= pal2rgbWrapper;
-if (srcFormat == PIX_FMT_YUV422P)
+if (srcFormat == PIX_FMT_YUV422P) {
-{
 if (dstFormat == PIX_FMT_YUYV422)
 c->swScale= YUV422PToYuy2Wrapper;
 else if (dstFormat == PIX_FMT_UYVY422)
 c->swScale= YUV422PToUyvyWrapper;
 }
 /* LQ converters if -sws 0 or -sws 4*/
-if (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)){
+if (c->flags&(SWS_FAST_BILINEAR|SWS_POINT)) {
 /* yv12_to_yuy2 */
-if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P)
+if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) {
-{
 if (dstFormat == PIX_FMT_YUYV422)
 c->swScale= PlanarToYuy2Wrapper;
 else if (dstFormat == PIX_FMT_UYVY422)
 c->swScale= PlanarToUyvyWrapper;
 }
 #if ARCH_BFIN
 if (flags & SWS_CPU_CAPS_BFIN)
 ff_bfin_get_unscaled_swscale (c);
 #endif
-if (c->swScale){
+if (c->swScale) {
 if (flags&SWS_PRINT_INFO)
 av_log(c, AV_LOG_INFO, "using unscaled %s -> %s special converter\n",
 sws_format_name(srcFormat), sws_format_name(dstFormat));
 return c;
 }
 }
-if (flags & SWS_CPU_CAPS_MMX2)
+if (flags & SWS_CPU_CAPS_MMX2) {
-{
 c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0;
-if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR))
+if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR)) {
-{
 if (flags&SWS_PRINT_INFO)
 av_log(c, AV_LOG_INFO, "output width is not a multiple of 32 -> no MMX2 scaler\n");
 }
 if (usesHFilter) c->canMMX2BeUsed=0;
 }
 // but only for the FAST_BILINEAR mode otherwise do correct scaling
 // n-2 is the last chrominance sample available
 // this is not perfect, but no one should notice the difference, the more correct variant
 // would be like the vertical one, but that would require some special code for the
 // first and last pixel
-if (flags&SWS_FAST_BILINEAR)
+if (flags&SWS_FAST_BILINEAR) {
-{
+if (c->canMMX2BeUsed) {
-if (c->canMMX2BeUsed)
-{
 c->lumXInc+= 20;
 c->chrXInc+= 20;
 }
 //we don't use the x86 asm scaler if MMX is available
-else if (flags & SWS_CPU_CAPS_MMX)
+else if (flags & SWS_CPU_CAPS_MMX) {
-{
 c->lumXInc = ((srcW-2)<<16)/(dstW-2) - 20;
 c->chrXInc = ((c->chrSrcW-2)<<16)/(c->chrDstW-2) - 20;
 }
 }
 (flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
 srcFilter->chrH, dstFilter->chrH, c->param);
 #if defined(COMPILE_MMX2)
 // can't downscale !!!
-if (c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR))
+if (c->canMMX2BeUsed && (flags & SWS_FAST_BILINEAR)) {
-{
 c->lumMmx2FilterCodeSize = initMMX2HScaler(      dstW, c->lumXInc, NULL, NULL, NULL, 8);
 c->chrMmx2FilterCodeSize = initMMX2HScaler(c->chrDstW, c->chrXInc, NULL, NULL, NULL, 4);
 #ifdef MAP_ANONYMOUS
 c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 }
 // calculate buffer sizes so that they won't run out while handling these damn slices
 c->vLumBufSize= c->vLumFilterSize;
 c->vChrBufSize= c->vChrFilterSize;
-for (i=0; i<dstH; i++)
+for (i=0; i<dstH; i++) {
-{
 int chrI= i*c->chrDstH / dstH;
 int nextSlice= FFMAX(c->vLumFilterPos[i   ] + c->vLumFilterSize - 1,
 ((c->vChrFilterPos[chrI] + c->vChrFilterSize - 1)<<c->chrSrcVSubSample));
 nextSlice>>= c->chrSrcVSubSample;
 assert(2*VOFW == VOF);
 assert(c->chrDstH <= dstH);
-if (flags&SWS_PRINT_INFO)
+if (flags&SWS_PRINT_INFO) {
-{
 #ifdef DITHER1XBPP
 const char *dither= " dithered";
 #else
 const char *dither= "";
 #endif
 av_log(c, AV_LOG_INFO, "using AltiVec\n");
 else
 av_log(c, AV_LOG_INFO, "using C\n");
 }
-if (flags & SWS_PRINT_INFO)
+if (flags & SWS_PRINT_INFO) {
-{
+if (flags & SWS_CPU_CAPS_MMX) {
-if (flags & SWS_CPU_CAPS_MMX)
-{
 if (c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR))
 av_log(c, AV_LOG_VERBOSE, "using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");
-else
+else {
-{
 if (c->hLumFilterSize==4)
 av_log(c, AV_LOG_VERBOSE, "using 4-tap MMX scaler for horizontal luminance scaling\n");
 else if (c->hLumFilterSize==8)
 av_log(c, AV_LOG_VERBOSE, "using 8-tap MMX scaler for horizontal luminance scaling\n");
 else
 else if (c->hChrFilterSize==8)
 av_log(c, AV_LOG_VERBOSE, "using 8-tap MMX scaler for horizontal chrominance scaling\n");
 else
 av_log(c, AV_LOG_VERBOSE, "using n-tap MMX scaler for horizontal chrominance scaling\n");
 }
-}
+} else {
-else
-{
 #if ARCH_X86
 av_log(c, AV_LOG_VERBOSE, "using x86 asm scaler for horizontal scaling\n");
 #else
 if (flags & SWS_FAST_BILINEAR)
 av_log(c, AV_LOG_VERBOSE, "using FAST_BILINEAR C scaler for horizontal scaling\n");
 else
 av_log(c, AV_LOG_VERBOSE, "using C scaler for horizontal scaling\n");
 #endif
 }
-if (isPlanarYUV(dstFormat))
+if (isPlanarYUV(dstFormat)) {
-{
 if (c->vLumFilterSize==1)
 av_log(c, AV_LOG_VERBOSE, "using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
 else
 av_log(c, AV_LOG_VERBOSE, "using n-tap %s scaler for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
-}
+} else {
-else
-{
 if (c->vLumFilterSize==1 && c->vChrFilterSize==2)
 av_log(c, AV_LOG_VERBOSE, "using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n"
 "      2-tap scaler for vertical chrominance scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
 else if (c->vLumFilterSize==2 && c->vChrFilterSize==2)
 av_log(c, AV_LOG_VERBOSE, "using 2-tap linear %s scaler for vertical scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
 else if (dstFormat==PIX_FMT_BGR555)
 av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR15 converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
 av_log(c, AV_LOG_VERBOSE, "%dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
 }
-if (flags & SWS_PRINT_INFO)
+if (flags & SWS_PRINT_INFO) {
-{
 av_log(c, AV_LOG_DEBUG, "lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
 c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc);
 av_log(c, AV_LOG_DEBUG, "chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
 c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
 }
 c->swScale= getSwsFunc(c);
 return c;
 }
-static void reset_ptr(uint8_t* src[], int format){
+static void reset_ptr(uint8_t* src[], int format)
+{
 if(!isALPHA(format))
 src[3]=NULL;
-if(!isPlanarYUV(format)){
+if(!isPlanarYUV(format)) {
 src[3]=src[2]=NULL;
 if(   format != PIX_FMT_PAL8
 && format != PIX_FMT_RGB8
 && format != PIX_FMT_BGR8
 && format != PIX_FMT_RGB4_BYTE
 /**
 * swscale wrapper, so we don't need to export the SwsContext.
 * Assumes planar YUV to be in YUV order instead of YVU.
 */
 int sws_scale(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 int i;
 uint8_t* src2[4]= {src[0], src[1], src[2], src[3]};
 uint8_t* dst2[4]= {dst[0], dst[1], dst[2], dst[3]};
 if (c->sliceDir == 0 && srcSliceY != 0 && srcSliceY + srcSliceH != c->srcH) {
 }
 if (c->sliceDir == 0) {
 if (srcSliceY == 0) c->sliceDir = 1; else c->sliceDir = -1;
 }
-if (usePal(c->srcFormat)){
+if (usePal(c->srcFormat)) {
-for (i=0; i<256; i++){
+for (i=0; i<256; i++) {
 int p, r, g, b,y,u,v;
-if(c->srcFormat == PIX_FMT_PAL8){
+if(c->srcFormat == PIX_FMT_PAL8) {
 p=((uint32_t*)(src[1]))[i];
 r= (p>>16)&0xFF;
 g= (p>> 8)&0xFF;
 b=  p     &0xFF;
-}else if(c->srcFormat == PIX_FMT_RGB8){
+} else if(c->srcFormat == PIX_FMT_RGB8) {
 r= (i>>5    )*36;
 g= ((i>>2)&7)*36;
 b= (i&3     )*85;
-}else if(c->srcFormat == PIX_FMT_BGR8){
+} else if(c->srcFormat == PIX_FMT_BGR8) {
 b= (i>>6    )*85;
 g= ((i>>3)&7)*36;
 r= (i&7     )*36;
-}else if(c->srcFormat == PIX_FMT_RGB4_BYTE){
+} else if(c->srcFormat == PIX_FMT_RGB4_BYTE) {
 r= (i>>3    )*255;
 g= ((i>>1)&3)*85;
 b= (i&1     )*255;
-}else {
+} else {
 assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
 b= (i>>3    )*255;
 g= ((i>>1)&3)*85;
 r= (i&1     )*255;
 }
 }
 }
 #if LIBSWSCALE_VERSION_MAJOR < 1
 int sws_scale_ordered(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-int srcSliceH, uint8_t* dst[], int dstStride[]){
+int srcSliceH, uint8_t* dst[], int dstStride[])
+{
 return sws_scale(c, src, srcStride, srcSliceY, srcSliceH, dst, dstStride);
 }
 #endif
 SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
 float chromaHShift, float chromaVShift,
 int verbose)
 {
 SwsFilter *filter= av_malloc(sizeof(SwsFilter));
-if (lumaGBlur!=0.0){
+if (lumaGBlur!=0.0) {
 filter->lumH= sws_getGaussianVec(lumaGBlur, 3.0);
 filter->lumV= sws_getGaussianVec(lumaGBlur, 3.0);
-}else{
+} else {
 filter->lumH= sws_getIdentityVec();
 filter->lumV= sws_getIdentityVec();
 }
-if (chromaGBlur!=0.0){
+if (chromaGBlur!=0.0) {
 filter->chrH= sws_getGaussianVec(chromaGBlur, 3.0);
 filter->chrV= sws_getGaussianVec(chromaGBlur, 3.0);
-}else{
+} else {
 filter->chrH= sws_getIdentityVec();
 filter->chrV= sws_getIdentityVec();
 }
-if (chromaSharpen!=0.0){
+if (chromaSharpen!=0.0) {
 SwsVector *id= sws_getIdentityVec();
 sws_scaleVec(filter->chrH, -chromaSharpen);
 sws_scaleVec(filter->chrV, -chromaSharpen);
 sws_addVec(filter->chrH, id);
 sws_addVec(filter->chrV, id);
 sws_freeVec(id);
 }
-if (lumaSharpen!=0.0){
+if (lumaSharpen!=0.0) {
 SwsVector *id= sws_getIdentityVec();
 sws_scaleVec(filter->lumH, -lumaSharpen);
 sws_scaleVec(filter->lumV, -lumaSharpen);
 sws_addVec(filter->lumH, id);
 sws_addVec(filter->lumV, id);
 if (verbose) sws_printVec2(filter->lumH, NULL, AV_LOG_DEBUG);
 return filter;
 }
-SwsVector *sws_getGaussianVec(double variance, double quality){
+SwsVector *sws_getGaussianVec(double variance, double quality)
+{
 const int length= (int)(variance*quality + 0.5) | 1;
 int i;
 double *coeff= av_malloc(length*sizeof(double));
 double middle= (length-1)*0.5;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 vec->coeff= coeff;
 vec->length= length;
-for (i=0; i<length; i++)
+for (i=0; i<length; i++) {
-{
 double dist= i-middle;
 coeff[i]= exp(-dist*dist/(2*variance*variance)) / sqrt(2*variance*PI);
 }
 sws_normalizeVec(vec, 1.0);
 return vec;
 }
-SwsVector *sws_getConstVec(double c, int length){
+SwsVector *sws_getConstVec(double c, int length)
+{
 int i;
 double *coeff= av_malloc(length*sizeof(double));
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 vec->coeff= coeff;
 return vec;
 }
-SwsVector *sws_getIdentityVec(void){
+SwsVector *sws_getIdentityVec(void)
+{
 return sws_getConstVec(1.0, 1);
 }
-double sws_dcVec(SwsVector *a){
+double sws_dcVec(SwsVector *a)
+{
 int i;
 double sum=0;
 for (i=0; i<a->length; i++)
 sum+= a->coeff[i];
 return sum;
 }
-void sws_scaleVec(SwsVector *a, double scalar){
+void sws_scaleVec(SwsVector *a, double scalar)
+{
 int i;
 for (i=0; i<a->length; i++)
 a->coeff[i]*= scalar;
 }
-void sws_normalizeVec(SwsVector *a, double height){
+void sws_normalizeVec(SwsVector *a, double height)
+{
 sws_scaleVec(a, height/sws_dcVec(a));
 }
-static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b){
+static SwsVector *sws_getConvVec(SwsVector *a, SwsVector *b)
+{
 int length= a->length + b->length - 1;
 double *coeff= av_malloc(length*sizeof(double));
 int i, j;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 vec->coeff= coeff;
 vec->length= length;
 for (i=0; i<length; i++) coeff[i]= 0.0;
-for (i=0; i<a->length; i++)
+for (i=0; i<a->length; i++) {
-{
+for (j=0; j<b->length; j++) {
-for (j=0; j<b->length; j++)
-{
 coeff[i+j]+= a->coeff[i]*b->coeff[j];
 }
 }
 return vec;
 }
-static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b){
+static SwsVector *sws_sumVec(SwsVector *a, SwsVector *b)
+{
 int length= FFMAX(a->length, b->length);
 double *coeff= av_malloc(length*sizeof(double));
 int i;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 for (i=0; i<b->length; i++) coeff[i + (length-1)/2 - (b->length-1)/2]+= b->coeff[i];
 return vec;
 }
-static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b){
+static SwsVector *sws_diffVec(SwsVector *a, SwsVector *b)
+{
 int length= FFMAX(a->length, b->length);
 double *coeff= av_malloc(length*sizeof(double));
 int i;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 return vec;
 }
 /* shift left / or right if "shift" is negative */
-static SwsVector *sws_getShiftedVec(SwsVector *a, int shift){
+static SwsVector *sws_getShiftedVec(SwsVector *a, int shift)
+{
 int length= a->length + FFABS(shift)*2;
 double *coeff= av_malloc(length*sizeof(double));
 int i;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 vec->coeff= coeff;
 vec->length= length;
 for (i=0; i<length; i++) coeff[i]= 0.0;
-for (i=0; i<a->length; i++)
+for (i=0; i<a->length; i++) {
-{
 coeff[i + (length-1)/2 - (a->length-1)/2 - shift]= a->coeff[i];
 }
 return vec;
 }
-void sws_shiftVec(SwsVector *a, int shift){
+void sws_shiftVec(SwsVector *a, int shift)
+{
 SwsVector *shifted= sws_getShiftedVec(a, shift);
 av_free(a->coeff);
 a->coeff= shifted->coeff;
 a->length= shifted->length;
 av_free(shifted);
 }
-void sws_addVec(SwsVector *a, SwsVector *b){
+void sws_addVec(SwsVector *a, SwsVector *b)
+{
 SwsVector *sum= sws_sumVec(a, b);
 av_free(a->coeff);
 a->coeff= sum->coeff;
 a->length= sum->length;
 av_free(sum);
 }
-void sws_subVec(SwsVector *a, SwsVector *b){
+void sws_subVec(SwsVector *a, SwsVector *b)
+{
 SwsVector *diff= sws_diffVec(a, b);
 av_free(a->coeff);
 a->coeff= diff->coeff;
 a->length= diff->length;
 av_free(diff);
 }
-void sws_convVec(SwsVector *a, SwsVector *b){
+void sws_convVec(SwsVector *a, SwsVector *b)
+{
 SwsVector *conv= sws_getConvVec(a, b);
 av_free(a->coeff);
 a->coeff= conv->coeff;
 a->length= conv->length;
 av_free(conv);
 }
-SwsVector *sws_cloneVec(SwsVector *a){
+SwsVector *sws_cloneVec(SwsVector *a)
+{
 double *coeff= av_malloc(a->length*sizeof(double));
 int i;
 SwsVector *vec= av_malloc(sizeof(SwsVector));
 vec->coeff= coeff;
 for (i=0; i<a->length; i++) coeff[i]= a->coeff[i];
 return vec;
 }
-void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level){
+void sws_printVec2(SwsVector *a, AVClass *log_ctx, int log_level)
+{
 int i;
 double max=0;
 double min=0;
 double range;
 for (i=0; i<a->length; i++)
 if (a->coeff[i]<min) min= a->coeff[i];
 range= max - min;
-for (i=0; i<a->length; i++)
+for (i=0; i<a->length; i++) {
-{
 int x= (int)((a->coeff[i]-min)*60.0/range +0.5);
 av_log(log_ctx, log_level, "%1.3f ", a->coeff[i]);
 for (;x>0; x--) av_log(log_ctx, log_level, " ");
 av_log(log_ctx, log_level, "|\n");
 }
 }
 #if LIBSWSCALE_VERSION_MAJOR < 1
-void sws_printVec(SwsVector *a){
+void sws_printVec(SwsVector *a)
+{
 sws_printVec2(a, NULL, AV_LOG_DEBUG);
 }
 #endif
-void sws_freeVec(SwsVector *a){
+void sws_freeVec(SwsVector *a)
+{
 if (!a) return;
 av_freep(&a->coeff);
 a->length=0;
 av_free(a);
 }
-void sws_freeFilter(SwsFilter *filter){
+void sws_freeFilter(SwsFilter *filter)
+{
 if (!filter) return;
 if (filter->lumH) sws_freeVec(filter->lumH);
 if (filter->lumV) sws_freeVec(filter->lumV);
 if (filter->chrH) sws_freeVec(filter->chrH);
 if (filter->chrV) sws_freeVec(filter->chrV);
 av_free(filter);
 }
-void sws_freeContext(SwsContext *c){
+void sws_freeContext(SwsContext *c)
+{
 int i;
 if (!c) return;
-if (c->lumPixBuf)
+if (c->lumPixBuf) {
-{
 for (i=0; i<c->vLumBufSize; i++)
 av_freep(&c->lumPixBuf[i]);
 av_freep(&c->lumPixBuf);
 }
-if (c->chrPixBuf)
+if (c->chrPixBuf) {
-{
 for (i=0; i<c->vChrBufSize; i++)
 av_freep(&c->chrPixBuf[i]);
 av_freep(&c->chrPixBuf);
 }
-if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf){
+if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf) {
 for (i=0; i<c->vLumBufSize; i++)
 av_freep(&c->alpPixBuf[i]);
 av_freep(&c->alpPixBuf);
 }

Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 29481:c080f1f5c07e