Rollback of https://github.com/google/ExoPlayer/commit/1347d572ef9ce79aacd667cfffa7d7468c8408a4

*** Original commit *** Restore old SampleQueue exoMediaCryptoType behavior *** PiperOrigin-RevId: 350545215

Rollback of https://github.com/google/ExoPlayer/commit/1347d572ef9ce79aacd667cfffa7d7468c8408a4
*** Original commit *** Restore old SampleQueue exoMediaCryptoType behavior *** PiperOrigin-RevId: 350545215
a7cb6a02 · olly · Ian Baker · b05fa731 · a7cb6a02
Commit a7cb6a02 authored Jan 07, 2021 by olly Committed by Ian Baker Jan 08, 2021
Showing with 5 additions and 6 deletions
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
--- 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
+    outputFormatHolder.format =
-    Class<? extends ExoMediaCrypto> exoMediaCryptoType =
+        drmSessionManager != null
-        (drmSessionManager != null ? drmSessionManager : DrmSessionManager.DUMMY)
+            ? newFormat.copyWithExoMediaCryptoType(
-            .getExoMediaCryptoType(newFormat);
+                drmSessionManager.getExoMediaCryptoType(newFormat))
-    outputFormatHolder.format = newFormat.copyWithExoMediaCryptoType(exoMediaCryptoType);
+            : newFormat;
    outputFormatHolder.drmSession = currentDrmSession;
    if (drmSessionManager == null) {
      // This sample queue is not expected to handle DRM. Nothing to do.