0001-cleaned-up-swscale_unscaled.c.patch

Message ID CAOiBWOpw09iNLpPQrHsGL8sCJn5MVyRYu67N6+7A+kEvcyUCzA@mail.gmail.com
State Superseded
Headers show

Commit Message

Nathan Adil Maxson Dec. 17, 2011, 8:55 p.m.
updated patch. sorry, I don't know how I missed those
-Nathan



On Sat, Dec 17, 2011 at 12:36 PM, Paul B Mahol <onemda@gmail.com> wrote:
> On 12/17/11, Nathan Maxson <nathan0n5ire@gmail.com> wrote:
>> updated patch
>> -Nathan
>
> Inconsistent spaces around '+=' .
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel

Comments

Luca Barbato Dec. 17, 2011, 9:50 p.m. | #1
On 17/12/11 21:55, Nathan Maxson wrote:
> +        dst[2] = palette[src[i]*4+2];

Should be something like

 > +        dst[2] = palette[src[i] * 4 + 2];

lu

Patch

From 1605e0532ca39c0e09974a636fabc410cd26f1db Mon Sep 17 00:00:00 2001
From: Nathan Adil Maxson <nathan0n5ire at gmail dot com>
Date: Sat, 17 Dec 2011 11:48:28 -0800
Subject: [PATCH] cleaned up swscale_unscaled.c

---
 libswscale/swscale_unscaled.c |  478 +++++++++++++++++++++++------------------
 1 files changed, 266 insertions(+), 212 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 3dc2929..fbc5520 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -87,11 +87,12 @@  DECLARE_ALIGNED(8, const uint8_t, dither_8x8_256)[8][8] = {
 #define RV ( (int)(0.500*224/255*(1<<RGB2YUV_SHIFT)+0.5))
 #define RU (-(int)(0.169*224/255*(1<<RGB2YUV_SHIFT)+0.5))
 
-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;
     }
@@ -106,7 +107,7 @@  static void copyPlane(const uint8_t *src, int srcStride,
         memcpy(dst, src, srcSliceH * dstStride);
     } else {
         int i;
-        for (i=0; i<srcSliceH; i++) {
+        for (i = 0; i < srcSliceH; i++) {
             memcpy(dst, src, width);
             src += srcStride;
             dst += dstStride;
@@ -114,8 +115,10 @@  static void copyPlane(const uint8_t *src, int srcStride,
     }
 }
 
-static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY,
+                               int srcSliceH, uint8_t* dstParam[],
+                               int dstStride[])
 {
     uint8_t *dst = dstParam[1] + dstStride[1]*srcSliceY/2;
 
@@ -123,61 +126,73 @@  static int planarToNv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
               dstParam[0], dstStride[0]);
 
     if (c->dstFormat == PIX_FMT_NV12)
-        interleaveBytes(src[1], src[2], dst, c->srcW/2, srcSliceH/2, srcStride[1], srcStride[2], dstStride[0]);
+        interleaveBytes(src[1], src[2], dst, c->srcW/2, srcSliceH/2,
+                        srcStride[1], srcStride[2], dstStride[0]);
     else
-        interleaveBytes(src[2], src[1], dst, c->srcW/2, srcSliceH/2, srcStride[2], srcStride[1], dstStride[0]);
+        interleaveBytes(src[2], src[1], dst, c->srcW/2, srcSliceH/2,
+                        srcStride[2], srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToYuy2Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, 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]);
+    yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
+               srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int planarToUyvyWrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, int srcSliceH,
+                               uint8_t* dstParam[], int dstStride[])
 {
-    uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+    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]);
+    yv12touyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0],
+               srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuv422pToYuy2Wrapper(SwsContext *c, const uint8_t* src[],
+                                int srcStride[], int srcSliceY, int srcSliceH,
+                                uint8_t* dstParam[], int dstStride[])
 {
-    uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+    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]);
+    yuv422ptoyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], 
+                  srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                                int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuv422pToUyvyWrapper(SwsContext *c, const uint8_t* src[],
+                                int srcStride[], int srcSliceY, int srcSliceH,
+                                uint8_t* dstParam[], int dstStride[])
 {
-    uint8_t *dst=dstParam[0] + dstStride[0]*srcSliceY;
+    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]);
+    yuv422ptouyvy(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], 
+                  srcStride[1], dstStride[0]);
 
     return srcSliceH;
 }
 
-static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, 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;
+    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]);
+    yuyvtoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     if (dstParam[3])
         fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@@ -185,26 +200,30 @@  static int yuyvToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
     return srcSliceH;
 }
 
-static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int yuyvToYuv422Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, 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;
+    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]);
+    yuyvtoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     return srcSliceH;
 }
 
-static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, 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;
+    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]);
+    uyvytoyuv420(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     if (dstParam[3])
         fillPlane(dstParam[3], dstStride[3], c->srcW, srcSliceH, srcSliceY, 255);
@@ -212,43 +231,48 @@  static int uyvyToYuv420Wrapper(SwsContext *c, const uint8_t* src[], int srcStrid
     return srcSliceH;
 }
 
-static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                               int srcSliceH, uint8_t* dstParam[], int dstStride[])
+static int uyvyToYuv422Wrapper(SwsContext *c, const uint8_t* src[],
+                               int srcStride[], int srcSliceY, 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;
+    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]);
+    uyvytoyuv422(ydst, udst, vdst, src[0], c->srcW, srcSliceH, dstStride[0],
+                 dstStride[1], srcStride[0]);
 
     return srcSliceH;
 }
 
-static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels,
+                             const uint8_t *palette)
 {
     int i;
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | (src[(i<<1)+1] << 24);
 }
 
-static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked32_1(const uint8_t *src, uint8_t *dst, int num_pixels,
+                               const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *)palette)[src[i<<1]] | src[(i<<1)+1];
 }
 
-static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+static void gray8aToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels,
+                             const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++) {
+    for (i = 0; i < num_pixels; i++) {
         //FIXME slow?
-        dst[0]= palette[src[i<<1]*4+0];
-        dst[1]= palette[src[i<<1]*4+1];
-        dst[2]= palette[src[i<<1]*4+2];
-        dst+= 3;
+        dst[0] = palette[src[i<<1]*4+0];
+        dst[1] = palette[src[i<<1]*4+1];
+        dst[2] = palette[src[i<<1]*4+2];
+        dst += 3;
     }
 }
 
@@ -273,16 +297,17 @@  static int packed_16bpc_bswap(SwsContext *c, const uint8_t* src[],
     return srcSliceH;
 }
 
-static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                           int srcSliceH, uint8_t* dst[], int dstStride[])
+static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
+                           int srcSliceY, int srcSliceH, uint8_t* dst[],
+                           int dstStride[])
 {
-    const enum PixelFormat srcFormat= c->srcFormat;
-    const enum PixelFormat dstFormat= c->dstFormat;
+    const enum PixelFormat srcFormat = c->srcFormat;
+    const enum PixelFormat dstFormat = c->dstFormat;
     void (*conv)(const uint8_t *src, uint8_t *dst, int num_pixels,
-                 const uint8_t *palette)=NULL;
+                 const uint8_t *palette) = NULL;
     int i;
-    uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
-    const uint8_t *srcPtr= src[0];
+    uint8_t *dstPtr = dst[0] + dstStride[0]*srcSliceY;
+    const uint8_t *srcPtr = src[0];
 
     if (srcFormat == PIX_FMT_Y400A) {
         switch (dstFormat) {
@@ -308,10 +333,10 @@  static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                sws_format_name(srcFormat), sws_format_name(dstFormat));
     else {
-        for (i=0; i<srcSliceH; i++) {
+        for (i = 0; i < srcSliceH; i++) {
             conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
-            srcPtr+= srcStride[0];
-            dstPtr+= dstStride[0];
+            srcPtr += srcStride[0];
+            dstPtr += dstStride[0];
         }
     }
 
@@ -326,16 +351,17 @@  static int palToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         )
 
 /* {RGB,BGR}{15,16,24,32,32_1} -> {RGB,BGR}{15,16,24,32} */
-static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                           int srcSliceH, uint8_t* dst[], int dstStride[])
+static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
+                           int srcSliceY, int srcSliceH, uint8_t* dst[],
+                           int dstStride[])
 {
     const enum PixelFormat srcFormat= c->srcFormat;
     const enum PixelFormat dstFormat= c->dstFormat;
-    const int srcBpp= (c->srcFormatBpp + 7) >> 3;
-    const int dstBpp= (c->dstFormatBpp + 7) >> 3;
-    const int srcId= c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 */
-    const int dstId= c->dstFormatBpp >> 2;
-    void (*conv)(const uint8_t *src, uint8_t *dst, int src_size)=NULL;
+    const int srcBpp = (c->srcFormatBpp + 7) >> 3;
+    const int dstBpp = (c->dstFormatBpp + 7) >> 3;
+    const int srcId = c->srcFormatBpp >> 2; /* 1:0, 4:1, 8:2, 15:3, 16:4, 24:6, 32:8 */
+    const int dstId = c->dstFormatBpp >> 2;
+    void (*conv)(const uint8_t *src, uint8_t *dst, int src_size) = NULL;
 
 #define CONV_IS(src, dst) (srcFormat == PIX_FMT_##src && dstFormat == PIX_FMT_##dst)
 
@@ -357,37 +383,37 @@  static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
     if (  (isBGRinInt(srcFormat) && isBGRinInt(dstFormat))
        || (isRGBinInt(srcFormat) && isRGBinInt(dstFormat))) {
         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 0x48: conv= rgb32to16; break;
-        case 0x63: conv= rgb15to24; break;
-        case 0x64: conv= rgb16to24; break;
-        case 0x68: conv= rgb32to24; break;
-        case 0x83: conv= rgb15to32; break;
-        case 0x84: conv= rgb16to32; break;
-        case 0x86: conv= rgb24to32; break;
+        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 0x48: conv = rgb32to16; break;
+        case 0x63: conv = rgb15to24; break;
+        case 0x64: conv = rgb16to24; break;
+        case 0x68: conv = rgb32to24; break;
+        case 0x83: conv = rgb15to32; break;
+        case 0x84: conv = rgb16to32; break;
+        case 0x86: conv = rgb24to32; break;
         }
-    } else if (  (isBGRinInt(srcFormat) && isRGBinInt(dstFormat))
+    } else if ( (isBGRinInt(srcFormat) && isRGBinInt(dstFormat))
              || (isRGBinInt(srcFormat) && isBGRinInt(dstFormat))) {
         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 0x44: conv= rgb16tobgr16; break;
-        case 0x46: conv= rgb24tobgr16; break;
-        case 0x48: conv= rgb32tobgr16; break;
-        case 0x63: conv= rgb15tobgr24; break;
-        case 0x64: conv= rgb16tobgr24; break;
-        case 0x66: conv= rgb24tobgr24; break;
-        case 0x68: conv= rgb32tobgr24; break;
-        case 0x83: conv= rgb15tobgr32; break;
-        case 0x84: conv= rgb16tobgr32; break;
-        case 0x86: conv= rgb24tobgr32; break;
+        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 0x44: conv = rgb16tobgr16; break;
+        case 0x46: conv = rgb24tobgr16; break;
+        case 0x48: conv = rgb32tobgr16; break;
+        case 0x63: conv = rgb15tobgr24; break;
+        case 0x64: conv = rgb16tobgr24; break;
+        case 0x66: conv = rgb24tobgr24; break;
+        case 0x68: conv = rgb32tobgr24; break;
+        case 0x83: conv = rgb15tobgr32; break;
+        case 0x84: conv = rgb16tobgr32; break;
+        case 0x86: conv = rgb24tobgr32; break;
         }
     }
 
@@ -395,32 +421,37 @@  static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[],
         av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                sws_format_name(srcFormat), sws_format_name(dstFormat));
     } else {
-        const uint8_t *srcPtr= src[0];
-              uint8_t *dstPtr= dst[0];
-        if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1) && !isRGBA32(dstFormat))
+        const uint8_t *srcPtr = src[0];
+              uint8_t *dstPtr = dst[0];
+        if ((srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
+            && !isRGBA32(dstFormat))
             srcPtr += ALT32_CORR;
 
-        if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) && !isRGBA32(srcFormat))
+        if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1)
+            && !isRGBA32(srcFormat))
             dstPtr += ALT32_CORR;
 
-        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0 && !(srcStride[0] % srcBpp))
-            conv(srcPtr, dstPtr + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+        if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0
+            && !(srcStride[0] % srcBpp))
+            conv(srcPtr, dstPtr + dstStride[0]*srcSliceY,
+                 srcSliceH*srcStride[0]);
         else {
             int i;
             dstPtr += 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];
+                srcPtr += srcStride[0];
+                dstPtr += dstStride[0];
             }
         }
     }
     return srcSliceH;
 }
 
-static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                              int srcSliceH, uint8_t* dst[], int dstStride[])
+static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[],
+                              int srcStride[], int srcSliceY, int srcSliceH,
+                              uint8_t* dst[], int dstStride[])
 {
     rgb24toyv12(
         src[0],
@@ -434,8 +465,9 @@  static int bgr24ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride
     return srcSliceH;
 }
 
-static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
     copyPlane(src[0], srcStride[0], srcSliceY, srcSliceH, c->srcW,
               dst[0], dstStride[0]);
@@ -450,26 +482,27 @@  static int yvu9ToYv12Wrapper(SwsContext *c, const uint8_t* src[], int srcStride[
 }
 
 /* unscaled copy like stuff (assumes nearly identical formats) */
-static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int packedCopyWrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
-    if (dstStride[0]==srcStride[0] && srcStride[0] > 0)
+    if (dstStride[0] == srcStride[0] && srcStride[0] > 0)
         memcpy(dst[0] + dstStride[0]*srcSliceY, src[0], srcSliceH*dstStride[0]);
     else {
         int i;
-        const uint8_t *srcPtr= src[0];
-        uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
-        int length=0;
+        const 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);
+           && 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];
+            srcPtr += srcStride[0];
+            dstPtr += dstStride[0];
         }
     }
     return srcSliceH;
@@ -496,24 +529,26 @@  static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
         src += srcStride; \
     }
 
-static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
-                             int srcSliceH, uint8_t* dst[], int dstStride[])
+static int planarCopyWrapper(SwsContext *c, const uint8_t* src[],
+                             int srcStride[], int srcSliceY, int srcSliceH,
+                             uint8_t* dst[], int dstStride[])
 {
     int plane, i, j;
-    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);
-        const uint8_t *srcPtr= src[plane];
-        uint8_t *dstPtr= dst[plane] + dstStride[plane]*y;
+    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);
+        const 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(is16BPS(c->dstFormat))
-                length*=2;
-            fillPlane(dst[plane], dstStride[plane], length, height, y, (plane==3) ? 255 : 128);
+                length *= 2;
+            fillPlane(dst[plane], dstStride[plane], length, height, y,
+                      (plane == 3) ? 255 : 128);
         } else {
             if(is9_OR_10BPS(c->srcFormat)) {
                 const int src_depth = av_pix_fmt_descriptors[c->srcFormat].comp[plane].depth_minus1+1;
@@ -653,22 +688,22 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     COPY16TO8(AV_RL16);
                 }
             } else if(!is16BPS(c->srcFormat) && is16BPS(c->dstFormat)) {
-                for (i=0; i<height; i++) {
-                    for (j=0; j<length; j++) {
+                for (i = 0; i < height; i++) {
+                    for (j = 0; j < length; j++) {
                         dstPtr[ j<<1   ] = srcPtr[j];
                         dstPtr[(j<<1)+1] = srcPtr[j];
                     }
-                    srcPtr+= srcStride[plane];
-                    dstPtr+= dstStride[plane];
+                    srcPtr += srcStride[plane];
+                    dstPtr += dstStride[plane];
                 }
             } 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 (j=0; j<length; j++)
+                for (i = 0; i < height; i++) {
+                    for (j = 0; j < length; j++)
                         ((uint16_t*)dstPtr)[j] = av_bswap16(((const uint16_t*)srcPtr)[j]);
-                    srcPtr+= srcStride[plane];
-                    dstPtr+= dstStride[plane];
+                    srcPtr += srcStride[plane];
+                    dstPtr += dstStride[plane];
                 }
             } else if (dstStride[plane] == srcStride[plane] &&
                        srcStride[plane] > 0 && srcStride[plane] == length) {
@@ -677,10 +712,10 @@  static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
             } 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];
+                    srcPtr += srcStride[plane];
+                    dstPtr += dstStride[plane];
                 }
             }
         }
@@ -707,22 +742,28 @@  void ff_get_unscaled_swscale(SwsContext *c)
         && (c->dstFormatBpp < c->srcFormatBpp || (!isAnyRGB(srcFormat)));
 
     /* yv12_to_nv12 */
-    if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) && (dstFormat == PIX_FMT_NV12 || dstFormat == PIX_FMT_NV21)) {
-        c->swScale= planarToNv12Wrapper;
+    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) && isAnyRGB(dstFormat)
+    if ((srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUV422P
+         || srcFormat == PIX_FMT_YUVA420P) && isAnyRGB(dstFormat)
         && !(flags & SWS_ACCURATE_RND) && !(dstH&1)) {
-        c->swScale= ff_yuv2rgb_get_func_ptr(c);
+        c->swScale = ff_yuv2rgb_get_func_ptr(c);
     }
 
-    if (srcFormat==PIX_FMT_YUV410P && (dstFormat==PIX_FMT_YUV420P || dstFormat==PIX_FMT_YUVA420P) && !(flags & SWS_BITEXACT)) {
-        c->swScale= yvu9ToYv12Wrapper;
+    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))
-        c->swScale= bgr24ToYv12Wrapper;
+    if (srcFormat == PIX_FMT_BGR24
+        && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P)
+        && !(flags & SWS_ACCURATE_RND))
+        c->swScale = bgr24ToYv12Wrapper;
 
     /* RGB/BGR -> RGB/BGR (no dither needed forms) */
     if (   isAnyRGB(srcFormat)
@@ -761,13 +802,13 @@  void ff_get_unscaled_swscale(SwsContext *c)
         dstFormat == PIX_FMT_BGR32   ||
         dstFormat == PIX_FMT_BGR32_1 ||
         dstFormat == PIX_FMT_BGR24)))
-        c->swScale= palToRgbWrapper;
+        c->swScale = palToRgbWrapper;
 
     if (srcFormat == PIX_FMT_YUV422P) {
         if (dstFormat == PIX_FMT_YUYV422)
-            c->swScale= yuv422pToYuy2Wrapper;
+            c->swScale = yuv422pToYuy2Wrapper;
         else if (dstFormat == PIX_FMT_UYVY422)
-            c->swScale= yuv422pToUyvyWrapper;
+            c->swScale = yuv422pToUyvyWrapper;
     }
 
     /* LQ converters if -sws 0 or -sws 4*/
@@ -775,22 +816,24 @@  void ff_get_unscaled_swscale(SwsContext *c)
         /* yv12_to_yuy2 */
         if (srcFormat == PIX_FMT_YUV420P || srcFormat == PIX_FMT_YUVA420P) {
             if (dstFormat == PIX_FMT_YUYV422)
-                c->swScale= planarToYuy2Wrapper;
+                c->swScale = planarToYuy2Wrapper;
             else if (dstFormat == PIX_FMT_UYVY422)
-                c->swScale= planarToUyvyWrapper;
+                c->swScale = planarToUyvyWrapper;
         }
     }
-    if(srcFormat == PIX_FMT_YUYV422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
-        c->swScale= yuyvToYuv420Wrapper;
-    if(srcFormat == PIX_FMT_UYVY422 && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
-        c->swScale= uyvyToYuv420Wrapper;
+    if(srcFormat == PIX_FMT_YUYV422
+       && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
+        c->swScale = yuyvToYuv420Wrapper;
+    if(srcFormat == PIX_FMT_UYVY422
+       && (dstFormat == PIX_FMT_YUV420P || dstFormat == PIX_FMT_YUVA420P))
+        c->swScale = uyvyToYuv420Wrapper;
     if(srcFormat == PIX_FMT_YUYV422 && dstFormat == PIX_FMT_YUV422P)
-        c->swScale= yuyvToYuv422Wrapper;
+        c->swScale = yuyvToYuv422Wrapper;
     if(srcFormat == PIX_FMT_UYVY422 && dstFormat == PIX_FMT_YUV422P)
-        c->swScale= uyvyToYuv422Wrapper;
+        c->swScale = uyvyToYuv422Wrapper;
 
     /* simple copy */
-    if (  srcFormat == dstFormat
+    if (    srcFormat == dstFormat
         || (srcFormat == PIX_FMT_YUVA420P && dstFormat == PIX_FMT_YUV420P)
         || (srcFormat == PIX_FMT_YUV420P && dstFormat == PIX_FMT_YUVA420P)
         || (isPlanarYUV(srcFormat) && isGray(dstFormat))
@@ -803,9 +846,9 @@  void ff_get_unscaled_swscale(SwsContext *c)
             && srcFormat != PIX_FMT_NV12 && srcFormat != PIX_FMT_NV21))
     {
         if (isPacked(c->srcFormat))
-            c->swScale= packedCopyWrapper;
+            c->swScale = packedCopyWrapper;
         else /* Planar YUV or gray */
-            c->swScale= planarCopyWrapper;
+            c->swScale = planarCopyWrapper;
     }
 
     if (ARCH_BFIN)
@@ -845,9 +888,11 @@  static int check_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt,
  * swscale wrapper, so we don't need to export the SwsContext.
  * Assumes planar YUV to be in YUV order instead of YVU.
  */
-int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
-              const int srcStride[], int srcSliceY, int srcSliceH,
-              uint8_t* const dst[], const int dstStride[])
+int attribute_align_arg sws_scale(struct SwsContext *c,
+                                  const uint8_t* const srcSlice[],
+                                  const int srcStride[], int srcSliceY,
+                                  int srcSliceH, uint8_t* const dst[],
+                                  const int dstStride[])
 {
     int i;
     const uint8_t* src2[4]= {srcSlice[0], srcSlice[1], srcSlice[2], srcSlice[3]};
@@ -875,63 +920,64 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
     }
 
     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) {
-                p=((const uint32_t*)(srcSlice[1]))[i];
-                r= (p>>16)&0xFF;
-                g= (p>> 8)&0xFF;
-                b=  p     &0xFF;
+                p = ((const uint32_t*)(srcSlice[1]))[i];
+                r = (p>>16)&0xFF;
+                g = (p>> 8)&0xFF;
+                b =  p     &0xFF;
             } else if(c->srcFormat == PIX_FMT_RGB8) {
-                r= (i>>5    )*36;
-                g= ((i>>2)&7)*36;
-                b= (i&3     )*85;
+                r = (i>>5    )*36;
+                g = ((i>>2)&7)*36;
+                b = (i&3     )*85;
             } else if(c->srcFormat == PIX_FMT_BGR8) {
-                b= (i>>6    )*85;
-                g= ((i>>3)&7)*36;
-                r= (i&7     )*36;
+                b = (i>>6    )*85;
+                g = ((i>>3)&7)*36;
+                r = (i&7     )*36;
             } else if(c->srcFormat == PIX_FMT_RGB4_BYTE) {
-                r= (i>>3    )*255;
-                g= ((i>>1)&3)*85;
-                b= (i&1     )*255;
-            } else if(c->srcFormat == PIX_FMT_GRAY8 || c->srcFormat == PIX_FMT_Y400A) {
+                r = (i>>3    )*255;
+                g = ((i>>1)&3)*85;
+                b = (i&1     )*255;
+            } else if(c->srcFormat == PIX_FMT_GRAY8
+                      || c->srcFormat == PIX_FMT_Y400A) {
                 r = g = b = i;
             } else {
                 assert(c->srcFormat == PIX_FMT_BGR4_BYTE);
-                b= (i>>3    )*255;
-                g= ((i>>1)&3)*85;
-                r= (i&1     )*255;
+                b = (i>>3    )*255;
+                g = ((i>>1)&3)*85;
+                r = (i&1     )*255;
             }
-            y= av_clip_uint8((RY*r + GY*g + BY*b + ( 33<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
-            u= av_clip_uint8((RU*r + GU*g + BU*b + (257<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
-            v= av_clip_uint8((RV*r + GV*g + BV*b + (257<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
-            c->pal_yuv[i]= y + (u<<8) + (v<<16);
+            y = av_clip_uint8((RY*r + GY*g + BY*b + ( 33<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
+            u = av_clip_uint8((RU*r + GU*g + BU*b + (257<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
+            v = av_clip_uint8((RV*r + GV*g + BV*b + (257<<(RGB2YUV_SHIFT-1)))>>RGB2YUV_SHIFT);
+            c->pal_yuv[i] = y + (u<<8) + (v<<16);
 
             switch(c->dstFormat) {
             case PIX_FMT_BGR32:
 #if !HAVE_BIGENDIAN
             case PIX_FMT_RGB24:
 #endif
-                c->pal_rgb[i]=  r + (g<<8) + (b<<16);
+                c->pal_rgb[i] =  r + (g<<8) + (b<<16);
                 break;
             case PIX_FMT_BGR32_1:
 #if HAVE_BIGENDIAN
             case PIX_FMT_BGR24:
 #endif
-                c->pal_rgb[i]= (r + (g<<8) + (b<<16)) << 8;
+                c->pal_rgb[i] = (r + (g<<8) + (b<<16)) << 8;
                 break;
             case PIX_FMT_RGB32_1:
 #if HAVE_BIGENDIAN
             case PIX_FMT_RGB24:
 #endif
-                c->pal_rgb[i]= (b + (g<<8) + (r<<16)) << 8;
+                c->pal_rgb[i] = (b + (g<<8) + (r<<16)) << 8;
                 break;
             case PIX_FMT_RGB32:
 #if !HAVE_BIGENDIAN
             case PIX_FMT_BGR24:
 #endif
             default:
-                c->pal_rgb[i]=  b + (g<<8) + (r<<16);
+                c->pal_rgb[i] =  b + (g<<8) + (r<<16);
             }
         }
     }
@@ -939,8 +985,10 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
     // copy strides, so they can safely be modified
     if (c->sliceDir == 1) {
         // slices go from top to bottom
-        int srcStride2[4]= {srcStride[0], srcStride[1], srcStride[2], srcStride[3]};
-        int dstStride2[4]= {dstStride[0], dstStride[1], dstStride[2], dstStride[3]};
+        int srcStride2[4] = {srcStride[0], srcStride[1], srcStride[2],
+                            srcStride[3]};
+        int dstStride2[4] = {dstStride[0], dstStride[1], dstStride[2],
+                            dstStride[3]};
 
         reset_ptr(src2, c->srcFormat);
         reset_ptr((const uint8_t**)dst2, c->dstFormat);
@@ -949,11 +997,14 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
         if (srcSliceY + srcSliceH == c->srcH)
             c->sliceDir = 0;
 
-        return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2, dstStride2);
+        return c->swScale(c, src2, srcStride2, srcSliceY, srcSliceH, dst2,
+                          dstStride2);
     } else {
         // slices go from bottom to top => we flip the image internally
-        int srcStride2[4]= {-srcStride[0], -srcStride[1], -srcStride[2], -srcStride[3]};
-        int dstStride2[4]= {-dstStride[0], -dstStride[1], -dstStride[2], -dstStride[3]};
+        int srcStride2[4] = {-srcStride[0], -srcStride[1], -srcStride[2],
+                            -srcStride[3]};
+        int dstStride2[4] = {-dstStride[0], -dstStride[1], -dstStride[2],
+                            -dstStride[3]};
 
         src2[0] += (srcSliceH-1)*srcStride[0];
         if (!usePal(c->srcFormat))
@@ -972,29 +1023,32 @@  int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const src
         if (!srcSliceY)
             c->sliceDir = 0;
 
-        return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH, srcSliceH, dst2, dstStride2);
+        return c->swScale(c, src2, srcStride2, c->srcH-srcSliceY-srcSliceH,
+                          srcSliceH, dst2, dstStride2);
     }
 }
 
 /* Convert the palette to the same packed 32-bit format as the palette */
-void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst,
+                                   int num_pixels, const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++)
+    for (i = 0; i < num_pixels; i++)
         ((uint32_t *) dst)[i] = ((const uint32_t *) palette)[src[i]];
 }
 
 /* Palette format: ABCD -> dst format: ABC */
-void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst, int num_pixels, const uint8_t *palette)
+void sws_convertPalette8ToPacked24(const uint8_t *src, uint8_t *dst,
+                                   int num_pixels, const uint8_t *palette)
 {
     int i;
 
-    for (i=0; i<num_pixels; i++) {
+    for (i = 0; i < num_pixels; i++) {
         //FIXME slow?
-        dst[0]= palette[src[i]*4+0];
-        dst[1]= palette[src[i]*4+1];
-        dst[2]= palette[src[i]*4+2];
-        dst+= 3;
+        dst[0] = palette[src[i]*4+0];
+        dst[1] = palette[src[i]*4+1];
+        dst[2] = palette[src[i]*4+2];
+        dst += 3;
     }
 }
-- 
1.7.5.4