Rebase and resolve conflict in the release notes

This commit is contained in:
Tianyi Feng 2023-09-18 12:12:47 +00:00
parent 215f663019
commit 49f45c45d1
2 changed files with 2 additions and 1 deletions

View File

@ -11,6 +11,8 @@
stays at its current behavior of `true`. stays at its current behavior of `true`.
* Extractors: * Extractors:
* Audio: * Audio:
* Fix DTS Express audio buffer underflow issue
([#650](https://github.com/androidx/media/pull/650)).
* Video: * Video:
* Text: * Text:
* Remove `ExoplayerCuesDecoder`. Text tracks with `sampleMimeType = * Remove `ExoplayerCuesDecoder`. Text tracks with `sampleMimeType =

View File

@ -70,7 +70,6 @@ public class DefaultAudioTrackBufferSizeProvider
private static final int DTSHD_BUFFER_MULTIPLICATION_FACTOR = 4; private static final int DTSHD_BUFFER_MULTIPLICATION_FACTOR = 4;
/** A builder to create {@link DefaultAudioTrackBufferSizeProvider} instances. */ /** A builder to create {@link DefaultAudioTrackBufferSizeProvider} instances. */
public static class Builder { public static class Builder {
private int minPcmBufferDurationUs; private int minPcmBufferDurationUs;