Dts direct passthrough support #335
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,21 +48,19 @@ | |
| @UnstableApi | ||
| public final class AudioCapabilities { | ||
|
|
||
| // TODO(internal b/283945513): Have separate default max channel counts in `AudioCapabilities` | ||
| // for PCM and compressed audio. | ||
| private static final int DEFAULT_MAX_CHANNEL_COUNT = 10; | ||
| @VisibleForTesting /* package */ static final int DEFAULT_SAMPLE_RATE_HZ = 48_000; | ||
|
|
||
| /** The minimum audio capabilities supported by all devices. */ | ||
| public static final AudioCapabilities DEFAULT_AUDIO_CAPABILITIES = | ||
| new AudioCapabilities(new int[] {AudioFormat.ENCODING_PCM_16BIT}, DEFAULT_MAX_CHANNEL_COUNT); | ||
|
|
||
| /** Encodings supported when the device specifies external surround sound. */ | ||
| private static final ImmutableList<Integer> EXTERNAL_SURROUND_SOUND_ENCODINGS = | ||
| ImmutableList.of( | ||
| AudioFormat.ENCODING_PCM_16BIT, AudioFormat.ENCODING_AC3, AudioFormat.ENCODING_E_AC3); | ||
|
|
||
| /** | ||
| * All surround sound encodings that a device may be capable of playing mapped to a maximum | ||
|
|
@@ -73,6 +71,7 @@ public final class AudioCapabilities { | |
| .put(C.ENCODING_AC3, 6) | ||
| .put(C.ENCODING_AC4, 6) | ||
| .put(C.ENCODING_DTS, 6) | ||
| .put(C.ENCODING_DTS_UHD_P2, 10) | ||
| .put(C.ENCODING_E_AC3_JOC, 6) | ||
| .put(C.ENCODING_E_AC3, 8) | ||
| .put(C.ENCODING_DTS_HD, 8) | ||
|
|
@@ -103,25 +102,39 @@ public static AudioCapabilities getCapabilities(Context context) { | |
| if (Util.SDK_INT >= 23 && Api23.isBluetoothConnected(context)) { | ||
| return DEFAULT_AUDIO_CAPABILITIES; | ||
| } | ||
|
|
||
| ImmutableSet.Builder<Integer> supportedEncodings = new ImmutableSet.Builder<>(); | ||
| if (deviceMaySetExternalSurroundSoundGlobalSetting() | ||
| && Global.getInt(context.getContentResolver(), EXTERNAL_SURROUND_SOUND_KEY, 0) == 1) { | ||
| supportedEncodings.addAll(EXTERNAL_SURROUND_SOUND_ENCODINGS); | ||
| } | ||
| // AudioTrack.isDirectPlaybackSupported returns true for encodings that are supported for audio | ||
| // offload, as well as for encodings we want to list for passthrough mode. Therefore we only use | ||
| // it on TV and automotive devices, which generally shouldn't support audio offload for surround | ||
| // encodings. | ||
| if (Util.SDK_INT >= 29 && (Util.isTv(context) || Util.isAutomotive(context))) { | ||
| supportedEncodings.addAll(Api29.getDirectPlaybackSupportedEncodings()); | ||
| return new AudioCapabilities( | ||
| Ints.toArray(supportedEncodings.build()), DEFAULT_MAX_CHANNEL_COUNT); | ||
| } | ||
|
|
||
| if (intent != null && intent.getIntExtra(AudioManager.EXTRA_AUDIO_PLUG_STATE, 0) == 1) { | ||
| @Nullable int[] encodingsFromExtra = intent.getIntArrayExtra(AudioManager.EXTRA_ENCODINGS); | ||
| if (encodingsFromExtra != null) { | ||
| supportedEncodings.addAll(Ints.asList(encodingsFromExtra)); | ||
| } | ||
| return new AudioCapabilities( | ||
| Ints.toArray(supportedEncodings.build()), | ||
| intent.getIntExtra( | ||
| AudioManager.EXTRA_MAX_CHANNEL_COUNT, /* defaultValue= */ DEFAULT_MAX_CHANNEL_COUNT)); | ||
| } | ||
|
|
||
| ImmutableSet<Integer> supportedEncodingsSet = supportedEncodings.build(); | ||
| if (!supportedEncodingsSet.isEmpty()) { | ||
| return new AudioCapabilities( | ||
| Ints.toArray(supportedEncodingsSet), /* maxChannelCount= */ DEFAULT_MAX_CHANNEL_COUNT); | ||
| } | ||
| return DEFAULT_AUDIO_CAPABILITIES; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -203,7 +216,8 @@ public Pair<Integer, Integer> getEncodingAndChannelConfigForPassthrough(Format f | |
| 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). | ||
| encoding = C.ENCODING_E_AC3; | ||
| } 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). | ||
| encoding = C.ENCODING_DTS; | ||
| } | ||
|
|
@@ -220,7 +234,13 @@ public Pair<Integer, Integer> getEncodingAndChannelConfigForPassthrough(Format f | |
| channelCount = getMaxSupportedChannelCountForPassthrough(encoding, sampleRate); | ||
| } else { | ||
| channelCount = format.channelCount; | ||
| // Some DTS:X TVs reports ACTION_HDMI_AUDIO_PLUG.EXTRA_MAX_CHANNEL_COUNT as 8 | ||
| // instead of 10. See https://github.com/androidx/media/issues/396 | ||
| if (format.sampleMimeType.equals(MimeTypes.AUDIO_DTS_X)) { | ||
|
There was a problem hiding this comment. @cedricxperi We have two questions regarding this:
The reason I'm asking above questions is - either this is a device or even platform issue, if it is able to be fixed, how do you think if we just don't attempt to play DTS:X for those devices ( There was a problem hiding this comment. @tianyif I do not have access to other device at the moment but it is reasonable to think that this would be reproduceable for all DTS:X TVs based on MTK platforms. It will take sometime for this issue to be fixed on the platform. Meanwhile, Xperi will have to go to each and every streaming service to tell them to add the above so that DTS:X can be played back. I think it is better to add this patch in the exoplayer code base so that everyone will be aware of it. When the issue get fixed on the platform (which could take a long time), we can remove this patch in another exoplayer contribution. Thanks. There was a problem hiding this comment. I will keep this patch. Thanks! |
||
| if (channelCount > 10) { | ||
| return null; | ||
| } | ||
| } else if (channelCount > maxChannelCount) { | ||
| return null; | ||
| } | ||
| } | ||
|
|
@@ -355,9 +375,13 @@ private static final class Api29 { | |
| private Api29() {} | ||
|
|
||
| @DoNotInline | ||
| public static ImmutableList<Integer> getDirectPlaybackSupportedEncodings() { | ||
| ImmutableList.Builder<Integer> supportedEncodingsListBuilder = ImmutableList.builder(); | ||
| for (int encoding : ALL_SURROUND_ENCODINGS_AND_MAX_CHANNELS.keySet()) { | ||
| // AudioFormat.ENCODING_DTS_UHD_P2 is supported from API 34. | ||
| if (Util.SDK_INT < 34 && encoding == C.ENCODING_DTS_UHD_P2) { | ||
| continue; | ||
| } | ||
| if (AudioTrack.isDirectPlaybackSupported( | ||
| new AudioFormat.Builder() | ||
| .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO) | ||
|
|
@@ -369,7 +393,7 @@ public static int[] getDirectPlaybackSupportedEncodings() { | |
| } | ||
| } | ||
| supportedEncodingsListBuilder.add(AudioFormat.ENCODING_PCM_16BIT); | ||
| return supportedEncodingsListBuilder.build(); | ||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.