commit c8061784ac0c1c98e5961501634925c8a4f95e51
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Nov 08 02:02:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 08 02:02:53 2017 +0000
tree 4849488dcdeeed3a4de8b4354ae6733785fe32af
parent 731ed3c47878be690a4b0146897991b946af91f4
parent ca1cd5415f6e73e1895ec9de4e96222441899bbe

Merge "SoftAvc: Fix input offset reset during port reconfiguration"

media/libstagefright/codecs/avcdec/SoftAVCDec.cpp

diff --git a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
index dae6e79..1622561 100644
--- a/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
+++ b/media/libstagefright/codecs/avcdec/SoftAVCDec.cpp
@@ -171,7 +171,7 @@
 status_t SoftAVC::resetPlugin() {
     mIsInFlush = false;
     mReceivedEOS = false;
-    mInputOffset = 0;
+
     memset(mTimeStamps, 0, sizeof(mTimeStamps));
     memset(mTimeStampsValid, 0, sizeof(mTimeStampsValid));
 
@@ -334,6 +334,7 @@
     SoftVideoDecoderOMXComponent::onReset();
 
     mSignalledError = false;
+    mInputOffset = 0;
     resetDecoder();
     resetPlugin();
 }
@@ -465,7 +466,8 @@
             free(mFlushOutBuffer);
             mFlushOutBuffer = NULL;
         }
-
+    } else {
+        mInputOffset = 0;
     }
 }