From c650ab64bca0a7a0636772b4b73d1130ccdb6266 Mon Sep 17 00:00:00 2001 From: olly Date: Thu, 26 May 2016 05:43:04 -0700 Subject: [PATCH] Less silly generics for Loader. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=123310694 --- .../google/android/exoplayer/SingleSampleSource.java | 4 ++-- .../android/exoplayer/chunk/ChunkTrackStream.java | 4 ++-- .../exoplayer/dash/mpd/UtcTimingElementResolver.java | 4 ++-- .../exoplayer/extractor/ExtractorSampleSource.java | 4 ++-- .../android/exoplayer/hls/HlsTrackStreamWrapper.java | 4 ++-- .../com/google/android/exoplayer/upstream/Loader.java | 10 +++++----- .../google/android/exoplayer/util/ManifestFetcher.java | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java b/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java index 10bf1dcb7f..a01cc60783 100644 --- a/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java @@ -65,7 +65,7 @@ public final class SingleSampleSource implements SampleSource, TrackStream, private final Uri uri; private final DataSource dataSource; - private final Loader loader; + private final Loader loader; private final Format format; private final long durationUs; private final TrackGroupArray tracks; @@ -99,7 +99,7 @@ public final class SingleSampleSource implements SampleSource, TrackStream, this.eventHandler = eventHandler; this.eventListener = eventListener; this.eventSourceId = eventSourceId; - loader = new Loader<>("Loader:SingleSampleSource", minLoadableRetryCount); + loader = new Loader("Loader:SingleSampleSource", minLoadableRetryCount); tracks = new TrackGroupArray(new TrackGroup(format)); sampleData = new byte[INITIAL_SAMPLE_SIZE]; } diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java index 18fcebf8b9..a61b47c60b 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java +++ b/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java @@ -39,7 +39,7 @@ import java.util.List; */ public class ChunkTrackStream implements TrackStream, Loader.Callback { - private final Loader loader; + private final Loader loader; private final ChunkSource chunkSource; private final LinkedList mediaChunks; private final List readOnlyMediaChunks; @@ -76,7 +76,7 @@ public class ChunkTrackStream implements TrackStream, Loader.Callback { ChunkTrackStreamEventListener eventListener, int eventSourceId, int minLoadableRetryCount) { this.chunkSource = chunkSource; this.loadControl = loadControl; - loader = new Loader<>("Loader:ChunkTrackStream", minLoadableRetryCount); + loader = new Loader("Loader:ChunkTrackStream", minLoadableRetryCount); eventDispatcher = new EventDispatcher(eventHandler, eventListener, eventSourceId); nextChunkHolder = new ChunkHolder(); mediaChunks = new LinkedList<>(); diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElementResolver.java b/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElementResolver.java index 0d6a21f65d..025384e6c3 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElementResolver.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElementResolver.java @@ -69,7 +69,7 @@ public final class UtcTimingElementResolver implements Loader.Callback> singleUseLoader; + private Loader singleUseLoader; /** * Resolves a {@link UtcTimingElement}. @@ -121,7 +121,7 @@ public final class UtcTimingElementResolver implements Loader.Callback parser) { - singleUseLoader = new Loader<>("Loader:UtcTiming", 0); + singleUseLoader = new Loader("Loader:UtcTiming", 0); singleUseLoader.startLoading( new UriLoadable<>(Uri.parse(timingElement.value), dataSource, parser), this); } diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java index f07abf9efe..3a701690d2 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java @@ -112,7 +112,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu // Lazily initialized default extractor classes in priority order. private static List> defaultExtractorClasses; - private final Loader loader; + private final Loader loader; private final ExtractorHolder extractorHolder; private final Allocator allocator; private final int requestedBufferSize; @@ -233,7 +233,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu // Assume on-demand until we know otherwise. int initialMinRetryCount = minLoadableRetryCount == MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA ? DEFAULT_MIN_LOADABLE_RETRY_COUNT_ON_DEMAND : minLoadableRetryCount; - loader = new Loader<>("Loader:ExtractorSampleSource", initialMinRetryCount); + loader = new Loader("Loader:ExtractorSampleSource", initialMinRetryCount); extractorHolder = new ExtractorHolder(extractors, this); pendingResetPositionUs = C.UNSET_TIME_US; sampleQueues = new DefaultTrackOutput[0]; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java b/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java index 3b9663e691..3cd48c76c3 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java @@ -54,7 +54,7 @@ import java.util.List; private static final int PRIMARY_TYPE_AUDIO = 2; private static final int PRIMARY_TYPE_VIDEO = 3; - private final Loader loader; + private final Loader loader; private final HlsChunkSource chunkSource; private final SparseArray sampleQueues; private final LinkedList mediaChunks; @@ -101,7 +101,7 @@ import java.util.List; this.chunkSource = chunkSource; this.loadControl = loadControl; this.bufferSizeContribution = bufferSizeContribution; - loader = new Loader<>("Loader:HLS", minLoadableRetryCount); + loader = new Loader("Loader:HlsTrackStreamWrapper", minLoadableRetryCount); eventDispatcher = new EventDispatcher(eventHandler, eventListener, eventSourceId); nextChunkHolder = new ChunkHolder(); sampleQueues = new SparseArray<>(); diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java index 98ad96e9db..a1356a5c8e 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java +++ b/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java @@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorService; /** * Manages the background loading of {@link Loadable}s. */ -public final class Loader { +public final class Loader { /** * Thrown when an unexpected exception is encountered during loading. @@ -121,7 +121,7 @@ public final class Loader { private final ExecutorService downloadExecutorService; private int minRetryCount; - private LoadTask currentTask; + private LoadTask currentTask; private IOException fatalError; /** @@ -143,10 +143,10 @@ public final class Loader { * @param callback A callback to invoke when the load ends. * @throws IllegalStateException If the calling thread does not have an associated {@link Looper}. */ - public void startLoading(T loadable, Callback callback) { + public void startLoading(T loadable, Callback callback) { Looper looper = Looper.myLooper(); Assertions.checkState(looper != null); - new LoadTask(looper, loadable, callback).start(0); + new LoadTask<>(looper, loadable, callback).start(0); } /** @@ -204,7 +204,7 @@ public final class Loader { } @SuppressLint("HandlerLeak") - private final class LoadTask extends Handler implements Runnable { + private final class LoadTask extends Handler implements Runnable { private static final String TAG = "LoadTask"; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java b/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java index c413f306cd..af20cb70c8 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java +++ b/library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java @@ -68,7 +68,7 @@ public class ManifestFetcher implements Loader.Callback> { } - private final Loader> loader; + private final Loader loader; private final UriLoadable.Parser parser; private final DataSource dataSource; private final Handler eventHandler; @@ -106,7 +106,7 @@ public class ManifestFetcher implements Loader.Callback> { this.dataSource = dataSource; this.eventHandler = eventHandler; this.eventListener = eventListener; - loader = new Loader<>("Loader:ManifestFetcher", 1); + loader = new Loader("Loader:ManifestFetcher", 1); } /**