summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Arun Johnson <arunjohnson@google.com> 2024-03-07 22:09:45 +0000
committer Arun Johnson <arunjohnson@google.com> 2024-03-07 22:10:08 +0000
commitcce59b2ceab5da34afd5084083ce3425f0d1fb7b (patch)
tree94e1f5866339bcdf48d484c751da972e6b6b1e64
parentbc05bdbba8031a0181a0e6df7a41e5b3afd184a0 (diff)
Reset mBufferInfos for setBufferInfo(s)
Since any of the setBufferInfo(s) can be converted to BufferInfos in getBufferInfos, a reset is required for mBufferInfos for every setBufferInfo(s) Bug: 325512893 Test: atest android.mediav2.cts.CodecDecoderBlockModelMultiAccessUnitTest Change-Id: Ibf28ad0983985bfb93f3bffe426677729430d06a
-rw-r--r--media/java/android/media/MediaCodec.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java
index 5b479b5f9c11..1c44be28c548 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -4748,6 +4748,9 @@ final public class MediaCodec {
}
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;
}