mirror of
https://github.com/androidx/media.git
synced 2025-04-30 06:46:50 +08:00
Merge pull request #10578 from thucngv:release-v2
PiperOrigin-RevId: 481115402
This commit is contained in:
commit
172cae4775
@ -45,6 +45,8 @@
|
||||
* DRM:
|
||||
* Work around a bug in the Android 13 ClearKey implementation that returns
|
||||
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:
|
||||
* Parse `EventStream.presentationTimeOffset` from manifests
|
||||
([#10460](https://github.com/google/ExoPlayer/issues/10460)).
|
||||
|
@ -2094,6 +2094,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
|
||||
|
||||
// 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) {
|
||||
// MediaCrypto.setMediaDrmSession is only available from API level 23, so re-initialization is
|
||||
// required to switch to newSession on older API levels.
|
||||
|
Loading…
x
Reference in New Issue
Block a user