From c094391e954aa274b9dcce3d6afcb5ba6bae7eff Mon Sep 17 00:00:00 2001
From: Jerome Jiang <jianj@google.com>
Date: Tue, 10 Sep 2019 16:42:32 -0700
Subject: [PATCH] vpx_clear_system_state after drop due to overshoot

BUG=999780

Change-Id: I096fdc22812eab22a38a33135c0cbe60a6e64add
---
 vp8/encoder/onyx_if.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 4fd1574..f72303d 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -3958,7 +3958,10 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size,
     vp8_encode_frame(cpi);
 
     if (cpi->pass == 0 && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
-      if (vp8_drop_encodedframe_overshoot(cpi, Q)) return;
+      if (vp8_drop_encodedframe_overshoot(cpi, Q)) {
+        vpx_clear_system_state();
+        return;
+      }
       if (cm->frame_type != KEY_FRAME)
         cpi->last_pred_err_mb =
             (int)(cpi->mb.prediction_error / cpi->common.MBs);
-- 
2.7.4