Merge "Add CSD back after flush"

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java
index 676505139f0..29816262d7d 100755
--- a/tests/tests/media/src/android/media/cts/DecoderTest.java
+++ b/tests/tests/media/src/android/media/cts/DecoderTest.java
@@ -803,7 +803,7 @@ public class DecoderTest extends MediaPlayerTestBase {
         return decoded;
     }
 
-    private void queueConfig(MediaCodec codec, MediaFormat format) {
+    private static void queueConfig(MediaCodec codec, MediaFormat format) {
         for (String csdKey : CSD_KEYS) {
             if (!format.containsKey(csdKey)) {
                 continue;
@@ -1432,6 +1432,10 @@ public class DecoderTest extends MediaPlayerTestBase {
             codecOutputBuffers = codec.getOutputBuffers();
         } else if (resetMode == RESET_MODE_FLUSH) {
             codec.flush();
+
+            // We must always queue CSD after a flush that is potentially
+            // before we receive output format has changed.
+            queueConfig(codec, format);
         }
 
         // start decode loop