From: Yunqing Wang <yunqingwang@google.com>
Date: Thu, 7 Jun 2012 17:57:21 +0000 (-0400)
Subject: Fix decimation_count in drop_frame
X-Git-Tag: v1.2.0~155^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=53d92e61ccfb3e7b0ad88c05f732101cc5c5b457;p=libvpx

Fix decimation_count in drop_frame

Frame dropping decision is made by evaluating both current frame
and next frame's buffer_level. If both buffer_levels are less
than drop_mark, next frame is dropped. When frame dropping is
over, namely, buffer_level becomes normal again, we need to
reset decimation_count to 0.

Change-Id: Iae182612e61e0da367fbd43afdc90738d975d1a3
---

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 57183d02b..fb01ea732 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3466,6 +3466,8 @@ static void encode_frame_to_data_rate
         else
             cpi->decimation_count = cpi->decimation_factor;
     }
+    else
+        cpi->decimation_count = 0;
 
     // Decide how big to make the frame
     if (!vp8_pick_frame_size(cpi))