Move hls.parser to a new extractor package.

This package will house all extractors, which will be unified
to implement a single Extractor interface.

library/src/main/java/com/google/android/exoplayer/hls/parser/HlsExtractor.java → library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor;
 
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.upstream.DataSource;
@@ -24,7 +24,7 @@ import java.io.IOException;
 /**
  * Facilitates extraction of media samples for HLS playbacks.
  */
-public interface HlsExtractor {
+public interface Extractor {
 
   /**
    * An object from which source data can be read.

library/src/main/java/com/google/android/exoplayer/hls/parser/RollingSampleBuffer.java → library/src/main/java/com/google/android/exoplayer/extractor/RollingSampleBuffer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.SampleHolder;

library/src/main/java/com/google/android/exoplayer/hls/parser/SampleQueue.java → library/src/main/java/com/google/android/exoplayer/extractor/SampleQueue.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor;
 
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.SampleHolder;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.upstream.BufferPool;
 import com.google.android.exoplayer.upstream.DataSource;
 import com.google.android.exoplayer.util.ParsableByteArray;

library/src/main/java/com/google/android/exoplayer/hls/parser/AdtsExtractor.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
+import com.google.android.exoplayer.extractor.Extractor;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
 import java.io.IOException;
@@ -23,7 +24,7 @@ import java.io.IOException;
  * Facilitates the extraction of AAC samples from elementary audio files formatted as AAC with ADTS
  * headers.
  */
-public class AdtsExtractor implements HlsExtractor {
+public class AdtsExtractor implements Extractor {
 
   private static final int MAX_PACKET_SIZE = 200;
 

library/src/main/java/com/google/android/exoplayer/hls/parser/AdtsReader.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.util.CodecSpecificDataUtil;
 import com.google.android.exoplayer.util.MimeTypes;
 import com.google.android.exoplayer.util.ParsableBitArray;

library/src/main/java/com/google/android/exoplayer/hls/parser/DataSourceExtractorInput.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/DataSourceExtractorInput.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
-import com.google.android.exoplayer.hls.parser.HlsExtractor.ExtractorInput;
+import com.google.android.exoplayer.extractor.Extractor.ExtractorInput;
 import com.google.android.exoplayer.upstream.DataSource;
 
 import java.io.IOException;

library/src/main/java/com/google/android/exoplayer/hls/parser/ElementaryStreamReader.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/ElementaryStreamReader.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
 /**

library/src/main/java/com/google/android/exoplayer/hls/parser/H264Reader.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/H264Reader.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.util.Assertions;
 import com.google.android.exoplayer.util.H264Util;
 import com.google.android.exoplayer.util.MimeTypes;

library/src/main/java/com/google/android/exoplayer/hls/parser/Id3Reader.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/Id3Reader.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
 /**

library/src/main/java/com/google/android/exoplayer/hls/parser/SeiReader.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/SeiReader.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.text.eia608.Eia608Parser;
 import com.google.android.exoplayer.util.ParsableByteArray;
 

library/src/main/java/com/google/android/exoplayer/hls/parser/TsExtractor.java → library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java

@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.extractor.ts;
 
 import com.google.android.exoplayer.C;
+import com.google.android.exoplayer.extractor.Extractor;
 import com.google.android.exoplayer.util.ParsableBitArray;
 import com.google.android.exoplayer.util.ParsableByteArray;
 
@@ -27,7 +28,7 @@ import java.io.IOException;
 /**
  * Facilitates the extraction of data from the MPEG-2 TS container format.
  */
-public final class TsExtractor implements HlsExtractor {
+public final class TsExtractor implements Extractor {
 
   private static final String TAG = "TsExtractor";
 

library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java

@@ -17,10 +17,9 @@ package com.google.android.exoplayer.hls;
 
 import com.google.android.exoplayer.C;
 import com.google.android.exoplayer.MediaFormat;
-import com.google.android.exoplayer.hls.parser.AdtsExtractor;
-import com.google.android.exoplayer.hls.parser.HlsExtractor;
-import com.google.android.exoplayer.hls.parser.HlsExtractorWrapper;
-import com.google.android.exoplayer.hls.parser.TsExtractor;
+import com.google.android.exoplayer.extractor.Extractor;
+import com.google.android.exoplayer.extractor.ts.AdtsExtractor;
+import com.google.android.exoplayer.extractor.ts.TsExtractor;
 import com.google.android.exoplayer.upstream.Aes128DataSource;
 import com.google.android.exoplayer.upstream.BandwidthMeter;
 import com.google.android.exoplayer.upstream.BufferPool;
@@ -344,7 +343,7 @@ public class HlsChunkSource {
     // Configure the extractor that will read the chunk.
     HlsExtractorWrapper extractorWrapper;
     if (previousTsChunk == null || segment.discontinuity || switchingVariant || liveDiscontinuity) {
-      HlsExtractor extractor = chunkUri.getLastPathSegment().endsWith(AAC_FILE_EXTENSION)
+      Extractor extractor = chunkUri.getLastPathSegment().endsWith(AAC_FILE_EXTENSION)
           ? new AdtsExtractor(startTimeUs)
           : new TsExtractor(startTimeUs);
       extractorWrapper = new HlsExtractorWrapper(bufferPool, extractor, switchingVariantSpliced);

library/src/main/java/com/google/android/exoplayer/hls/parser/HlsExtractorWrapper.java → library/src/main/java/com/google/android/exoplayer/hls/HlsExtractorWrapper.java

@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.hls.parser;
+package com.google.android.exoplayer.hls;
 
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.SampleHolder;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.ExtractorInput;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.TrackOutput;
+import com.google.android.exoplayer.extractor.Extractor;
+import com.google.android.exoplayer.extractor.SampleQueue;
+import com.google.android.exoplayer.extractor.Extractor.ExtractorInput;
+import com.google.android.exoplayer.extractor.Extractor.TrackOutput;
 import com.google.android.exoplayer.upstream.BufferPool;
 import com.google.android.exoplayer.util.Assertions;
 
@@ -27,12 +29,12 @@ import android.util.SparseArray;
 import java.io.IOException;
 
 /**
- * Wraps a {@link HlsExtractor}, adding functionality to enable reading of the extracted samples.
+ * Wraps a {@link Extractor}, adding functionality to enable reading of the extracted samples.
  */
-public final class HlsExtractorWrapper implements HlsExtractor.TrackOutputBuilder {
+public final class HlsExtractorWrapper implements Extractor.TrackOutputBuilder {
 
   private final BufferPool bufferPool;
-  private final HlsExtractor extractor;
+  private final Extractor extractor;
   private final SparseArray<SampleQueue> sampleQueues;
   private final boolean shouldSpliceIn;
 
@@ -42,7 +44,7 @@ public final class HlsExtractorWrapper implements HlsExtractor.TrackOutputBuilde
   private boolean prepared;
   private boolean spliceConfigured;
 
-  public HlsExtractorWrapper(BufferPool bufferPool, HlsExtractor extractor,
+  public HlsExtractorWrapper(BufferPool bufferPool, Extractor extractor,
       boolean shouldSpliceIn) {
     this.bufferPool = bufferPool;
     this.extractor = extractor;

library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java

@@ -22,7 +22,6 @@ import com.google.android.exoplayer.SampleHolder;
 import com.google.android.exoplayer.SampleSource;
 import com.google.android.exoplayer.TrackInfo;
 import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.hls.parser.HlsExtractorWrapper;
 import com.google.android.exoplayer.upstream.Loader;
 import com.google.android.exoplayer.upstream.Loader.Loadable;
 import com.google.android.exoplayer.util.Assertions;

library/src/main/java/com/google/android/exoplayer/hls/TsChunk.java

@@ -15,9 +15,8 @@
  */
 package com.google.android.exoplayer.hls;
 
-import com.google.android.exoplayer.hls.parser.DataSourceExtractorInput;
-import com.google.android.exoplayer.hls.parser.HlsExtractor.ExtractorInput;
-import com.google.android.exoplayer.hls.parser.HlsExtractorWrapper;
+import com.google.android.exoplayer.extractor.Extractor.ExtractorInput;
+import com.google.android.exoplayer.extractor.ts.DataSourceExtractorInput;
 import com.google.android.exoplayer.upstream.DataSource;
 import com.google.android.exoplayer.upstream.DataSpec;