Skip to content

Commit ef5f7b6

Browse files
Xiao Huangandroid-build-merge-worker-robot
authored andcommitted
Merge "Do not use sample flags in queueInputBuffer" into android14-tests-dev am: e43022b am: aea6ad3
Original change: https://android-review.googlesource.com/c/platform/cts/+/2852105 Change-Id: Ic7736f33feef912c4f149383291b7573d245c268 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2 parents e408256 + aea6ad3 commit ef5f7b6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tests/tests/media/decoder/src/android/media/decoder/cts/DecodeOnlyTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ public void onInputBufferAvailable(MediaCodec codec, int index) {
240240
ByteBuffer inputBuffer = videoCodec.getInputBuffer(index);
241241
int sampleSize = videoExtractor.readSampleData(inputBuffer, 0);
242242
long presentationTime = videoExtractor.getSampleTime();
243-
int flags = videoExtractor.getSampleFlags();
243+
int flags = 0;
244244
if (sampleSize < 0) {
245245
flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
246246
sampleSize = 0;
@@ -355,7 +355,7 @@ public void onInputBufferAvailable(MediaCodec codec, int index) {
355355
ByteBuffer inputBuffer = videoCodec.getInputBuffer(index);
356356
int sampleSize = videoExtractor.readSampleData(inputBuffer, 0);
357357
long presentationTime = videoExtractor.getSampleTime();
358-
int flags = videoExtractor.getSampleFlags();
358+
int flags = 0;
359359
if (sampleSize < 0) {
360360
flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
361361
sampleSize = 0;
@@ -497,7 +497,7 @@ private void queueInput(MediaCodec codec, int index) {
497497
ByteBuffer inputBuffer = codec.getInputBuffer(index);
498498
int sampleSize = videoExtractor.readSampleData(inputBuffer, 0);
499499
long presentationTime = videoExtractor.getSampleTime();
500-
int flags = videoExtractor.getSampleFlags();
500+
int flags = 0;
501501
if (sampleSize < 0) {
502502
flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
503503
sampleSize = 0;
@@ -796,7 +796,7 @@ public void onInputBufferAvailable(MediaCodec codec, int index) {
796796
ByteBuffer audioInputBuffer = mAudioCodec.getInputBuffer(index);
797797
int audioSampleSize = mAudioExtractor.readSampleData(audioInputBuffer, 0);
798798
long presentationTime = mAudioExtractor.getSampleTime();
799-
int flags = mAudioExtractor.getSampleFlags();
799+
int flags = 0;
800800
if (audioSampleSize < 0) {
801801
flags = MediaCodec.BUFFER_FLAG_END_OF_STREAM;
802802
audioSampleSize = 0;

0 commit comments

Comments
 (0)