Skip to content

SDK / exoplayer

Go to a project
Commit 525f151f by bachinger Committed by Oliver Woodman
Options

Check whether drm session manager of sample queue is null 

PiperOrigin-RevId: 348688419
parent ab4c92e9
Inline Side-by-side
Showing with 4 additions and 1 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
...@@ -870,7 +870,10 @@ public class SampleQueue implements TrackOutput { ...@@ -870,7 +870,10 @@ public class SampleQueue implements TrackOutput {
@Nullable DrmInitData newDrmInitData = newFormat.drmInitData; @Nullable DrmInitData newDrmInitData = newFormat.drmInitData;
outputFormatHolder.format = outputFormatHolder.format =
newFormat.copyWithExoMediaCryptoType(drmSessionManager.getExoMediaCryptoType(newFormat)); drmSessionManager != null
? newFormat.copyWithExoMediaCryptoType(
drmSessionManager.getExoMediaCryptoType(newFormat))
: newFormat;
outputFormatHolder.drmSession = currentDrmSession; outputFormatHolder.drmSession = currentDrmSession;
if (drmSessionManager == null) { if (drmSessionManager == null) {
// This sample queue is not expected to handle DRM. Nothing to do. // This sample queue is not expected to handle DRM. Nothing to do.
......
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