From fdfbfc0b8ea1cc834e61f18042406a9a5dfb8b86 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 17 Dec 2019 12:30:49 +0000
Subject: [PATCH] Cleanup codec state reset methods in MediaCodecRenderer

- Remove duplicated null assignments
- Move mediaCryptoRequiresSecureDecoder reset to be with all the
  other mediaCrypto stuff.

PiperOrigin-RevId: 285955134
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java     | 4 ----
 1 file changed, 4 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
index de975b1536..9f6ff1212c 100644
--- 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
@@ -840,10 +840,8 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     resetCodecStateForFlush();
 
     availableCodecInfos = null;
-    codec = null;
     codecInfo = null;
     codecFormat = null;
-    codecAdapter = null;
     codecOperatingRate = CODEC_OPERATING_RATE_UNSET;
     codecAdaptationWorkaroundMode = ADAPTATION_WORKAROUND_MODE_NEVER;
     codecNeedsReconfigureWorkaround = false;
@@ -856,8 +854,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecReconfigured = false;
     codecReconfigurationState = RECONFIGURATION_STATE_NONE;
     resetCodecBuffers();
-
-    mediaCrypto = null;
     mediaCryptoRequiresSecureDecoder = false;
   }