From 3c3777d4debacbd714acde2e264470aee6eba445 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 23 Jul 2019 14:20:00 +0100
Subject: [PATCH] Fix release of DecryptableSampleQueueReaders in
 ProgressiveMediaPeriod

PiperOrigin-RevId: 259523450
---
 .../exoplayer2/source/ProgressiveMediaPeriod.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
index 83145d04b0..d25fff5104 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ProgressiveMediaPeriod.java
@@ -200,9 +200,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
       for (SampleQueue sampleQueue : sampleQueues) {
         sampleQueue.discardToEnd();
       }
-    }
-    for (DecryptableSampleQueueReader reader : sampleQueueReaders) {
-      reader.release();
+      for (DecryptableSampleQueueReader reader : sampleQueueReaders) {
+        reader.release();
+      }
     }
     loader.release(/* callback= */ this);
     handler.removeCallbacksAndMessages(null);
@@ -216,6 +216,9 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     for (SampleQueue sampleQueue : sampleQueues) {
       sampleQueue.reset();
     }
+    for (DecryptableSampleQueueReader reader : sampleQueueReaders) {
+      reader.release();
+    }
     extractorHolder.release();
   }