From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 1 Mar 2012 01:41:19 +0000 (+0000)
Subject: Bug fix in vp8_estimate_entropy_savings()
X-Git-Tag: v1.3.0~1217^2~380^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ad7a4a2711aa0ffe87add551e0368b5d2a2e025;p=libvpx

Bug fix in vp8_estimate_entropy_savings()

Incorrect scaling of savings for t8x8.

Change-Id: If01e08f8c73faa73afc3c70e501e6acc54d7e26f
---

diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 8a5a6cdf9..5be404167 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -1765,6 +1765,7 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
     /* do not do this if not evena allowed */
     if(cpi->common.txfm_mode == ALLOW_8X8)
     {
+        int savings8x8 = 0;
         do
         {
             int j = 0;
@@ -1803,7 +1804,7 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
                         const int s = old_b - new_b - update_b;
 
                         if (s > 0)
-                            savings += s;
+                            savings8x8 += s;
 
 
                     }
@@ -1816,6 +1817,8 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
             while (++j < COEF_BANDS);
         }
         while (++i < BLOCK_TYPES);
+
+        savings += savings8x8 >> 8;
     }
 #endif