diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-18 22:49:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-18 22:49:48 +0000 |
| commit | b30669b5f0d9b0686040e1112cbd56266809d3e6 (patch) | |
| tree | caa6cb44914c85466ce83fe1745fb2c35841a39a | |
| parent | 08ffc77b13c61ef8ea354d16483bfad9acab979c (diff) | |
| parent | a54cd34c986dce104f607df9792b164455bf03d3 (diff) | |
| download | cts-b30669b5f0d9b0686040e1112cbd56266809d3e6.tar.gz | |
Merge "Merge "AdaptivePlaybackTest: Do not combine CSD with first frame for VP9" into android11-tests-dev am: 5a200ed69c" into android12-tests-dev
| -rw-r--r-- | tests/tests/media/src/android/media/cts/AdaptivePlaybackTest.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/tests/media/src/android/media/cts/AdaptivePlaybackTest.java b/tests/tests/media/src/android/media/cts/AdaptivePlaybackTest.java index 09076acac53..7396023bc9c 100644 --- a/tests/tests/media/src/android/media/cts/AdaptivePlaybackTest.java +++ b/tests/tests/media/src/android/media/cts/AdaptivePlaybackTest.java @@ -1405,11 +1405,14 @@ class Media { Log.i(TAG, "format=" + media.getFormat()); ArrayList<ByteBuffer> csds = new ArrayList<ByteBuffer>(); - for (String tag: new String[] { "csd-0", "csd-1" }) { - if (media.getFormat().containsKey(tag)) { - ByteBuffer csd = media.getFormat().getByteBuffer(tag); - Log.i(TAG, tag + "=" + AdaptivePlaybackTest.byteBufferToString(csd, 0, 16)); - csds.add(csd); + // CSD in VP9 can not be combined with frame data + if (!media.getMime().equals(MediaFormat.MIMETYPE_VIDEO_VP9)) { + for (String tag: new String[] { "csd-0", "csd-1" }) { + if (media.getFormat().containsKey(tag)) { + ByteBuffer csd = media.getFormat().getByteBuffer(tag); + Log.i(TAG, tag + "=" + AdaptivePlaybackTest.byteBufferToString(csd, 0, 16)); + csds.add(csd); + } } } |