[x264-devel] commit: Fix regression in checkasm in r1666 (Oskar Arvidsson )

[git at videolan.org]

x264 | branch: master | Oskar Arvidsson <oskar at irock.se> | Fri Oct 29 13:13:25 2010 +0200| [d6a1303986d20dda483186adf8bc68ee148a8dcc] | committer: Jason Garrett-Glaser 

Fix regression in checkasm in r1666
Buffer is uint16_t* regardless of whether x264 was compiled with high bit depth or not.

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

 tools/checkasm.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/checkasm.c b/tools/checkasm.c
index 323aa95..5a3563a 100644
--- a/tools/checkasm.c
+++ b/tools/checkasm.c
@@ -1176,14 +1176,14 @@ static int check_mc( int cpu_ref, int cpu_new )
         int stride = 80;\
         set_func_name( #name );\
         used_asm = 1;\
-        memcpy( pbuf3, pbuf1, size*2*stride * sizeof(pixel) );\
-        memcpy( pbuf4, pbuf1, size*2*stride * sizeof(pixel) );\
-        uint16_t *sum = (uint16_t*)pbuf3;\
+        memcpy( buf3, buf1, size*2*stride );\
+        memcpy( buf4, buf1, size*2*stride );\
+        uint16_t *sum = (uint16_t*)buf3;\
         call_c1( mc_c.name, __VA_ARGS__ );\
-        sum = (uint16_t*)pbuf4;\
+        sum = (uint16_t*)buf4;\
         call_a1( mc_a.name, __VA_ARGS__ );\
-        if( memcmp( pbuf3, pbuf4, (stride-8)*2 * sizeof(pixel) )\
-            || (size>9 && memcmp( pbuf3+18*stride, pbuf4+18*stride, (stride-8)*2 * sizeof(pixel) )))\
+        if( memcmp( buf3, buf4, (stride-8)*2 ) \
+            || (size>9 && memcmp( buf3+18*stride, buf4+18*stride, (stride-8)*2 )))\
             ok = 0;\
         call_c2( mc_c.name, __VA_ARGS__ );\
         call_a2( mc_a.name, __VA_ARGS__ );\