From dd8e88a66e64e975e227475e3b3f9842179fe8df Mon Sep 17 00:00:00 2001 From: Tianyi Feng Date: Mon, 18 Sep 2023 12:12:47 +0000 Subject: [PATCH] Rebase and resolve conflict in the release notes --- RELEASENOTES.md | 2 ++ .../exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 7ed4a03e29c..76d7982f5c8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -11,6 +11,8 @@ stays at its current behavior of `true`. * Extractors: * Audio: + * Fix DTS Express audio buffer underflow issue + ([#650](https://github.com/androidx/media/pull/650)). * Video: * Text: * Remove `ExoplayerCuesDecoder`. Text tracks with `sampleMimeType = diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java index 717defa05a8..1e5368dd729 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java @@ -70,7 +70,6 @@ public class DefaultAudioTrackBufferSizeProvider private static final int DTSHD_BUFFER_MULTIPLICATION_FACTOR = 4; /** A builder to create {@link DefaultAudioTrackBufferSizeProvider} instances. */ - public static class Builder { private int minPcmBufferDurationUs;