loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add C.ENCODING_DTS_UHD_P2

Browse Source
This commit is contained in:
Cedric T 2023-05-04 14:42:02 +08:00 committed by Tianyi Feng
parent 22b45b75f7
commit 6823a2916a
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/common/src/main/java/androidx/media3/common/C.java
View File

@ -256,6 +256,10 @@ public final class C {
@UnstableApi public static final int ENCODING_DTS = AudioFormat.ENCODING_DTS; @UnstableApi public static final int ENCODING_DTS = AudioFormat.ENCODING_DTS;
/** See {@link AudioFormat#ENCODING_DTS_HD}. */ /** See {@link AudioFormat#ENCODING_DTS_HD}. */
@UnstableApi public static final int ENCODING_DTS_HD = AudioFormat.ENCODING_DTS_HD; @UnstableApi public static final int ENCODING_DTS_HD = AudioFormat.ENCODING_DTS_HD;
/**
* TODO: To replace with AudioFormat.ENCODING_DTS_UHD_P2 when Android 14.0 is released.
*/
@UnstableApi public static final int ENCODING_DTS_UHD_P2 = 0x0000001e;
/** See {@link AudioFormat#ENCODING_DOLBY_TRUEHD}. */ /** See {@link AudioFormat#ENCODING_DOLBY_TRUEHD}. */
@UnstableApi public static final int ENCODING_DOLBY_TRUEHD = AudioFormat.ENCODING_DOLBY_TRUEHD; @UnstableApi public static final int ENCODING_DOLBY_TRUEHD = AudioFormat.ENCODING_DOLBY_TRUEHD;
/** See {@link AudioFormat#ENCODING_OPUS}. */ /** See {@link AudioFormat#ENCODING_OPUS}. */

4
libraries/common/src/main/java/androidx/media3/common/MimeTypes.java
View File

@ -596,9 +596,9 @@ public final class MimeTypes {
case MimeTypes.AUDIO_DTS_HD: case MimeTypes.AUDIO_DTS_HD:
return C.ENCODING_DTS_HD; return C.ENCODING_DTS_HD;
case MimeTypes.AUDIO_DTS_EXPRESS: case MimeTypes.AUDIO_DTS_EXPRESS:
return C.ENCODING_DTS; // This should be ENCODING_DTS_HD when IC platforms support it. return C.ENCODING_DTS_HD;
case MimeTypes.AUDIO_DTS_X: case MimeTypes.AUDIO_DTS_X:
return C.ENCODING_DTS; // This should be ENCODING_DTS_UHD_P2 when IC platforms support it. return C.ENCODING_DTS_UHD_P2;
case MimeTypes.AUDIO_TRUEHD: case MimeTypes.AUDIO_TRUEHD:
return C.ENCODING_DOLBY_TRUEHD; return C.ENCODING_DOLBY_TRUEHD;
case MimeTypes.AUDIO_OPUS: case MimeTypes.AUDIO_OPUS:

17
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java
View File

@ -73,7 +73,8 @@ public final class AudioCapabilities {
new ImmutableMap.Builder<Integer, Integer>() new ImmutableMap.Builder<Integer, Integer>()
.put(C.ENCODING_AC3, 6) .put(C.ENCODING_AC3, 6)
.put(C.ENCODING_AC4, 6) .put(C.ENCODING_AC4, 6)
.put(C.ENCODING_DTS, 10) .put(C.ENCODING_DTS, 6)
.put(C.ENCODING_DTS_UHD_P2, 10)
.put(C.ENCODING_E_AC3_JOC, 6) .put(C.ENCODING_E_AC3_JOC, 6)
.put(C.ENCODING_E_AC3, 8) .put(C.ENCODING_E_AC3, 8)
.put(C.ENCODING_DTS_HD, 8) .put(C.ENCODING_DTS_HD, 8)
@ -204,7 +205,8 @@ public final class AudioCapabilities {
if (encoding == C.ENCODING_E_AC3_JOC && !supportsEncoding(C.ENCODING_E_AC3_JOC)) { if (encoding == C.ENCODING_E_AC3_JOC && !supportsEncoding(C.ENCODING_E_AC3_JOC)) {
// E-AC3 receivers support E-AC3 JOC streams (but decode only the base layer). // E-AC3 receivers support E-AC3 JOC streams (but decode only the base layer).
encoding = C.ENCODING_E_AC3; encoding = C.ENCODING_E_AC3;
} else if (encoding == C.ENCODING_DTS_HD && !supportsEncoding(C.ENCODING_DTS_HD)) { } else if ((encoding == C.ENCODING_DTS_HD && !supportsEncoding(C.ENCODING_DTS_HD)) ||
(encoding == C.ENCODING_DTS_UHD_P2 && !supportsEncoding(C.ENCODING_DTS_UHD_P2))) {
// DTS receivers support DTS-HD streams (but decode only the core layer). // DTS receivers support DTS-HD streams (but decode only the core layer).
encoding = C.ENCODING_DTS; encoding = C.ENCODING_DTS;
} }
@ -222,7 +224,12 @@ public final class AudioCapabilities {
channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate); channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate);
} else { } else {
channelCount = format.channelCount; channelCount = format.channelCount;
if (channelCount > maxChannelCount) { if (format.sampleMimeType == MimeTypes.AUDIO_DTS_X) {
if (channelCount > 10) {
// To fix wrong reporting from device. ChannelCount is reported as 8 for DTS:X P2 on some devices
return null;
}
} else if (channelCount > maxChannelCount) {
return null; return null;
} }
} }
@ -360,6 +367,10 @@ public final class AudioCapabilities {
public static int[] getDirectPlaybackSupportedEncodings() { public static int[] getDirectPlaybackSupportedEncodings() {
ImmutableList.Builder<Integer> supportedEncodingsListBuilder = ImmutableList.builder(); ImmutableList.Builder<Integer> supportedEncodingsListBuilder = ImmutableList.builder();
for (int encoding : ALL_SURROUND_ENCODINGS_AND_MAX_CHANNELS.keySet()) { for (int encoding : ALL_SURROUND_ENCODINGS_AND_MAX_CHANNELS.keySet()) {
// Skip ENCODING_DTS_UHD_P2 if API < 34. Otherwise setEncoding will crash.
if ((Util.SDK_INT < 34) && (encoding == C.ENCODING_DTS_UHD_P2)) {
continue;
}
if (AudioTrack.isDirectPlaybackSupported( if (AudioTrack.isDirectPlaybackSupported(
new AudioFormat.Builder() new AudioFormat.Builder()
.setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO)