summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-09 02:14:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-09 02:14:57 +0000
commit7b38b436225bf2e2cdf3da1ad0bc03e5d20aec98 (patch)
treeceeb999e4c71317ddeb9e08af4b12b60dfea02b2 /media
parente8ab42c773b16c28f997214c47a2aff296bfeadf (diff)
parentcce59b2ceab5da34afd5084083ce3425f0d1fb7b (diff)
downloadbase-7b38b436225bf2e2cdf3da1ad0bc03e5d20aec98.tar.gz
Merge "Reset mBufferInfos for setBufferInfo(s)" into main
Diffstat (limited to 'media')
-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;
}