commit 2e7431a3fd0f4a10bfd2f6e95f8ff2965970144a
author Wonsik Kim <wonsik@google.com> Wed Mar 20 16:00:15 2019 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Apr 02 06:11:08 2019 +0000
tree 94ede7c62bdcb4d65129ab7d0e9fc18a121d08cd
parent 6e47855569dc0cc7a1b8eb0c871fd72a2c3df878

CCodec: flush reorder stash at flush

Bug: 127921288
Test: atest GtsExoPlayerTestCases:DashTest
Change-Id: I6be571e2ca640b86eb2d227d92492bc8f0466ff5
(cherry picked from commit 92df7718a2a0976da6b5c1ce32ad47c7eecf58a7)

media/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/sfplugin/CCodecBufferChannel.cpp b/media/sfplugin/CCodecBufferChannel.cpp
index 7328673..a199986 100644
--- a/media/sfplugin/CCodecBufferChannel.cpp
+++ b/media/sfplugin/CCodecBufferChannel.cpp
@@ -1526,6 +1526,11 @@
     mKey = C2Config::ORDINAL;
 }
 
+void CCodecBufferChannel::ReorderStash::flush() {
+    mPending.clear();
+    mStash.clear();
+}
+
 void CCodecBufferChannel::ReorderStash::setDepth(uint32_t depth) {
     mPending.splice(mPending.end(), mStash);
     mDepth = depth;
@@ -2480,6 +2485,7 @@
             ALOGV("[%s] stashed flushed codec config data (size=%u)", mName, view.capacity());
         }
     }
+    mReorderStash.lock()->flush();
     {
         Mutexed<std::unique_ptr<InputBuffers>>::Locked buffers(mInputBuffers);
         (*buffers)->flush();

media/sfplugin/CCodecBufferChannel.h

diff --git a/media/sfplugin/CCodecBufferChannel.h b/media/sfplugin/CCodecBufferChannel.h
index e354fd0..3e45e86 100644
--- a/media/sfplugin/CCodecBufferChannel.h
+++ b/media/sfplugin/CCodecBufferChannel.h
@@ -354,6 +354,7 @@
         ReorderStash();
 
         void clear();
+        void flush();
         void setDepth(uint32_t depth);
         void setKey(C2Config::ordinal_key_t key);
         bool pop(Entry *entry);