commit 7b38b436225bf2e2cdf3da1ad0bc03e5d20aec98
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Mar 09 02:14:57 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 09 02:14:57 2024 +0000
tree ceeb999e4c71317ddeb9e08af4b12b60dfea02b2
parent e8ab42c773b16c28f997214c47a2aff296bfeadf
parent cce59b2ceab5da34afd5084083ce3425f0d1fb7b

Merge "Reset mBufferInfos for setBufferInfo(s)" into main

media/java/android/media/MediaCodec.java

diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 2999d76..e0e198a 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -4759,6 +4759,9 @@
         }
 
         void setBufferInfo(MediaCodec.BufferInfo info) {
+            // since any of setBufferInfo(s) should translate to getBufferInfos,
+            // mBufferInfos needs to be reset for every setBufferInfo(s)
+            mBufferInfos.clear();
             mPresentationTimeUs = info.presentationTimeUs;
             mFlags = info.flags;
         }