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

Fix HLS DTS Express bit-rate unknown issue.

Browse source
This commit is contained in:
Cedric T 2024-01-22 18:41:17 +08:00 committed by tonihei
parent fd2ea22e47
commit b915b04594
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java
View file

@ -15,6 +15,7 @@
*/ */
package androidx.media3.exoplayer.mediacodec; package androidx.media3.exoplayer.mediacodec;
import static androidx.media3.common.Format.NO_VALUE;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Assertions.checkState; import static androidx.media3.common.util.Assertions.checkState;
import static androidx.media3.common.util.Assertions.checkStateNotNull; import static androidx.media3.common.util.Assertions.checkStateNotNull;
@ -79,6 +80,7 @@ import androidx.media3.exoplayer.source.MediaSource;
import androidx.media3.exoplayer.source.SampleStream; import androidx.media3.exoplayer.source.SampleStream;
import androidx.media3.exoplayer.source.SampleStream.ReadDataResult; import androidx.media3.exoplayer.source.SampleStream.ReadDataResult;
import androidx.media3.exoplayer.source.SampleStream.ReadFlags; import androidx.media3.exoplayer.source.SampleStream.ReadFlags;
import androidx.media3.extractor.DtsUtil;
import androidx.media3.extractor.OpusUtil; import androidx.media3.extractor.OpusUtil;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@ -2400,6 +2402,20 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
.setEncoderDelay(numberPreSkipSamples) .setEncoderDelay(numberPreSkipSamples)
.build(); .build();
} }
// For HLS-fMP4 and HLS-TS, the bit-rate of the DTS Express stream is not in the
// manifest file. The bit-rate has no value at the point of AudioTrack Initialisation.
// This will lead to a computed direct passthrough playback buffer size of 2250000
// bytes. Some TVs (E.g. Xiaomi A Pro and Q2) do not support such a big buffer for
// direct passthrough playback. It will crash at the point of AudioTrack Initialisation.
// Here we set the unknown bit-rate to a known peak bit-rate for DTS Express streams.
if (Objects.equals(outputFormat.sampleMimeType, MimeTypes.AUDIO_DTS_EXPRESS)
&& (outputFormat.bitrate == NO_VALUE)) {
outputFormat =
checkNotNull(outputFormat)
.buildUpon()
.setPeakBitrate(DtsUtil.DTS_EXPRESS_MAX_RATE_BITS_PER_SECOND)
.build();
}
onOutputFormatChanged(outputFormat, /* mediaFormat= */ null); onOutputFormatChanged(outputFormat, /* mediaFormat= */ null);
waitingForFirstSampleInFormat = false; waitingForFirstSampleInFormat = false;
} }

3
libraries/extractor/src/main/java/androidx/media3/extractor/DtsUtil.java
View file

@ -143,6 +143,9 @@ public final class DtsUtil {
/** Maximum rate for a DTS-HD audio stream, in bytes per second. */ /** Maximum rate for a DTS-HD audio stream, in bytes per second. */
public static final int DTS_HD_MAX_RATE_BYTES_PER_SECOND = 18000 * 1000 / 8; public static final int DTS_HD_MAX_RATE_BYTES_PER_SECOND = 18000 * 1000 / 8;
/** Maximum bit-rate for a DTS Express audio stream, in bits per second. */
public static final int DTS_EXPRESS_MAX_RATE_BITS_PER_SECOND = 768000;
/** /**
* DTS Core Syncword (in different Endianness). See ETSI TS 102 114 V1.6.1 (2019-08), Section 5.3. * DTS Core Syncword (in different Endianness). See ETSI TS 102 114 V1.6.1 (2019-08), Section 5.3.
*/ */