From 05ef643e28e4b0a9d5acede9775803397d0786c4 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 6 Apr 2016 03:32:27 -0700
Subject: [PATCH] Copy from V1: Extractor.release() method releases all kept
 resources.

This method is needed by FlacExtractor to release native resources.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=119143922
---
 .../com/google/android/exoplayer/extractor/Extractor.java    | 4 ++++
 .../google/android/exoplayer/extractor/flv/FlvExtractor.java | 5 +++++
 .../android/exoplayer/extractor/mkv/MatroskaExtractor.java   | 5 +++++
 .../google/android/exoplayer/extractor/mp3/Mp3Extractor.java | 5 +++++
 .../exoplayer/extractor/mp4/FragmentedMp4Extractor.java      | 5 +++++
 .../google/android/exoplayer/extractor/mp4/Mp4Extractor.java | 5 +++++
 .../android/exoplayer/extractor/ogg/OggVorbisExtractor.java  | 5 +++++
 .../google/android/exoplayer/extractor/ts/AdtsExtractor.java | 5 +++++
 .../google/android/exoplayer/extractor/ts/PsExtractor.java   | 5 +++++
 .../google/android/exoplayer/extractor/ts/TsExtractor.java   | 5 +++++
 .../google/android/exoplayer/extractor/wav/WavExtractor.java | 5 +++++
 .../com/google/android/exoplayer/hls/WebvttExtractor.java    | 5 +++++
 12 files changed, 59 insertions(+)

diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java
index 46b70232f6..e068389be8 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java
@@ -97,4 +97,8 @@ public interface Extractor {
    */
   void seek();
 
+  /**
+   * Releases all kept resources.
+   */
+  void release();
 }
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java
index f00d0f4c07..2447bcacf6 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java
@@ -119,6 +119,11 @@ public final class FlvExtractor implements Extractor, SeekMap {
     bytesToNextTagHeader = 0;
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException,
       InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java
index 0aa3801186..fb60b6fe30 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java
@@ -272,6 +272,11 @@ public final class MatroskaExtractor implements Extractor {
     resetSample();
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException,
       InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java
index aa34546a36..1ad4a8228c 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java
@@ -110,6 +110,11 @@ public final class Mp3Extractor implements Extractor {
     sampleBytesRemaining = 0;
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java
index 4ef07418d3..3d32ed5575 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java
@@ -169,6 +169,11 @@ public final class FragmentedMp4Extractor implements Extractor {
     enterReadingAtomHeaderState();
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java
index 158e5cc652..1551dfe667 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java
@@ -106,6 +106,11 @@ public final class Mp4Extractor implements Extractor, SeekMap {
     parserState = STATE_AFTER_SEEK;
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggVorbisExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggVorbisExtractor.java
index a35d5f9b65..80d9125757 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggVorbisExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggVorbisExtractor.java
@@ -93,6 +93,11 @@ public final class OggVorbisExtractor implements Extractor, SeekMap {
     scratch.reset();
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java
index cf754b1bc4..d162d7f476 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java
@@ -121,6 +121,11 @@ public final class AdtsExtractor implements Extractor {
     adtsReader.seek();
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java
index 73dfe2b3c9..706e2ee9f1 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java
@@ -120,6 +120,11 @@ public final class PsExtractor implements Extractor {
     }
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
index c917952f2a..b3e8b3d52e 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java
@@ -123,6 +123,11 @@ public final class TsExtractor implements Extractor {
     }
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java
index 70865a9058..0de76585a7 100644
--- a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java
@@ -58,6 +58,11 @@ public final class WavExtractor implements Extractor, SeekMap {
     pendingBytes = 0;
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
diff --git a/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java b/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java
index 4ca9423cab..58ab520dd6 100644
--- a/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java
+++ b/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java
@@ -86,6 +86,11 @@ import java.util.regex.Pattern;
     throw new IllegalStateException();
   }
 
+  @Override
+  public void release() {
+    // Do nothing
+  }
+
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {