Remove inline from initFilter()

[ffmpeg] / libswscale / swscale-example.c

diff --git a/libswscale/swscale-example.c b/libswscale/swscale-example.c
index 0e8db8a1efa1c53e008dd8c6f6d2ba66fc4a5941..8637b9f7ffb77124af452318a00c460e6c541ddf 100644 (file)
--- a/libswscale/swscale-example.c
+++ b/libswscale/swscale-example.c
@@ -37,7 +37,7 @@ const char *sws_format_name(enum PixelFormat format);
         || (x)==PIX_FMT_GRAY16BE    \
         || (x)==PIX_FMT_GRAY16LE    \
     )
-#define hasChroma(x)   (!(           \
+#define hasChroma(x)   (!(          \
             isGray(x)               \
         || (x)==PIX_FMT_MONOBLACK   \
         || (x)==PIX_FMT_MONOWHITE   \
@@ -50,14 +50,15 @@ const char *sws_format_name(enum PixelFormat format);
         || (x)==PIX_FMT_YUVA420P    \
     )
 
-static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h){
+static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, int w, int h)
+{
     int x,y;
     uint64_t ssd=0;
 
 //printf("%d %d\n", w, h);
 
-    for (y=0; y<h; y++){
-        for (x=0; x<w; x++){
+    for (y=0; y<h; y++) {
+        for (x=0; x<w; x++) {
             int d= src1[x + y*stride1] - src2[x + y*stride2];
             ssd+= d*d;
 //printf("%d", abs(src1[x + y*stride1] - src2[x + y*stride2])/26 );
@@ -70,7 +71,8 @@ static uint64_t getSSD(uint8_t *src1, uint8_t *src2, int stride1, int stride2, i
 // test by ref -> src -> dst -> out & compare out against ref
 // ref & out are YV12
 static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat, int dstFormat,
-                  int srcW, int srcH, int dstW, int dstH, int flags){
+                  int srcW, int srcH, int dstW, int dstH, int flags)
+{
     uint8_t *src[4] = {0};
     uint8_t *dst[4] = {0};
     uint8_t *out[4] = {0};
@@ -82,7 +84,7 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat
     int res;
 
     res = 0;
-    for (i=0; i<4; i++){
+    for (i=0; i<4; i++) {
         // avoid stride % bpp != 0
         if (srcFormat==PIX_FMT_RGB24 || srcFormat==PIX_FMT_BGR24)
             srcStride[i]= srcW*3;
@@ -98,9 +100,9 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat
         else
             dstStride[i]= dstW*4;
 
-        src[i]= (uint8_t*) malloc(srcStride[i]*srcH);
-        dst[i]= (uint8_t*) malloc(dstStride[i]*dstH);
-        out[i]= (uint8_t*) malloc(refStride[i]*h);
+        src[i]= malloc(srcStride[i]*srcH);
+        dst[i]= malloc(dstStride[i]*dstH);
+        out[i]= malloc(refStride[i]*h);
         if (!src[i] || !dst[i] || !out[i]) {
             perror("Malloc");
             res = -1;
@@ -163,13 +165,13 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat
            flags, ssdY, ssdU, ssdV, ssdA);
     fflush(stdout);
 
-    end:
+end:
 
     sws_freeContext(srcContext);
     sws_freeContext(dstContext);
     sws_freeContext(outContext);
 
-    for (i=0; i<4; i++){
+    for (i=0; i<4; i++) {
         free(src[i]);
         free(dst[i]);
         free(out[i]);
@@ -178,13 +180,20 @@ static int doTest(uint8_t *ref[4], int refStride[4], int w, int h, int srcFormat
     return res;
 }
 
-static void selfTest(uint8_t *src[4], int stride[4], int w, int h){
+static void selfTest(uint8_t *ref[4], int refStride[4], int w, int h)
+{
+    const int flags[] = { SWS_FAST_BILINEAR,
+                          SWS_BILINEAR, SWS_BICUBIC,
+                          SWS_X       , SWS_POINT  , SWS_AREA, 0 };
+    const int srcW = w;
+    const int srcH = h;
+    const int dstW[] = { srcW - srcW/3, srcW, srcW + srcW/3, 0 };
+    const int dstH[] = { srcH - srcH/3, srcH, srcH + srcH/3, 0 };
     enum PixelFormat srcFormat, dstFormat;
-    int srcW, srcH, dstW, dstH;
-    int flags;
 
     for (srcFormat = 0; srcFormat < PIX_FMT_NB; srcFormat++) {
         for (dstFormat = 0; dstFormat < PIX_FMT_NB; dstFormat++) {
+            int i, j, k;
             int res = 0;
 
             printf("%s -> %s\n",
@@ -192,13 +201,11 @@ static void selfTest(uint8_t *src[4], int stride[4], int w, int h){
                    sws_format_name(dstFormat));
             fflush(stdout);
 
-            srcW= w;
-            srcH= h;
-            for (dstW=w - w/3; !res && dstW<= 4*w/3; dstW+= w/3)
-                for (dstH=h - h/3; !res && dstH<= 4*h/3; dstH+= h/3)
-                    for (flags=1; !res && flags<33; flags*=2)
-                        res = doTest(src, stride, w, h, srcFormat, dstFormat,
-                                     srcW, srcH, dstW, dstH, flags);
+            for (i = 0; dstW[i] && !res; i++)
+                for (j = 0; dstH[j] && !res; j++)
+                    for (k = 0; flags[k] && !res; k++)
+                        res = doTest(ref, refStride, w, h, srcFormat, dstFormat,
+                                     srcW, srcH, dstW[i], dstH[j], flags[k]);
         }
     }
 }
@@ -206,7 +213,8 @@ static void selfTest(uint8_t *src[4], int stride[4], int w, int h){
 #define W 96
 #define H 96
 
-int main(int argc, char **argv){
+int main(int argc, char **argv)
+{
     uint8_t *rgb_data = malloc (W*H*4);
     uint8_t *rgb_src[3]= {rgb_data, NULL, NULL};
     int rgb_stride[3]={4*W, 0, 0};
@@ -217,18 +225,24 @@ int main(int argc, char **argv){
     struct SwsContext *sws;
     AVLFG rand;
 
-    sws= sws_getContext(W/12, H/12, PIX_FMT_RGB32, W, H, PIX_FMT_YUVA420P, 2, NULL, NULL, NULL);
+    if (!rgb_data || !data)
+        return -1;
+
+    sws= sws_getContext(W/12, H/12, PIX_FMT_RGB32, W, H, PIX_FMT_YUVA420P, SWS_BILINEAR, NULL, NULL, NULL);
 
     av_lfg_init(&rand, 1);
 
-    for (y=0; y<H; y++){
-        for (x=0; x<W*4; x++){
+    for (y=0; y<H; y++) {
+        for (x=0; x<W*4; x++) {
             rgb_data[ x + y*4*W]= av_lfg_get(&rand);
         }
     }
     sws_scale(sws, rgb_src, rgb_stride, 0, H, src, stride);
+    sws_freeContext(sws);
+    free(rgb_data);
 
     selfTest(src, stride, W, H);
+    free(data);
 
     return 0;
 }