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

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

Browse source 
PiperOrigin-RevId: 454641746
(cherry picked from commit 970eb4444c)
This commit is contained in:
Marc Baechinger 2022-06-14 17:10:08 +00:00
parent b8c8a41342
commit 6377f9130d
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

@ -1723,6 +1723,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;
} }