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

Merge pull request #426 from cedricxperi:dtsx-direct-playback-fix

Browse Source 
PiperOrigin-RevId: 537835423
This commit is contained in:
Tofunmi Adigun-Hameed 2023-06-06 17:58:57 +00:00
commit c7a41a7b41
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioOffloadSupportProvider.java
View File

@ -84,11 +84,16 @@ public final class DefaultAudioOffloadSupportProvider
if (encoding == C.ENCODING_INVALID) { if (encoding == C.ENCODING_INVALID) {
return AudioOffloadSupport.DEFAULT_UNSUPPORTED; return AudioOffloadSupport.DEFAULT_UNSUPPORTED;
} }
// AudioFormat.ENCODING_DTS_UHD_P2 is defined from API 34 onwards. We return offload
// unsupported to prevent crash in Util.getAudioFormat() below when it tries to create
// an AudioFormat with ENCODING_DTS_UHD_P2.
if ((Util.SDK_INT < 34) && (encoding == C.ENCODING_DTS_UHD_P2)) {
return AudioOffloadSupport.DEFAULT_UNSUPPORTED;
}
int channelConfig = Util.getAudioTrackChannelConfig(format.channelCount); int channelConfig = Util.getAudioTrackChannelConfig(format.channelCount);
if (channelConfig == AudioFormat.CHANNEL_INVALID) { if (channelConfig == AudioFormat.CHANNEL_INVALID) {
return AudioOffloadSupport.DEFAULT_UNSUPPORTED; return AudioOffloadSupport.DEFAULT_UNSUPPORTED;
} }
AudioFormat audioFormat = Util.getAudioFormat(format.sampleRate, channelConfig, encoding); AudioFormat audioFormat = Util.getAudioFormat(format.sampleRate, channelConfig, encoding);
if (Util.SDK_INT >= 31) { if (Util.SDK_INT >= 31) {
return Api31.getOffloadedPlaybackSupport( return Api31.getOffloadedPlaybackSupport(