swscale: handle complete dimensions for monoblack/white.

[ffmpeg.git] / libswscale / colorspace-test.c

diff --git a/libswscale/colorspace-test.c b/libswscale/colorspace-test.c
index 5a48065..135924c 100644 (file)
--- a/libswscale/colorspace-test.c
+++ b/libswscale/colorspace-test.c
@@ -1,20 +1,20 @@
 /*
  * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
  *
 /*
  * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
  *

- * This file is part of FFmpeg.
+ * This file is part of Libav.

  *
  *

- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or

  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *

- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public

- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software

  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 


@@ -27,59 +27,32 @@
 #include "swscale.h"
 #include "rgb2rgb.h"
 
 #include "swscale.h"
 #include "rgb2rgb.h"
 

-#define SIZE 1000
+#define SIZE    1000

 #define srcByte 0x55
 #define dstByte 0xBB
 
 #define srcByte 0x55
 #define dstByte 0xBB
 

-#define FUNC(s,d,n) {s,d,#n,n}
+#define FUNC(s, d, n) { s, d, #n, n }

 
 

-static int cpu_caps;
-
-static char *args_parse(int argc, char *argv[])
-{
-    int o;
-
-    while ((o = getopt(argc, argv, "m23")) != -1) {
-        switch (o) {
-        case 'm':
-            cpu_caps |= SWS_CPU_CAPS_MMX;
-            break;
-        case '2':
-            cpu_caps |= SWS_CPU_CAPS_MMX2;
-            break;
-        case '3':
-            cpu_caps |= SWS_CPU_CAPS_3DNOW;
-            break;
-        default:
-            av_log(NULL, AV_LOG_ERROR, "Unknown option %c\n", o);
-        }
-    }
-
-    return argv[optind];
-}
-
-int main(int argc, char **argv)
+int main(void)

 {
     int i, funcNum;
 {
     int i, funcNum;

-    uint8_t *srcBuffer= (uint8_t*)av_malloc(SIZE);
-    uint8_t *dstBuffer= (uint8_t*)av_malloc(SIZE);
-    int failedNum=0;
-    int passedNum=0;
+    uint8_t *srcBuffer = av_malloc(SIZE);
+    uint8_t *dstBuffer = av_malloc(SIZE);
+    int failedNum      = 0;
+    int passedNum      = 0;

 
     if (!srcBuffer || !dstBuffer)
         return -1;
 
     av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");
 
     if (!srcBuffer || !dstBuffer)
         return -1;
 
     av_log(NULL, AV_LOG_INFO, "memory corruption test ...\n");

-    args_parse(argc, argv);
-    av_log(NULL, AV_LOG_INFO, "CPU capabilities forced to %x\n", cpu_caps);
-    sws_rgb2rgb_init(cpu_caps);
+    sws_rgb2rgb_init();

 
 

-    for(funcNum=0; ; funcNum++) {
+    for (funcNum = 0; ; funcNum++) {

         struct func_info_s {
             int src_bpp;
             int dst_bpp;
             const char *name;
         struct func_info_s {
             int src_bpp;
             int dst_bpp;
             const char *name;

-            void (*func)(const uint8_t *src, uint8_t *dst, long src_size);
+            void (*func)(const uint8_t *src, uint8_t *dst, int src_size);

         } func_info[] = {
             FUNC(2, 2, rgb15to16),
             FUNC(2, 3, rgb15to24),
         } func_info[] = {
             FUNC(2, 2, rgb15to16),
             FUNC(2, 3, rgb15to24),


@@ -108,71 +81,82 @@ int main(int argc, char **argv)
             FUNC(4, 2, rgb32tobgr15),
             FUNC(4, 2, rgb32tobgr16),
             FUNC(4, 3, rgb32tobgr24),
             FUNC(4, 2, rgb32tobgr15),
             FUNC(4, 2, rgb32tobgr16),
             FUNC(4, 3, rgb32tobgr24),

-            FUNC(4, 4, rgb32tobgr32),
+            FUNC(4, 4, shuffle_bytes_2103), /* rgb32tobgr32 */

             FUNC(0, 0, NULL)
         };
         int width;
             FUNC(0, 0, NULL)
         };
         int width;

-        int failed=0;
-        int srcBpp=0;
-        int dstBpp=0;
+        int failed = 0;
+        int srcBpp = 0;
+        int dstBpp = 0;

 
 

-        if (!func_info[funcNum].func) break;
+        if (!func_info[funcNum].func)
+            break;

 
 

-        av_log(NULL, AV_LOG_INFO,".");
+        av_log(NULL, AV_LOG_INFO, ".");

         memset(srcBuffer, srcByte, SIZE);
 
         memset(srcBuffer, srcByte, SIZE);
 

-        for(width=63; width>0; width--) {
+        for (width = 63; width > 0; width--) {

             int dstOffset;
             int dstOffset;

-            for(dstOffset=128; dstOffset<196; dstOffset+=4) {
+            for (dstOffset = 128; dstOffset < 196; dstOffset += 4) {

                 int srcOffset;
                 memset(dstBuffer, dstByte, SIZE);
 
                 int srcOffset;
                 memset(dstBuffer, dstByte, SIZE);
 

-                for(srcOffset=128; srcOffset<196; srcOffset+=4) {
-                    uint8_t *src= srcBuffer+srcOffset;
-                    uint8_t *dst= dstBuffer+dstOffset;
-                    const char *name=NULL;
+                for (srcOffset = 128; srcOffset < 196; srcOffset += 4) {
+                    uint8_t *src     = srcBuffer + srcOffset;
+                    uint8_t *dst     = dstBuffer + dstOffset;
+                    const char *name = NULL;

 
 

-                    if(failed) break; //don't fill the screen with shit ...
+                    // don't fill the screen with shit ...
+                    if (failed)
+                        break;

 
                     srcBpp = func_info[funcNum].src_bpp;
                     dstBpp = func_info[funcNum].dst_bpp;
                     name   = func_info[funcNum].name;
 
 
                     srcBpp = func_info[funcNum].src_bpp;
                     dstBpp = func_info[funcNum].dst_bpp;
                     name   = func_info[funcNum].name;
 

-                    func_info[funcNum].func(src, dst, width*srcBpp);
+                    func_info[funcNum].func(src, dst, width * srcBpp);

 
 

-                    if(!srcBpp) break;
+                    if (!srcBpp)
+                        break;

 
 

-                    for(i=0; i<SIZE; i++) {
-                        if(srcBuffer[i]!=srcByte) {
-                            av_log(NULL, AV_LOG_INFO, "src damaged at %d w:%d src:%d dst:%d %s\n",
+                    for (i = 0; i < SIZE; i++) {
+                        if (srcBuffer[i] != srcByte) {
+                            av_log(NULL, AV_LOG_INFO,
+                                   "src damaged at %d w:%d src:%d dst:%d %s\n",

                                    i, width, srcOffset, dstOffset, name);
                                    i, width, srcOffset, dstOffset, name);

-                            failed=1;
+                            failed = 1;

                             break;
                         }
                     }
                             break;
                         }
                     }

-                    for(i=0; i<dstOffset; i++) {
-                        if(dstBuffer[i]!=dstByte) {
-                            av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
+                    for (i = 0; i < dstOffset; i++) {
+                        if (dstBuffer[i] != dstByte) {
+                            av_log(NULL, AV_LOG_INFO,
+                                   "dst damaged at %d w:%d src:%d dst:%d %s\n",

                                    i, width, srcOffset, dstOffset, name);
                                    i, width, srcOffset, dstOffset, name);

-                            failed=1;
+                            failed = 1;

                             break;
                         }
                     }
                             break;
                         }
                     }

-                    for(i=dstOffset + width*dstBpp; i<SIZE; i++) {
-                        if(dstBuffer[i]!=dstByte) {
-                            av_log(NULL, AV_LOG_INFO, "dst damaged at %d w:%d src:%d dst:%d %s\n",
+                    for (i = dstOffset + width * dstBpp; i < SIZE; i++) {
+                        if (dstBuffer[i] != dstByte) {
+                            av_log(NULL, AV_LOG_INFO,
+                                   "dst damaged at %d w:%d src:%d dst:%d %s\n",

                                    i, width, srcOffset, dstOffset, name);
                                    i, width, srcOffset, dstOffset, name);

-                            failed=1;
+                            failed = 1;

                             break;
                         }
                     }
                 }
             }
         }
                             break;
                         }
                     }
                 }
             }
         }

-        if(failed) failedNum++;
-        else if(srcBpp) passedNum++;
+        if (failed)
+            failedNum++;
+        else if (srcBpp)
+            passedNum++;

     }
 
     }
 

-    av_log(NULL, AV_LOG_INFO, "\n%d converters passed, %d converters randomly overwrote memory\n", passedNum, failedNum);
+    av_log(NULL, AV_LOG_INFO,
+           "\n%d converters passed, %d converters randomly overwrote memory\n",
+           passedNum, failedNum);

     return failedNum;
 }
     return failedNum;
 }