commit ca1cd5415f6e73e1895ec9de4e96222441899bbe
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Oct 13 14:55:41 2017 +0530
committer Ray Essick <essick@google.com> Tue Nov 07 12:00:44 2017 -0800
tree 4f06f3b3cd289a72afdc4bf8297e5eb248574b8b
parent dd97f52b3969ee8d6fb611e045ada26037e44e27

SoftAvc: Fix input offset reset during port reconfiguration

During port reconfiguration, input buffer offset should not be
set to zero. In case input contains more than one header and second
header triggers a change in resolution, then input offset should point to
second header in the subsequent calls to decoder.

Bug: 67761639
Test: ran PoC before/after
Change-Id: I710653506959752d28170e656c1a5a897b02b335

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;
     }
 }