167 broke psnr calculation for non-mod-32 inputs

git-svn-id: svn://svn.videolan.org/x264/trunk@169 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 9ef57e0fa40d2129792c8804a92a75902eeb859c..db263d339e8ed2a360d052d5c0801c9b23510480 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -69,11 +69,19 @@ static int64_t x264_sqe( x264_t *h, uint8_t *pix1, int i_pix_stride, uint8_t *pi
     int64_t i_sqe = 0;
     int x, y;
 
-    for( y = 0; y < i_height; y += 16 )
-        for( x = 0; x < i_width; x += 16 )
-            i_sqe += h->pixf.ssd[PIXEL_16x16]( pix1+y*i_pix_stride+x, i_pix_stride,
-                                               pix2+y*i_pix2_stride+x, i_pix2_stride );
-
+#define SSD(size) i_sqe += h->pixf.ssd[size]( pix1+y*i_pix_stride+x, i_pix_stride, \
+                                              pix2+y*i_pix2_stride+x, i_pix2_stride );
+    for( y = 0; y < i_height-15; y += 16 )
+    {
+        for( x = 0; x < i_width-15; x += 16 )
+            SSD(PIXEL_16x16);
+        if( x < i_width-7 )
+            SSD(PIXEL_8x16);
+    }
+    if( y < i_height-7 )
+        for( x = 0; x < i_width-7; x += 8 )
+            SSD(PIXEL_8x8);
+#undef SSD
     x264_cpu_restore( h->param.cpu );
 
     return i_sqe;