Retain decoder instance after the renderer is disabled

Issue: #2826 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=216852679
google · Oct 15, 2018 · ba6a118 · ba6a118
1 parent 842f622
commit ba6a118
Showing 1 changed file with 10 additions and 0 deletions.
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
@@ -558,6 +558,16 @@ public final void setOperatingRate(float operatingRate) throws ExoPlaybackExcept
 
   @Override
   protected void onDisabled() {
+    if (drmSession != null || pendingDrmSession != null) {
+      // TODO: Do something better with this case.
+      onReset();
+    } else {
+      flushOrReleaseCodec();
+    }
+  }
+
+  @Override
+  protected void onReset() {
     format = null;
     availableCodecInfos = null;
     try {