From e13bbbcdd7547e297954cf7a1e695603fd1680c9 Mon Sep 17 00:00:00 2001 From: Marc Baechinger Date: Thu, 20 Oct 2022 02:08:44 +0000 Subject: [PATCH] Merge pull request #10578 from thucngv:release-v2 PiperOrigin-RevId: 481115402 (cherry picked from commit 9861f88f3db419553b893efd98a5e1a0c8c6287c) --- .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index 2bc8d2fbdf..0f6bbb3120 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -2092,6 +2092,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.