From a7cb6a02e497f543ef12c1d02f22ca9c50606841 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 7 Jan 2021 14:09:40 +0000
Subject: [PATCH] Rollback of
 https://github.com/google/ExoPlayer/commit/1347d572ef9ce79aacd667cfffa7d7468c8408a4

*** Original commit ***

Restore old SampleQueue exoMediaCryptoType behavior

***

PiperOrigin-RevId: 350545215
---
 .../google/android/exoplayer2/source/SampleQueue.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index 6425f42174..120f6dc2e8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -31,7 +31,6 @@ import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession;
 import com.google.android.exoplayer2.drm.DrmSessionEventListener;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
-import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DataReader;
@@ -870,11 +869,11 @@ public class SampleQueue implements TrackOutput {
     downstreamFormat = newFormat;
     @Nullable DrmInitData newDrmInitData = newFormat.drmInitData;
 
-    @Nullable
-    Class<? extends ExoMediaCrypto> exoMediaCryptoType =
-        (drmSessionManager != null ? drmSessionManager : DrmSessionManager.DUMMY)
-            .getExoMediaCryptoType(newFormat);
-    outputFormatHolder.format = newFormat.copyWithExoMediaCryptoType(exoMediaCryptoType);
+    outputFormatHolder.format =
+        drmSessionManager != null
+            ? newFormat.copyWithExoMediaCryptoType(
+                drmSessionManager.getExoMediaCryptoType(newFormat))
+            : newFormat;
     outputFormatHolder.drmSession = currentDrmSession;
     if (drmSessionManager == null) {
       // This sample queue is not expected to handle DRM. Nothing to do.