Skip to content

SDK / exoplayer

Go to a project
Commit 6838b0b2 by aquilescanta Committed by Oliver Woodman
Options

Relax DrmSessionManager-in-Renderer requirement for MediaSource-provided DRM 

PiperOrigin-RevId: 254048233
parent 2f8bd42b
Inline Side-by-side
Showing with 13 additions and 12 deletions
extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java
...@@ -499,13 +499,13 @@ public class LibvpxVideoRenderer extends BaseRenderer { ...@@ -499,13 +499,13 @@ public class LibvpxVideoRenderer extends BaseRenderer {
: oldFormat.drmInitData); : oldFormat.drmInitData);
if (drmInitDataChanged) { if (drmInitDataChanged) {
if (format.drmInitData != null) { if (format.drmInitData != null) {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
if (formatHolder.decryptionResourceIsProvided) { if (formatHolder.decryptionResourceIsProvided) {
setSourceDrmSession((DrmSession<ExoMediaCrypto>) formatHolder.drmSession); setSourceDrmSession((DrmSession<ExoMediaCrypto>) formatHolder.drmSession);
} else { } else {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
DrmSession<ExoMediaCrypto> session = DrmSession<ExoMediaCrypto> session =
drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData); drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
if (sourceDrmSession != null) { if (sourceDrmSession != null) {
......
library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java
...@@ -664,13 +664,14 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements ...@@ -664,13 +664,14 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
: oldFormat.drmInitData); : oldFormat.drmInitData);
if (drmInitDataChanged) { if (drmInitDataChanged) {
if (inputFormat.drmInitData != null) { if (inputFormat.drmInitData != null) {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
if (formatHolder.decryptionResourceIsProvided) { if (formatHolder.decryptionResourceIsProvided) {
setSourceDrmSession((DrmSession<ExoMediaCrypto>) formatHolder.drmSession); setSourceDrmSession((DrmSession<ExoMediaCrypto>) formatHolder.drmSession);
} else { } else {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
DrmSession<ExoMediaCrypto> session = DrmSession<ExoMediaCrypto> session =
drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData); drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
if (sourceDrmSession != null) { if (sourceDrmSession != null) {
......
library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java
...@@ -1200,13 +1200,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer { ...@@ -1200,13 +1200,13 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
!Util.areEqual(newFormat.drmInitData, oldFormat == null ? null : oldFormat.drmInitData); !Util.areEqual(newFormat.drmInitData, oldFormat == null ? null : oldFormat.drmInitData);
if (drmInitDataChanged) { if (drmInitDataChanged) {
if (newFormat.drmInitData != null) { if (newFormat.drmInitData != null) {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
if (formatHolder.decryptionResourceIsProvided) { if (formatHolder.decryptionResourceIsProvided) {
setSourceDrmSession((DrmSession<FrameworkMediaCrypto>) formatHolder.drmSession); setSourceDrmSession((DrmSession<FrameworkMediaCrypto>) formatHolder.drmSession);
} else { } else {
if (drmSessionManager == null) {
throw ExoPlaybackException.createForRenderer(
new IllegalStateException("Media requires a DrmSessionManager"), getIndex());
}
DrmSession<FrameworkMediaCrypto> session = DrmSession<FrameworkMediaCrypto> session =
drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData); drmSessionManager.acquireSession(Looper.myLooper(), newFormat.drmInitData);
if (sourceDrmSession != null) { if (sourceDrmSession != null) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment