shithub: libvpx

Download patch

ref: d49df319ab75228265c3c83e5bfa342687bc5ce5
parent: 1461abb89ff2a9218ddc7a9d737385ff59d72e7f
parent: d63826ac127d4d9df9cd8f546f40c6c264abdbdf
author: Ronald S. Bultje <rbultje@google.com>
date: Wed Apr 17 12:30:42 EDT 2013 

Merge "Fix edge bug in recent merge of 64x64 and 32x32 inter predictors." into experimental


--- a/vp9/common/vp9_reconinter.c
+++ b/vp9/common/vp9_reconinter.c
@@ -1068,10 +1068,10 @@
   for (n = 0; n < bw * bh; n++) {
     const int x_idx = n & (bw - 1), y_idx = n >> bwl;
 
-    x->mb_to_top_edge    = edge[0] -      ((y_idx  * 16) << 3);
-    x->mb_to_bottom_edge = edge[1] + (((1 - y_idx) * 16) << 3);
-    x->mb_to_left_edge   = edge[2] -      ((x_idx  * 16) << 3);
-    x->mb_to_right_edge  = edge[3] + (((1 - x_idx) * 16) << 3);
+    x->mb_to_top_edge    = edge[0] -           ((y_idx  * 16) << 3);
+    x->mb_to_bottom_edge = edge[1] + (((bh - 1 - y_idx) * 16) << 3);
+    x->mb_to_left_edge   = edge[2] -           ((x_idx  * 16) << 3);
+    x->mb_to_right_edge  = edge[3] + (((bw - 1 - x_idx) * 16) << 3);
 
     x->pre.y_buffer = y1 + scaled_buffer_offset(x_idx * 16,
                                                 y_idx * 16,
@@ -1136,10 +1136,10 @@
   for (n = 0; n < bw * bh; n++) {
     const int x_idx = n & (bw - 1), y_idx = n >> bwl;
 
-    x->mb_to_top_edge    = edge[0] -      ((y_idx  * 16) << 3);
-    x->mb_to_bottom_edge = edge[1] + (((1 - y_idx) * 16) << 3);
-    x->mb_to_left_edge   = edge[2] -      ((x_idx  * 16) << 3);
-    x->mb_to_right_edge  = edge[3] + (((1 - x_idx) * 16) << 3);
+    x->mb_to_top_edge    = edge[0] -           ((y_idx  * 16) << 3);
+    x->mb_to_bottom_edge = edge[1] + (((bh - 1 - y_idx) * 16) << 3);
+    x->mb_to_left_edge   = edge[2] -           ((x_idx  * 16) << 3);
+    x->mb_to_right_edge  = edge[3] + (((bw - 1 - x_idx) * 16) << 3);
 
     x->pre.y_buffer = y1 + scaled_buffer_offset(x_idx * 16,
                                                 y_idx * 16,
@@ -1193,10 +1193,10 @@
     int scaled_uv_offset;
     const int x_idx = n & (bw - 1), y_idx = n >> bwl;
 
-    x->mb_to_top_edge    = edge[0] -      ((y_idx  * 16) << 3);
-    x->mb_to_bottom_edge = edge[1] + (((1 - y_idx) * 16) << 3);
-    x->mb_to_left_edge   = edge[2] -      ((x_idx  * 16) << 3);
-    x->mb_to_right_edge  = edge[3] + (((1 - x_idx) * 16) << 3);
+    x->mb_to_top_edge    = edge[0] -           ((y_idx  * 16) << 3);
+    x->mb_to_bottom_edge = edge[1] + (((bh - 1 - y_idx) * 16) << 3);
+    x->mb_to_left_edge   = edge[2] -           ((x_idx  * 16) << 3);
+    x->mb_to_right_edge  = edge[3] + (((bw - 1 - x_idx) * 16) << 3);
 
     scaled_uv_offset = scaled_buffer_offset(x_idx * 8,
                                             y_idx * 8,
@@ -1273,10 +1273,10 @@
     int scaled_uv_offset;
     const int x_idx = n & (bw - 1), y_idx = n >> bwl;
 
-    x->mb_to_top_edge    = edge[0] -      ((y_idx  * 16) << 3);
-    x->mb_to_bottom_edge = edge[1] + (((1 - y_idx) * 16) << 3);
-    x->mb_to_left_edge   = edge[2] -      ((x_idx  * 16) << 3);
-    x->mb_to_right_edge  = edge[3] + (((1 - x_idx) * 16) << 3);
+    x->mb_to_top_edge    = edge[0] -           ((y_idx  * 16) << 3);
+    x->mb_to_bottom_edge = edge[1] + (((bh - 1 - y_idx) * 16) << 3);
+    x->mb_to_left_edge   = edge[2] -           ((x_idx  * 16) << 3);
+    x->mb_to_right_edge  = edge[3] + (((bw - 1 - x_idx) * 16) << 3);
 
     scaled_uv_offset = scaled_buffer_offset(x_idx * 8,
                                             y_idx * 8,
-- 
⑨