summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-03-09 02:51:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-09 02:51:52 +0000
commit4e6f5510ebb60b7a57071ec9cf90a326fe2cd9b9 (patch)
treeceeb999e4c71317ddeb9e08af4b12b60dfea02b2
parent529edaceef2ed8965b69a436492193b50d1c1b0a (diff)
parent7b38b436225bf2e2cdf3da1ad0bc03e5d20aec98 (diff)
Merge "Reset mBufferInfos for setBufferInfo(s)" into main am: 7b38b43622
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2995378 Change-Id: I59d47a86531b9ce3044f2ff531eafe1b3d518195 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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 2999d76fd2ae..e0e198ae551d 100644
--- a/media/java/android/media/MediaCodec.java
+++ b/media/java/android/media/MediaCodec.java
@@ -4759,6 +4759,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;
}