[FFmpeg-cvslog] checkasm/vf_blend : add depth param in order to add test for 16 bit version

[Martin Vignali]

ffmpeg | branch: master | Martin Vignali <martin.vign...@gmail.com> | Sat Feb 
17 20:48:42 2018 +0100| [e3fc36a84c4335fcb347ed82911f98339279ec39] | committer: 
Martin Vignali

checkasm/vf_blend : add depth param in order to add test for 16 bit version

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3fc36a84c4335fcb347ed82911f98339279ec39
---

 tests/checkasm/vf_blend.c | 57 ++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/tests/checkasm/vf_blend.c b/tests/checkasm/vf_blend.c
index be65730452..9933f0426e 100644
--- a/tests/checkasm/vf_blend.c
+++ b/tests/checkasm/vf_blend.c
@@ -60,28 +60,29 @@
         }                                     \
     } while (0)
 
-#define check_blend_func()                                                     
            \
+#define check_blend_func(depth)                                                
            \
     do {                                                                       
            \
-        int i;                                                                 
            \
+        int i, w;                                                              
            \
         declare_func(void, const uint8_t *top, ptrdiff_t top_linesize,         
            \
                      const uint8_t *bottom, ptrdiff_t bottom_linesize,         
            \
                      uint8_t *dst, ptrdiff_t dst_linesize,                     
            \
                      ptrdiff_t width, ptrdiff_t height,                        
            \
                      struct FilterParams *param, double *values);              
            \
+        w = WIDTH / depth;                                                     
            \
                                                                                
            \
         for (i = 0; i < BUF_UNITS - 1; i++) {                                  
            \
             int src_offset = i * SIZE_PER_UNIT + i; /* Test various alignments 
*/          \
             int dst_offset = i * SIZE_PER_UNIT; /* dst must be aligned */      
            \
             randomize_buffers();                                               
            \
-            call_ref(top1 + src_offset, WIDTH, bot1 + src_offset, WIDTH,       
            \
-                     dst1 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL);   
            \
-            call_new(top2 + src_offset, WIDTH, bot2 + src_offset, WIDTH,       
            \
-                     dst2 + dst_offset, WIDTH, WIDTH, HEIGHT, &param, NULL);   
            \
+            call_ref(top1 + src_offset, w, bot1 + src_offset, w,               
            \
+                     dst1 + dst_offset, w, w, HEIGHT, &param, NULL);           
            \
+            call_new(top2 + src_offset, w, bot2 + src_offset, w,               
            \
+                     dst2 + dst_offset, w, w, HEIGHT, &param, NULL);           
            \
             if (memcmp(top1, top2, BUF_SIZE) || memcmp(bot1, bot2, BUF_SIZE) 
|| memcmp(dst1, dst2, BUF_SIZE)) \
                 fail();                                                        
            \
         }                                                                      
            \
-        bench_new(top2, WIDTH / 4, bot2, WIDTH / 4, dst2, WIDTH / 4,           
            \
-                  WIDTH / 4, HEIGHT / 4, &param, NULL);                        
            \
+        bench_new(top2, w / 4, bot2, w / 4, dst2, w / 4,                       
            \
+                  w / 4, HEIGHT / 4, &param, NULL);                            
            \
     } while (0)
 
 void checkasm_check_blend(void)
@@ -96,29 +97,29 @@ void checkasm_check_blend(void)
         .opacity = 1.0,
     };
 
-#define check_and_report(name, val)               \
+#define check_and_report(name, val, depth)        \
     param.mode = val;                             \
-    ff_blend_init(&param, 0);                     \
+    ff_blend_init(&param, depth - 1);             \
     if (check_func(param.blend, #name))           \
-        check_blend_func();
+        check_blend_func(depth);
 
-    check_and_report(addition, BLEND_ADDITION)
-    check_and_report(grainmerge, BLEND_GRAINMERGE)
-    check_and_report(and, BLEND_AND)
-    check_and_report(average, BLEND_AVERAGE)
-    check_and_report(darken, BLEND_DARKEN)
-    check_and_report(grainextract, BLEND_GRAINEXTRACT)
-    check_and_report(hardmix, BLEND_HARDMIX)
-    check_and_report(lighten, BLEND_LIGHTEN)
-    check_and_report(multiply, BLEND_MULTIPLY)
-    check_and_report(or, BLEND_OR)
-    check_and_report(phoenix, BLEND_PHOENIX)
-    check_and_report(screen, BLEND_SCREEN)
-    check_and_report(subtract, BLEND_SUBTRACT)
-    check_and_report(xor, BLEND_XOR)
-    check_and_report(difference, BLEND_DIFFERENCE)
-    check_and_report(extremity, BLEND_EXTREMITY)
-    check_and_report(negation, BLEND_NEGATION)
+    check_and_report(addition, BLEND_ADDITION, 1)
+    check_and_report(grainmerge, BLEND_GRAINMERGE, 1)
+    check_and_report(and, BLEND_AND, 1)
+    check_and_report(average, BLEND_AVERAGE, 1)
+    check_and_report(darken, BLEND_DARKEN, 1)
+    check_and_report(grainextract, BLEND_GRAINEXTRACT, 1)
+    check_and_report(hardmix, BLEND_HARDMIX, 1)
+    check_and_report(lighten, BLEND_LIGHTEN, 1)
+    check_and_report(multiply, BLEND_MULTIPLY, 1)
+    check_and_report(or, BLEND_OR, 1)
+    check_and_report(phoenix, BLEND_PHOENIX, 1)
+    check_and_report(screen, BLEND_SCREEN, 1)
+    check_and_report(subtract, BLEND_SUBTRACT, 1)
+    check_and_report(xor, BLEND_XOR, 1)
+    check_and_report(difference, BLEND_DIFFERENCE, 1)
+    check_and_report(extremity, BLEND_EXTREMITY, 1)
+    check_and_report(negation, BLEND_NEGATION, 1)
 
     report("8bit");
 

_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog