From a5bc91f09b0f135ba32bf31eea5f0063a377fd81 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Wed, 17 Jun 2020 17:22:17 +0100 Subject: [PATCH] Remove unused previousExtractor from HlsExtractorFactory PiperOrigin-RevId: 316902430 --- .../exoplayer2/source/hls/DefaultHlsExtractorFactory.java | 1 - .../android/exoplayer2/source/hls/HlsExtractorFactory.java | 4 ---- .../google/android/exoplayer2/source/hls/HlsMediaChunk.java | 1 - .../source/hls/DefaultHlsExtractorFactoryTest.java | 5 ----- 4 files changed, 11 deletions(-) diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java index 0fe89d4a4e..0a9ead7c48 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java @@ -89,7 +89,6 @@ public final class DefaultHlsExtractorFactory implements HlsExtractorFactory { @Override public BundledHlsMediaChunkExtractor createExtractor( - @Nullable HlsMediaChunkExtractor previousExtractor, Uri uri, Format format, @Nullable List muxedCaptionFormats, diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java index de2ecd73b4..4fe78514cf 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java @@ -36,9 +36,6 @@ public interface HlsExtractorFactory { /** * Creates an {@link Extractor} for extracting HLS media chunks. * - * @param previousExtractor A previously used {@link Extractor} which can be reused if the current - * chunk is a continuation of the previously extracted chunk, or null otherwise. It is the - * responsibility of implementers to only reuse extractors that are suited for reusage. * @param uri The URI of the media chunk. * @param format A {@link Format} associated with the chunk to extract. * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption @@ -53,7 +50,6 @@ public interface HlsExtractorFactory { * @throws IOException If an I/O error is encountered while sniffing. */ HlsMediaChunkExtractor createExtractor( - @Nullable HlsMediaChunkExtractor previousExtractor, Uri uri, Format format, @Nullable List muxedCaptionFormats, diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java index 4c3b7655a7..3dec4fafd9 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java @@ -427,7 +427,6 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; extractor = extractorFactory.createExtractor( - previousExtractor, dataSpec.uri, trackFormat, muxedCaptionFormats, diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java index b3cd7caac4..b4b2e9edce 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactoryTest.java @@ -69,7 +69,6 @@ public class DefaultHlsExtractorFactoryTest { BundledHlsMediaChunkExtractor result = new DefaultHlsExtractorFactory() .createExtractor( - /* previousExtractor= */ null, tsUri, webVttFormat, /* muxedCaptionFormats= */ null, @@ -93,7 +92,6 @@ public class DefaultHlsExtractorFactoryTest { BundledHlsMediaChunkExtractor result = new DefaultHlsExtractorFactory() .createExtractor( - /* previousExtractor= */ null, tsUri, webVttFormat, /* muxedCaptionFormats= */ null, @@ -116,7 +114,6 @@ public class DefaultHlsExtractorFactoryTest { BundledHlsMediaChunkExtractor result = new DefaultHlsExtractorFactory() .createExtractor( - /* previousExtractor= */ null, tsUri, webVttFormat, /* muxedCaptionFormats= */ null, @@ -140,7 +137,6 @@ public class DefaultHlsExtractorFactoryTest { BundledHlsMediaChunkExtractor result = new DefaultHlsExtractorFactory() .createExtractor( - /* previousExtractor= */ null, tsUri, webVttFormat, /* muxedCaptionFormats= */ null, @@ -158,7 +154,6 @@ public class DefaultHlsExtractorFactoryTest { BundledHlsMediaChunkExtractor result = new DefaultHlsExtractorFactory() .createExtractor( - /* previousExtractor= */ null, tsUri, webVttFormat, /* muxedCaptionFormats= */ null,