From cc58b515b773be93ba4572d5ac221cae856ee1ae Mon Sep 17 00:00:00 2001 From: eguven Date: Fri, 25 Aug 2017 09:35:10 -0700 Subject: [PATCH] Make Downloaders open source ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=166486294 --- .../google/android/exoplayer2/offline/DownloadException.java | 2 -- .../java/com/google/android/exoplayer2/offline/Downloader.java | 2 -- .../exoplayer2/offline/DownloaderConstructorHelper.java | 2 -- .../android/exoplayer2/offline/ProgressiveDownloader.java | 2 -- .../google/android/exoplayer2/offline/SegmentDownloader.java | 2 -- .../exoplayer2/source/hls/offline/HlsDownloadTestData.java | 3 --- .../exoplayer2/source/hls/offline/HlsDownloaderTest.java | 2 -- .../android/exoplayer2/source/hls/offline/HlsDownloader.java | 2 -- .../source/smoothstreaming/offline/SsDownloader.java | 2 -- .../android/exoplayer2/playbacktests/gts/DashDownloadTest.java | 2 -- 10 files changed, 21 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java index 239195892c..730ce2d3e8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.offline; -import com.google.android.exoplayer2.util.ClosedSource; import java.io.IOException; /** Thrown on an error during downloading. */ -@ClosedSource(reason = "Not ready yet") public final class DownloadException extends IOException { /** @param message The message for the exception. */ diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java index a130bb4052..b8d9432c63 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java @@ -17,13 +17,11 @@ package com.google.android.exoplayer2.offline; import android.support.annotation.Nullable; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.util.ClosedSource; import java.io.IOException; /** * An interface for stream downloaders. */ -@ClosedSource(reason = "Not ready yet") public interface Downloader { /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java index 5f9a4d973a..9ef9366397 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java @@ -27,11 +27,9 @@ import com.google.android.exoplayer2.upstream.cache.Cache; import com.google.android.exoplayer2.upstream.cache.CacheDataSink; import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.PriorityTaskManager; /** A helper class that holds necessary parameters for {@link Downloader} construction. */ -@ClosedSource(reason = "Not ready yet") public final class DownloaderConstructorHelper { private final Cache cache; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java index c6bb3bc432..e5aa429424 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java @@ -23,14 +23,12 @@ import com.google.android.exoplayer2.upstream.cache.Cache; import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.CacheUtil; import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.PriorityTaskManager; import java.io.IOException; /** * A downloader for progressive media streams. */ -@ClosedSource(reason = "Not ready yet") public final class ProgressiveDownloader implements Downloader { private static final int BUFFER_SIZE_BYTES = 128 * 1024; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java index 93e7c57470..d81df90b81 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java @@ -25,7 +25,6 @@ import com.google.android.exoplayer2.upstream.cache.Cache; import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.CacheUtil; import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.PriorityTaskManager; import java.io.IOException; import java.util.Collections; @@ -40,7 +39,6 @@ import java.util.List; * @param The type of the manifest object. * @param The type of the representation key object. */ -@ClosedSource(reason = "Not ready yet") public abstract class SegmentDownloader implements Downloader { /** Smallest unit of content to be downloaded. */ diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java index 133bf19dba..ec70fb1200 100644 --- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java +++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java @@ -15,12 +15,9 @@ */ package com.google.android.exoplayer2.source.hls.offline; -import com.google.android.exoplayer2.util.ClosedSource; - /** * Data for HLS downloading tests. */ -@ClosedSource(reason = "Not ready yet") /* package */ interface HlsDownloadTestData { String MASTER_PLAYLIST_URI = "test.m3u8"; diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java index 28afe450eb..ebf73ebfd7 100644 --- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java +++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java @@ -39,12 +39,10 @@ import com.google.android.exoplayer2.testutil.FakeDataSet; import com.google.android.exoplayer2.testutil.FakeDataSource.Factory; import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor; import com.google.android.exoplayer2.upstream.cache.SimpleCache; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.Util; import java.io.File; /** Unit tests for {@link HlsDownloader}. */ -@ClosedSource(reason = "Not ready yet") public class HlsDownloaderTest extends InstrumentationTestCase { private SimpleCache cache; diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java index 488b85e78a..ac8ec5ee5e 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.ParsingLoadable; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.UriUtil; import java.io.IOException; import java.util.ArrayList; @@ -41,7 +40,6 @@ import java.util.List; * #selectRepresentations(Object[])}. As key, string form of the rendition's url is used. The urls * can be absolute or relative to the master playlist url. */ -@ClosedSource(reason = "Not ready yet") public final class HlsDownloader extends SegmentDownloader { /** diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java index fe9c21d855..21cacdc6f3 100644 --- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java +++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java @@ -26,7 +26,6 @@ import com.google.android.exoplayer2.source.smoothstreaming.manifest.TrackKey; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.ParsingLoadable; -import com.google.android.exoplayer2.util.ClosedSource; import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -60,7 +59,6 @@ import java.util.List; * new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);} * */ -@ClosedSource(reason = "Not ready yet") public final class SsDownloader extends SegmentDownloader { /** diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java index 706dd72166..66884f3e5b 100644 --- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java +++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java @@ -32,7 +32,6 @@ import com.google.android.exoplayer2.upstream.cache.CacheDataSource; import com.google.android.exoplayer2.upstream.cache.CacheDataSourceFactory; import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor; import com.google.android.exoplayer2.upstream.cache.SimpleCache; -import com.google.android.exoplayer2.util.ClosedSource; import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.IOException; @@ -43,7 +42,6 @@ import java.util.List; /** * Tests downloaded DASH playbacks. */ -@ClosedSource(reason = "Not ready yet") public final class DashDownloadTest extends ActivityInstrumentationTestCase2 { private static final String TAG = "DashDownloadTest";