Rebase and resolve conflict in the release notes
This commit is contained in:
parent
215f663019
commit
49f45c45d1
@ -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 =
|
||||||
|
@ -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;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user