From def01f68b98f2eacbaa2987f3997f4c5f18e157d Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 18 Jun 2019 15:24:53 +0100 Subject: [PATCH] Let AudioTrack write headers on SDK_INT >= 26 Issue: #6031 PiperOrigin-RevId: 253784986 --- .../android/exoplayer2/audio/DefaultAudioSink.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java index bd57c82916..a3c0990366 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java @@ -1178,11 +1178,10 @@ public final class DefaultAudioSink implements AudioSink { @TargetApi(21) private int writeNonBlockingWithAvSyncV21(AudioTrack audioTrack, ByteBuffer buffer, int size, long presentationTimeUs) { - // TODO: Uncomment this when [Internal ref: b/33627517] is clarified or fixed. - // if (Util.SDK_INT >= 23) { - // // The underlying platform AudioTrack writes AV sync headers directly. - // return audioTrack.write(buffer, size, WRITE_NON_BLOCKING, presentationTimeUs * 1000); - // } + if (Util.SDK_INT >= 26) { + // The underlying platform AudioTrack writes AV sync headers directly. + return audioTrack.write(buffer, size, WRITE_NON_BLOCKING, presentationTimeUs * 1000); + } if (avSyncHeader == null) { avSyncHeader = ByteBuffer.allocate(16); avSyncHeader.order(ByteOrder.BIG_ENDIAN);