From f76b80c3cbd3ec1dec6faecc2d0e3a6016d1e795 Mon Sep 17 00:00:00 2001
From: ishani <ishani@google.com>
Date: Wed, 31 Oct 2018 21:47:57 -0700
Subject: [PATCH] Automated g4 rollback of changelist 219130576.

*** Original change description ***

Re-enable codec re-use

Issue: #2826

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=219585084
---
 .../mediacodec/MediaCodecRenderer.java           | 16 +++-------------
 .../video/MediaCodecVideoRenderer.java           |  4 ----
 2 files changed, 3 insertions(+), 17 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 efe8959908..74c575c1ef 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
@@ -536,16 +536,6 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   protected void onDisabled() {
     inputFormat = null;
-    if (drmSession != null || pendingDrmSession != null) {
-      // TODO: Do something better with this case.
-      onReset();
-    } else {
-      flushOrReleaseCodec();
-    }
-  }
-
-  @Override
-  protected void onReset() {
     try {
       releaseCodec();
     } finally {
@@ -569,14 +559,14 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   protected void releaseCodec() {
     availableCodecInfos = null;
     if (codec != null) {
-      codecInfo = null;
-      codecFormat = null;
       resetInputBuffer();
       resetOutputBuffer();
       resetCodecBuffers();
-      waitingForKeys = false;
       codecHotswapDeadlineMs = C.TIME_UNSET;
+      waitingForKeys = false;
       decodeOnlyPresentationTimestamps.clear();
+      codecInfo = null;
+      codecFormat = null;
       decoderCounters.decoderReleaseCount++;
       try {
         codec.stop();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 0b17cd6338..a896bc2322 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -283,12 +283,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   @Override
   protected void onEnabled(boolean joining) throws ExoPlaybackException {
     super.onEnabled(joining);
-    int oldTunnelingAudioSessionId = tunnelingAudioSessionId;
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
-    if (tunnelingAudioSessionId != oldTunnelingAudioSessionId) {
-      releaseCodec();
-    }
     eventDispatcher.enabled(decoderCounters);
     frameReleaseTimeHelper.enable();
   }