diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-08 18:50:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-07-08 18:50:40 +0000 |
| commit | c2d83f4e681eddfc535e1674f137777b8513ba3f (patch) | |
| tree | 4ca3a66d83f1f58de922dd2c9271aad8c5ccc8ea | |
| parent | 9a21f1ee240f12ad88df8dca6f18424ce744760a (diff) | |
| parent | ca26d69e753e739a0c9930b9934af94800e08acc (diff) | |
| download | cts-c2d83f4e681eddfc535e1674f137777b8513ba3f.tar.gz | |
Merge "Increase tunnel mode CTS test tolerance" into android11-tests-dev
| -rw-r--r-- | tests/tests/media/src/android/media/cts/DecoderTest.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/tests/media/src/android/media/cts/DecoderTest.java b/tests/tests/media/src/android/media/cts/DecoderTest.java index 5fe7efe2cb5..63137077144 100644 --- a/tests/tests/media/src/android/media/cts/DecoderTest.java +++ b/tests/tests/media/src/android/media/cts/DecoderTest.java @@ -3465,7 +3465,12 @@ public class DecoderTest extends MediaPlayerTestBase { final long durationMs = mMediaCodecPlayer.getDuration(); final long timeOutMs = System.currentTimeMillis() + durationMs + 5 * 1000; // add 5 sec - while (!mMediaCodecPlayer.isEnded()) { + while (!mMediaCodecPlayer.isEnded() || + // Workaround to framework bug: audio underrun incorrectly pauses the video before + // it ends. + // See https://android-review.googlesource.com/c/platform/frameworks/av/+/1690347/ + // for context. + Math.abs(durationMs - mMediaCodecPlayer.getCurrentPosition()) >= 100) { // Log.d(TAG, "currentPosition: " + mMediaCodecPlayer.getCurrentPosition() // + " duration: " + mMediaCodecPlayer.getDuration()); assertTrue("Tunneled video playback timeout exceeded", |