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

Merge pull request #10322 from DolbyLaboratories:dev-v2-multichannel

Browse Source 
PiperOrigin-RevId: 454641746
This commit is contained in:
Marc Baechinger 2022-06-14 17:10:08 +00:00
commit 970eb4444c
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RELEASENOTES.md
View File

@ -69,6 +69,10 @@
for audio passthrough when the format audio channel count is unset, for audio passthrough when the format audio channel count is unset,
which occurs with HLS chunkless preparation which occurs with HLS chunkless preparation
([10204](https://github.com/google/ExoPlayer/issues/10204)). ([10204](https://github.com/google/ExoPlayer/issues/10204)).
* Configure `AudioTrack` with channel mask
`AudioFormat.CHANNEL_OUT_7POINT1POINT4` if the decoder outputs 12
channel PCM audio
([#10322](#https://github.com/google/ExoPlayer/pull/10322).
* DRM * DRM
* Ensure the DRM session is always correctly updated when seeking * Ensure the DRM session is always correctly updated when seeking
immediately after a format change immediately after a format change

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

@ -1745,6 +1745,10 @@ public final class Util {
// 8 ch output is not supported before Android L. // 8 ch output is not supported before Android L.
return AudioFormat.CHANNEL_INVALID; return AudioFormat.CHANNEL_INVALID;
} }
case 12:
return Util.SDK_INT >= 32
? AudioFormat.CHANNEL_OUT_7POINT1POINT4
: AudioFormat.CHANNEL_INVALID;
default: default:
return AudioFormat.CHANNEL_INVALID; return AudioFormat.CHANNEL_INVALID;
} }