sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename DTSE to DTSHD

Browse source
This commit is contained in:
Cedric T 2023-09-18 18:38:45 +08:00 committed by Tianyi Feng
parent 7edfe58283
commit 24d03b0625
2 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProvider.java
View file

@ -26,7 +26,6 @@ import static java.lang.Math.max;
import android.media.AudioTrack; import android.media.AudioTrack;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.Format; import androidx.media3.common.Format;
import androidx.media3.common.MimeTypes;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.exoplayer.audio.DefaultAudioSink.OutputMode; import androidx.media3.exoplayer.audio.DefaultAudioSink.OutputMode;
import androidx.media3.extractor.AacUtil; import androidx.media3.extractor.AacUtil;
@ -67,8 +66,11 @@ public class DefaultAudioTrackBufferSizeProvider
* Default multiplication factor to apply to DTS Express passthrough buffer to avoid underruns * Default multiplication factor to apply to DTS Express passthrough buffer to avoid underruns
* on some devices (e.g., Xiaomi A2 TV). * on some devices (e.g., Xiaomi A2 TV).
*/ */
private static final int DTSE_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 {
@ -78,7 +80,7 @@ public class DefaultAudioTrackBufferSizeProvider
private int passthroughBufferDurationUs; private int passthroughBufferDurationUs;
private int offloadBufferDurationUs; private int offloadBufferDurationUs;
private int ac3BufferMultiplicationFactor; private int ac3BufferMultiplicationFactor;
private int dtseBufferMultiplicationFactor; private int dtshdBufferMultiplicationFactor;
/** Creates a new builder. */ /** Creates a new builder. */
public Builder() { public Builder() {
@ -88,7 +90,7 @@ public class DefaultAudioTrackBufferSizeProvider
passthroughBufferDurationUs = PASSTHROUGH_BUFFER_DURATION_US; passthroughBufferDurationUs = PASSTHROUGH_BUFFER_DURATION_US;
offloadBufferDurationUs = OFFLOAD_BUFFER_DURATION_US; offloadBufferDurationUs = OFFLOAD_BUFFER_DURATION_US;
ac3BufferMultiplicationFactor = AC3_BUFFER_MULTIPLICATION_FACTOR; ac3BufferMultiplicationFactor = AC3_BUFFER_MULTIPLICATION_FACTOR;
dtseBufferMultiplicationFactor = DTSE_BUFFER_MULTIPLICATION_FACTOR; dtshdBufferMultiplicationFactor = DTSHD_BUFFER_MULTIPLICATION_FACTOR;
} }
/** /**
@ -152,13 +154,13 @@ public class DefaultAudioTrackBufferSizeProvider
} }
/** /**
* Sets the multiplication factor to apply to the passthrough buffer for DTS Express to avoid * Sets the multiplication factor to apply to the passthrough buffer for DTS-HD (DTS Express)
* underruns on some devices (e.g., Xiaomi A2 TV). Default is * to avoid underruns on some devices (e.g., Xiaomi A2 TV). Default is
* {@value #DTSE_BUFFER_MULTIPLICATION_FACTOR}. * {@value #DTSHD_BUFFER_MULTIPLICATION_FACTOR}.
*/ */
@CanIgnoreReturnValue @CanIgnoreReturnValue
public Builder setDtseBufferMultiplicationFactor(int dtseBufferMultiplicationFactor) { public Builder setDtshdBufferMultiplicationFactor(int dtshdBufferMultiplicationFactor) {
this.dtseBufferMultiplicationFactor = dtseBufferMultiplicationFactor; this.dtshdBufferMultiplicationFactor = dtshdBufferMultiplicationFactor;
return this; return this;
} }
@ -189,10 +191,10 @@ public class DefaultAudioTrackBufferSizeProvider
*/ */
public final int ac3BufferMultiplicationFactor; public final int ac3BufferMultiplicationFactor;
/** /**
* The multiplication factor to apply to DTS Express passthrough buffer to avoid underruns on some * The multiplication factor to apply to DTS-HD (DTS Express) passthrough buffer to avoid
* devices (e.g., Xiaomi A2 TV). * underruns on some devices (e.g., Xiaomi A2 TV).
*/ */
public final int dtseBufferMultiplicationFactor; public final int dtshdBufferMultiplicationFactor;
protected DefaultAudioTrackBufferSizeProvider(Builder builder) { protected DefaultAudioTrackBufferSizeProvider(Builder builder) {
minPcmBufferDurationUs = builder.minPcmBufferDurationUs; minPcmBufferDurationUs = builder.minPcmBufferDurationUs;
maxPcmBufferDurationUs = builder.maxPcmBufferDurationUs; maxPcmBufferDurationUs = builder.maxPcmBufferDurationUs;
@ -200,7 +202,7 @@ public class DefaultAudioTrackBufferSizeProvider
passthroughBufferDurationUs = builder.passthroughBufferDurationUs; passthroughBufferDurationUs = builder.passthroughBufferDurationUs;
offloadBufferDurationUs = builder.offloadBufferDurationUs; offloadBufferDurationUs = builder.offloadBufferDurationUs;
ac3BufferMultiplicationFactor = builder.ac3BufferMultiplicationFactor; ac3BufferMultiplicationFactor = builder.ac3BufferMultiplicationFactor;
dtseBufferMultiplicationFactor = builder.dtseBufferMultiplicationFactor; dtshdBufferMultiplicationFactor = builder.dtshdBufferMultiplicationFactor;
} }
@Override @Override
@ -257,10 +259,10 @@ public class DefaultAudioTrackBufferSizeProvider
if (encoding == C.ENCODING_AC3) { if (encoding == C.ENCODING_AC3) {
bufferSizeUs *= ac3BufferMultiplicationFactor; bufferSizeUs *= ac3BufferMultiplicationFactor;
} else if (encoding == C.ENCODING_DTS_HD) { } else if (encoding == C.ENCODING_DTS_HD) {
// DTS Express for streaming uses a frame size (number of audio samples per channel per frame) // DTSHD (DTS Express) for streaming uses a frame size (number of audio samples per channel
// of 4096. This requires a higher multiple for the buffersize computation. Otherwise, there // per frame of 4096. This requires a higher multiple for the buffersize computation.
// will be buffer underflow during DASH playback. // Otherwise, there will be buffer underflow during DASH playback.
bufferSizeUs *= dtseBufferMultiplicationFactor; bufferSizeUs *= dtshdBufferMultiplicationFactor;
} }
int byteRate = int byteRate =

4
libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/DefaultAudioTrackBufferSizeProviderDTSHDTest.java
View file

@ -51,7 +51,7 @@ public class DefaultAudioTrackBufferSizeProviderDTSHDTest {
assertThat(bufferSize) assertThat(bufferSize)
.isEqualTo( .isEqualTo(
durationUsToDtshdMaxBytes(DEFAULT.passthroughBufferDurationUs) durationUsToDtshdMaxBytes(DEFAULT.passthroughBufferDurationUs)
* DEFAULT.dtseBufferMultiplicationFactor); * DEFAULT.dtshdBufferMultiplicationFactor);
} }
@Test @Test
@ -68,7 +68,7 @@ public class DefaultAudioTrackBufferSizeProviderDTSHDTest {
/* maxAudioTrackPlaybackSpeed= */ 1); /* maxAudioTrackPlaybackSpeed= */ 1);
// Default buffer duration 0.25s => 0.25 * 384000 / 8 = 12000 // Default buffer duration 0.25s => 0.25 * 384000 / 8 = 12000
assertThat(bufferSize).isEqualTo(12000 * DEFAULT.dtseBufferMultiplicationFactor); assertThat(bufferSize).isEqualTo(12000 * DEFAULT.dtshdBufferMultiplicationFactor);
} }
private static int durationUsToDtshdMaxBytes(long durationUs) { private static int durationUsToDtshdMaxBytes(long durationUs) {