shithub: libvpx

Download patch

ref: f82c61b8862f258bde802dd2a509a8718a718a6b
parent: fbe9098c9f3ff2d0b943d6dc9c41228f5fea55aa
parent: e3465a63d7453bcdbbe09eaca1d3b9d648df6ef4
author: Paul Wilkins <paulwilkins@google.com>
date: Mon Apr 22 01:10:36 EDT 2013 

Merge "make DC_PRED for i4x4 to use real pixels only" into experimental


--- a/vp9/common/vp9_reconintra4x4.c
+++ b/vp9/common/vp9_reconintra4x4.c
@@ -258,15 +258,22 @@
 
   switch (b_mode) {
     case B_DC_PRED: {
-      int expected_dc = 0;
-
-      for (i = 0; i < 4; i++) {
-        expected_dc += above[i];
-        expected_dc += left[i];
+      int expected_dc = 128;
+      if (have_top || have_left) {
+        int average = 0;
+        int count = 0;
+        if (have_top) {
+          for (i = 0; i < 4; i++)
+            average += above[i];
+          count += 4;
+        }
+        if (have_left) {
+          for (i = 0; i < 4; i++)
+            average += left[i];
+          count += 4;
+        }
+        expected_dc = (average + (count >> 1)) / count;
       }
-
-      expected_dc = ROUND_POWER_OF_TWO(expected_dc, 3);
-
       for (r = 0; r < 4; r++) {
         for (c = 0; c < 4; c++)
           predictor[c] = expected_dc;
-- 
⑨