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 #10578 from thucngv:release-v2

Browse source 
PiperOrigin-RevId: 481115402
(cherry picked from commit 172cae4775)
This commit is contained in:
Marc Baechinger 2022-10-17 15:58:34 +00:00 committed by microkatz
parent be986537ab
commit 4423f4df7a
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASENOTES.md
View file

@ -45,6 +45,8 @@
* DRM: * DRM:
* Work around a bug in the Android 13 ClearKey implementation that returns * Work around a bug in the Android 13 ClearKey implementation that returns
a non-empty but invalid license URL. a non-empty but invalid license URL.
* Fix `setMediaDrmSession failed: session not opened` error when switching
between DRM schemes in a playlist (e.g. Widevine to ClearKey).
* DASH: * DASH:
* Parse `EventStream.presentationTimeOffset` from manifests * Parse `EventStream.presentationTimeOffset` from manifests
([#10460](https://github.com/google/ExoPlayer/issues/10460)). ([#10460](https://github.com/google/ExoPlayer/issues/10460)).

5
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java
View file

@ -2094,6 +2094,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
// Note: Both oldSession and newSession are non-null, and they are different sessions. // Note: Both oldSession and newSession are non-null, and they are different sessions.
if (!newSession.getSchemeUuid().equals(oldSession.getSchemeUuid())) {
// MediaCrypto.setMediaDrmSession is unable to switch between DRM schemes.
return true;
}
if (Util.SDK_INT < 23) { if (Util.SDK_INT < 23) {
// MediaCrypto.setMediaDrmSession is only available from API level 23, so re-initialization is // MediaCrypto.setMediaDrmSession is only available from API level 23, so re-initialization is
// required to switch to newSession on older API levels. // required to switch to newSession on older API levels.