From 4e86c55361447c027a9ca0cff59075bceeb1e67a Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 11 Jul 2016 04:28:48 -0700 Subject: [PATCH] Introduce source package for sources ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=127073630 --- .../android/exoplayer2/demo/EventLogger.java | 8 +++--- .../exoplayer2/demo/PlayerActivity.java | 14 +++++----- .../exoplayer2/demo/TrackSelectionHelper.java | 4 +-- .../exoplayer2/ext/flac/FlacPlaybackTest.java | 2 +- .../exoplayer2/ext/opus/OpusPlaybackTest.java | 2 +- .../exoplayer2/ext/vp9/VpxPlaybackTest.java | 2 +- .../dash/DashChunkSourceTest.java | 2 +- ...ediaPresentationDescriptionParserTest.java | 2 +- .../{ => source}/dash/mpd/RangedUriTest.java | 2 +- .../dash/mpd/RepresentationTest.java | 4 +-- .../dash/mpd/UrlTemplateTest.java | 2 +- .../playlist/HlsMasterPlaylistParserTest.java | 2 +- .../playlist/HlsMediaPlaylistParserTest.java | 2 +- .../SmoothStreamingManifestParserTest.java | 2 +- .../exoplayer2/DefaultLoadControl.java | 1 + .../DefaultTrackSelectionPolicy.java | 2 ++ .../exoplayer2/DefaultTrackSelector.java | 2 ++ .../exoplayer2/ExoPlaybackException.java | 1 + .../google/android/exoplayer2/ExoPlayer.java | 3 +++ .../android/exoplayer2/ExoPlayerImpl.java | 1 + .../exoplayer2/ExoPlayerImplInternal.java | 3 +++ .../android/exoplayer2/LoadControl.java | 2 ++ .../exoplayer2/MediaCodecRenderer.java | 1 + .../android/exoplayer2/SimpleExoPlayer.java | 1 + .../android/exoplayer2/TrackSelection.java | 1 + .../exoplayer2/TrackSelectionPolicy.java | 3 +++ .../android/exoplayer2/TrackSelector.java | 2 ++ .../exoplayer2/chunk/ChunkTrackStream.java | 2 +- .../AdaptiveMediaSourceEventListener.java | 5 +++- .../ConcatenatingMediaSource.java | 2 +- .../ExtractorMediaSource.java | 16 ++++++++---- .../exoplayer2/{ => source}/MediaPeriod.java | 6 ++++- .../exoplayer2/{ => source}/MediaSource.java | 2 +- .../{ => source}/MergingMediaPeriod.java | 7 ++++- .../{ => source}/MergingMediaSource.java | 4 +-- .../{ => source}/SingleSampleMediaSource.java | 8 +++++- .../exoplayer2/{ => source}/TrackGroup.java | 4 ++- .../{ => source}/TrackGroupArray.java | 2 +- .../{ => source}/dash/DashChunkSource.java | 14 +++++----- .../{ => source}/dash/DashMediaSource.java | 26 +++++++++---------- .../{ => source}/dash/DashSegmentIndex.java | 4 +-- .../dash/DashWrappingSegmentIndex.java | 4 +-- .../{ => source}/dash/mpd/AdaptationSet.java | 2 +- .../dash/mpd/DashSingleSegmentIndex.java | 4 +-- .../mpd/MediaPresentationDescription.java | 2 +- .../MediaPresentationDescriptionParser.java | 10 +++---- .../{ => source}/dash/mpd/Period.java | 2 +- .../{ => source}/dash/mpd/RangedUri.java | 2 +- .../{ => source}/dash/mpd/Representation.java | 8 +++--- .../{ => source}/dash/mpd/SegmentBase.java | 4 +-- .../{ => source}/dash/mpd/UrlTemplate.java | 2 +- .../dash/mpd/UtcTimingElement.java | 2 +- .../{ => source}/hls/Aes128DataSource.java | 2 +- .../{ => source}/hls/HlsChunkSource.java | 8 +++--- .../{ => source}/hls/HlsMediaChunk.java | 2 +- .../{ => source}/hls/HlsMediaSource.java | 24 ++++++++--------- .../hls/HlsTrackStreamWrapper.java | 8 +++--- .../hls/PtsTimestampAdjusterProvider.java | 2 +- .../{ => source}/hls/WebvttExtractor.java | 2 +- .../hls/playlist/HlsMasterPlaylist.java | 2 +- .../hls/playlist/HlsMediaPlaylist.java | 2 +- .../hls/playlist/HlsParserUtil.java | 2 +- .../hls/playlist/HlsPlaylist.java | 2 +- .../hls/playlist/HlsPlaylistParser.java | 4 +-- .../{ => source}/hls/playlist/Variant.java | 2 +- .../SmoothStreamingChunkSource.java | 6 ++--- .../SmoothStreamingManifest.java | 2 +- .../SmoothStreamingManifestParser.java | 6 ++--- .../SmoothStreamingMediaSource.java | 18 ++++++------- .../playbacktests/gts/DashTest.java | 9 ++++--- .../playbacktests/util/ExoHostedTest.java | 3 ++- 71 files changed, 187 insertions(+), 136 deletions(-) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/dash/DashChunkSourceTest.java (99%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/dash/mpd/MediaPresentationDescriptionParserTest.java (97%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/dash/mpd/RangedUriTest.java (97%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/dash/mpd/RepresentationTest.java (92%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/dash/mpd/UrlTemplateTest.java (97%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsMasterPlaylistParserTest.java (98%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsMediaPlaylistParserTest.java (99%) rename library/src/androidTest/java/com/google/android/exoplayer2/{ => source}/smoothstreaming/SmoothStreamingManifestParserTest.java (96%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/AdaptiveMediaSourceEventListener.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/ConcatenatingMediaSource.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{extractor => source}/ExtractorMediaSource.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/MediaPeriod.java (95%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/MediaSource.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/MergingMediaPeriod.java (96%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/MergingMediaSource.java (94%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/SingleSampleMediaSource.java (96%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/TrackGroup.java (95%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/TrackGroupArray.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/DashChunkSource.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/DashMediaSource.java (95%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/DashSegmentIndex.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/DashWrappingSegmentIndex.java (94%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/AdaptationSet.java (95%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/DashSingleSegmentIndex.java (92%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/MediaPresentationDescription.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/MediaPresentationDescriptionParser.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/Period.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/RangedUri.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/Representation.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/SegmentBase.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/UrlTemplate.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/dash/mpd/UtcTimingElement.java (94%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/Aes128DataSource.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/HlsChunkSource.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/HlsMediaChunk.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/HlsMediaSource.java (95%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/HlsTrackStreamWrapper.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/PtsTimestampAdjusterProvider.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/WebvttExtractor.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsMasterPlaylist.java (96%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsMediaPlaylist.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsParserUtil.java (97%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsPlaylist.java (94%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/HlsPlaylistParser.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/hls/playlist/Variant.java (94%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/smoothstreaming/SmoothStreamingChunkSource.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/smoothstreaming/SmoothStreamingManifest.java (99%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/smoothstreaming/SmoothStreamingManifestParser.java (98%) rename library/src/main/java/com/google/android/exoplayer2/{ => source}/smoothstreaming/SmoothStreamingMediaSource.java (95%) diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java index c99b1c9bea..6eab6cbd4b 100644 --- a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java +++ b/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java @@ -15,7 +15,6 @@ */ package com.google.android.exoplayer2.demo; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener; import com.google.android.exoplayer2.CodecCounters; import com.google.android.exoplayer2.DefaultTrackSelector; import com.google.android.exoplayer2.DefaultTrackSelector.TrackInfo; @@ -24,11 +23,12 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.drm.StreamingDrmSessionManager; -import com.google.android.exoplayer2.extractor.ExtractorMediaSource; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; +import com.google.android.exoplayer2.source.ExtractorMediaSource; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.upstream.DataSpec; import android.os.SystemClock; diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java index 3db0894b8e..e55f394c4c 100644 --- a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java +++ b/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.demo; import com.google.android.exoplayer2.AspectRatioFrameLayout; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ConcatenatingMediaSource; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.DefaultTrackSelectionPolicy; import com.google.android.exoplayer2.DefaultTrackSelector; @@ -27,23 +26,24 @@ import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.MediaCodecRenderer.DecoderInitializationException; import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.TrackGroupArray; -import com.google.android.exoplayer2.dash.DashMediaSource; import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.drm.StreamingDrmSessionManager; import com.google.android.exoplayer2.drm.UnsupportedDrmException; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; -import com.google.android.exoplayer2.extractor.ExtractorMediaSource; -import com.google.android.exoplayer2.hls.HlsMediaSource; import com.google.android.exoplayer2.metadata.id3.ApicFrame; import com.google.android.exoplayer2.metadata.id3.GeobFrame; import com.google.android.exoplayer2.metadata.id3.Id3Frame; import com.google.android.exoplayer2.metadata.id3.PrivFrame; import com.google.android.exoplayer2.metadata.id3.TextInformationFrame; import com.google.android.exoplayer2.metadata.id3.TxxxFrame; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingMediaSource; +import com.google.android.exoplayer2.source.ConcatenatingMediaSource; +import com.google.android.exoplayer2.source.ExtractorMediaSource; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.source.dash.DashMediaSource; +import com.google.android.exoplayer2.source.hls.HlsMediaSource; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingMediaSource; import com.google.android.exoplayer2.text.CaptionStyleCompat; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.SubtitleLayout; diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java b/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java index 00778708c7..82482cd22d 100644 --- a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java +++ b/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java @@ -19,9 +19,9 @@ import com.google.android.exoplayer2.DefaultTrackSelector; import com.google.android.exoplayer2.DefaultTrackSelector.TrackInfo; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.util.MimeTypes; import android.annotation.SuppressLint; diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index 6c0a51677f..1ad3a79b38 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java @@ -21,8 +21,8 @@ import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.extractor.ExtractorMediaSource; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; +import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import android.content.Context; diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java index 380de6be64..2bea7c44ab 100644 --- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java +++ b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java @@ -21,8 +21,8 @@ import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.extractor.ExtractorMediaSource; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; +import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import android.content.Context; diff --git a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java index 176c43d95f..b3555d8c7c 100644 --- a/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java +++ b/extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java @@ -21,8 +21,8 @@ import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.extractor.ExtractorMediaSource; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; +import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import android.content.Context; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/dash/DashChunkSourceTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashChunkSourceTest.java similarity index 99% rename from library/src/androidTest/java/com/google/android/exoplayer2/dash/DashChunkSourceTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashChunkSourceTest.java index c8cee2fc10..710b439ae0 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/dash/DashChunkSourceTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashChunkSourceTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash; +package com.google.android.exoplayer2.source.dash; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.testutil.TestUtil; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParserTest.java similarity index 97% rename from library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParserTest.java index b273c6136d..366e3ec0bf 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import android.net.Uri; import android.test.InstrumentationTestCase; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RangedUriTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RangedUriTest.java similarity index 97% rename from library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RangedUriTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RangedUriTest.java index 74c4f6a2cc..28821d92e5 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RangedUriTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RangedUriTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import junit.framework.TestCase; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RepresentationTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RepresentationTest.java similarity index 92% rename from library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RepresentationTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RepresentationTest.java index 6ccf02d99e..18e8cb7f9f 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RepresentationTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/RepresentationTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SingleSegmentBase; import com.google.android.exoplayer2.util.MimeTypes; import junit.framework.TestCase; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/UrlTemplateTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplateTest.java similarity index 97% rename from library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/UrlTemplateTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplateTest.java index 396a79c3b2..d3275a92a2 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/UrlTemplateTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplateTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import junit.framework.TestCase; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java similarity index 98% rename from library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylistParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java index 12d81b50ae..2e24d27adf 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylistParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.C; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java similarity index 99% rename from library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylistParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java index eb2c392b8d..e6c4eb2987 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylistParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.C; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParserTest.java similarity index 96% rename from library/src/androidTest/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParserTest.java rename to library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParserTest.java index 3e28345482..0e117b759a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParserTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.smoothstreaming; +package com.google.android.exoplayer2.source.smoothstreaming; import android.net.Uri; import android.test.InstrumentationTestCase; diff --git a/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java index d95b88325f..8d2a9fa060 100644 --- a/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.DefaultAllocator; import com.google.android.exoplayer2.util.Util; diff --git a/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java index ba2efcd121..43518c1ef7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.util.Util; import java.util.Locale; diff --git a/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java index 8fcc90de5e..553519eb58 100644 --- a/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java index 2ccc5b7175..6ccb8f991a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.util.Assertions; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java index 71f2cbd7da..c2d43d8947 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.MediaPeriod; +import com.google.android.exoplayer2.source.MediaSource; + /** * An extensible media player exposing traditional high-level media player functionality, such as * the ability to buffer media, play, pause and seek. diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 0621748054..61ab4db115 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -16,6 +16,7 @@ package com.google.android.exoplayer2; import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo; +import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.util.Assertions; import android.annotation.SuppressLint; diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java index 581171ff71..9ba3e7cedc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -17,6 +17,9 @@ package com.google.android.exoplayer2; import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage; import com.google.android.exoplayer2.TrackSelector.InvalidationListener; +import com.google.android.exoplayer2.source.MediaPeriod; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.util.PriorityHandlerThread; import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.Util; diff --git a/library/src/main/java/com/google/android/exoplayer2/LoadControl.java b/library/src/main/java/com/google/android/exoplayer2/LoadControl.java index 67654be3e1..ab661d1a11 100644 --- a/library/src/main/java/com/google/android/exoplayer2/LoadControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/LoadControl.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.upstream.Allocator; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/MediaCodecRenderer.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecRenderer.java index d5016f991a..d3c2446bbd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MediaCodecRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecRenderer.java @@ -18,6 +18,7 @@ package com.google.android.exoplayer2; import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; import com.google.android.exoplayer2.drm.DrmSession; import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.TraceUtil; diff --git a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index ce5fc1cd06..c05d58dc46 100644 --- a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -20,6 +20,7 @@ import com.google.android.exoplayer2.drm.DrmSessionManager; import com.google.android.exoplayer2.metadata.MetadataRenderer; import com.google.android.exoplayer2.metadata.id3.Id3Frame; import com.google.android.exoplayer2.metadata.id3.Id3Parser; +import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.TextRenderer; import com.google.android.exoplayer2.upstream.BandwidthMeter; diff --git a/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java index f7ea588eda..42b4b972fd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.util.Assertions; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java index e5dca62d7b..57f73475db 100644 --- a/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; + /** * Defines a policy for selecting the track rendered by each {@link Renderer}. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java index 54d4e52dbe..c02b77054e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2; +import com.google.android.exoplayer2.source.TrackGroupArray; + import android.util.Pair; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java index 706cb66424..4622b6ac75 100644 --- a/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java @@ -15,7 +15,6 @@ */ package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DecoderInputBuffer; import com.google.android.exoplayer2.Format; @@ -23,6 +22,7 @@ import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.SequenceableLoader; import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.util.Assertions; diff --git a/library/src/main/java/com/google/android/exoplayer2/AdaptiveMediaSourceEventListener.java b/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/AdaptiveMediaSourceEventListener.java rename to library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java index b2fd96fb71..32363bedd4 100644 --- a/library/src/main/java/com/google/android/exoplayer2/AdaptiveMediaSourceEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java @@ -13,8 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.chunk.FormatEvaluator; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Assertions; diff --git a/library/src/main/java/com/google/android/exoplayer2/ConcatenatingMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/ConcatenatingMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java index 263f735c24..80da78c82e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ConcatenatingMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; /** * Concatenates multiple {@link MediaSource}s. diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java index febbc9a26e..0ab6250b67 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java @@ -13,21 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.extractor; +package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DecoderInputBuffer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; -import com.google.android.exoplayer2.MediaPeriod; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.SequenceableLoader; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.extractor.DefaultExtractorInput; +import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.ExtractorOutput; +import com.google.android.exoplayer2.extractor.ExtractorsFactory; +import com.google.android.exoplayer2.extractor.PositionHolder; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/library/src/main/java/com/google/android/exoplayer2/MediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/MediaPeriod.java rename to library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java index 30af213312..41aa5829fb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java @@ -13,8 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.upstream.Allocator; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/MediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/MediaSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/MediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/MediaSource.java index 3a7c590ff1..b88fd3c997 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MediaSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; /** * A source of media consisting of one or more {@link MediaPeriod}s. diff --git a/library/src/main/java/com/google/android/exoplayer2/MergingMediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer2/MergingMediaPeriod.java rename to library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java index 45c92a537a..dc5c5f18cb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MergingMediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java @@ -13,8 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.CompositeSequenceableLoader; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.upstream.Allocator; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer2/MergingMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer2/MergingMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java index fceefccb74..dcd04e54be 100644 --- a/library/src/main/java/com/google/android/exoplayer2/MergingMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.util.Assertions; @@ -34,7 +34,7 @@ public final class MergingMediaSource implements MediaSource { public MergingMediaSource(MediaSource... mediaSources) { this.mediaSources = mediaSources; periodCount = mediaSources[0].getPeriodCount(); - Assertions.checkState(periodCount != MediaSource.UNKNOWN_PERIOD_COUNT, + Assertions.checkState(periodCount != UNKNOWN_PERIOD_COUNT, "Child sources must have known period counts"); for (int i = 1; i < mediaSources.length; i++) { Assertions.checkState(mediaSources[i].getPeriodCount() == periodCount, diff --git a/library/src/main/java/com/google/android/exoplayer2/SingleSampleMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer2/SingleSampleMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java index 75bb57a178..e3729242ab 100644 --- a/library/src/main/java/com/google/android/exoplayer2/SingleSampleMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java @@ -13,8 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSourceFactory; diff --git a/library/src/main/java/com/google/android/exoplayer2/TrackGroup.java b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/TrackGroup.java rename to library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java index 7ac2c580ad..3ed3846c22 100644 --- a/library/src/main/java/com/google/android/exoplayer2/TrackGroup.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java @@ -13,8 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.util.Assertions; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java rename to library/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java index 14037e5c3f..b15909ab09 100644 --- a/library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2; +package com.google.android.exoplayer2.source; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java index 566d7003fb..900769bf2d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash; +package com.google.android.exoplayer2.source.dash; import com.google.android.exoplayer2.BehindLiveWindowException; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format.DecreasingBandwidthComparator; -import com.google.android.exoplayer2.TrackGroup; import com.google.android.exoplayer2.chunk.Chunk; import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper; import com.google.android.exoplayer2.chunk.ChunkHolder; @@ -30,15 +29,16 @@ import com.google.android.exoplayer2.chunk.FormatEvaluator.Evaluation; import com.google.android.exoplayer2.chunk.InitializationChunk; import com.google.android.exoplayer2.chunk.MediaChunk; import com.google.android.exoplayer2.chunk.SingleSampleMediaChunk; -import com.google.android.exoplayer2.dash.mpd.AdaptationSet; -import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescription; -import com.google.android.exoplayer2.dash.mpd.Period; -import com.google.android.exoplayer2.dash.mpd.RangedUri; -import com.google.android.exoplayer2.dash.mpd.Representation; import com.google.android.exoplayer2.extractor.ChunkIndex; import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.dash.mpd.AdaptationSet; +import com.google.android.exoplayer2.source.dash.mpd.MediaPresentationDescription; +import com.google.android.exoplayer2.source.dash.mpd.Period; +import com.google.android.exoplayer2.source.dash.mpd.RangedUri; +import com.google.android.exoplayer2.source.dash.mpd.Representation; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/DashMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/dash/DashMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index 0eb9a81026..33c78de7c7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/DashMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -13,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash; +package com.google.android.exoplayer2.source.dash; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.CompositeSequenceableLoader; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.MediaPeriod; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.SequenceableLoader; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.chunk.ChunkTrackStream; import com.google.android.exoplayer2.chunk.FormatEvaluator; import com.google.android.exoplayer2.chunk.FormatEvaluator.AdaptiveEvaluator; -import com.google.android.exoplayer2.dash.mpd.AdaptationSet; -import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescription; -import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescriptionParser; -import com.google.android.exoplayer2.dash.mpd.Period; -import com.google.android.exoplayer2.dash.mpd.Representation; -import com.google.android.exoplayer2.dash.mpd.UtcTimingElement; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.source.MediaPeriod; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.source.dash.mpd.AdaptationSet; +import com.google.android.exoplayer2.source.dash.mpd.MediaPresentationDescription; +import com.google.android.exoplayer2.source.dash.mpd.MediaPresentationDescriptionParser; +import com.google.android.exoplayer2.source.dash.mpd.Period; +import com.google.android.exoplayer2.source.dash.mpd.Representation; +import com.google.android.exoplayer2.source.dash.mpd.UtcTimingElement; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java index 9d784cf908..c32b46f680 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash; +package com.google.android.exoplayer2.source.dash; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.dash.mpd.RangedUri; +import com.google.android.exoplayer2.source.dash.mpd.RangedUri; /** * Indexes the segments within a media stream. diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java index 65b9c0a78e..a0b0d424a9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash; +package com.google.android.exoplayer2.source.dash; -import com.google.android.exoplayer2.dash.mpd.RangedUri; import com.google.android.exoplayer2.extractor.ChunkIndex; +import com.google.android.exoplayer2.source.dash.mpd.RangedUri; /** * An implementation of {@link DashSegmentIndex} that wraps a {@link ChunkIndex} parsed from a diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/AdaptationSet.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/AdaptationSet.java index 3fe157964f..144c614d7c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/AdaptationSet.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/DashSingleSegmentIndex.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/DashSingleSegmentIndex.java index e41289f93a..9075930db6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/DashSingleSegmentIndex.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; -import com.google.android.exoplayer2.dash.DashSegmentIndex; +import com.google.android.exoplayer2.source.dash.DashSegmentIndex; /** * A {@link DashSegmentIndex} that defines a single segment. diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescription.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescription.java index 6937d4d3d9..93342306ea 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescription.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParser.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParser.java index d2c689fa3e..ff870d5aa6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/MediaPresentationDescriptionParser.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentList; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentTemplate; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentTimelineElement; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase; import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SegmentList; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SegmentTemplate; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SegmentTimelineElement; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SingleSegmentBase; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Period.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Period.java index 58fd533b08..bca0d34f13 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Period.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/RangedUri.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/RangedUri.java index f034dc6eed..fbf6cfd3d8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/RangedUri.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.UriUtil; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Representation.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Representation.java index e08dd56cee..88e44dcd8c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/Representation.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.dash.DashSegmentIndex; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.MultiSegmentBase; -import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase; +import com.google.android.exoplayer2.source.dash.DashSegmentIndex; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.MultiSegmentBase; +import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SingleSegmentBase; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/SegmentBase.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/SegmentBase.java index e8b38d9469..957600fbbf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/SegmentBase.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.dash.DashSegmentIndex; +import com.google.android.exoplayer2.source.dash.DashSegmentIndex; import com.google.android.exoplayer2.util.Util; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplate.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplate.java index 86c119e16f..4caf73a5b8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UrlTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; import java.util.Locale; diff --git a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UtcTimingElement.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java rename to library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UtcTimingElement.java index 071afa29af..3aecaf957f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/mpd/UtcTimingElement.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.dash.mpd; +package com.google.android.exoplayer2.source.dash.mpd; /** * Represents a UTCTiming element. diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java index 7b1e1e5f5a..2bdc110b81 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java index fe05308ac0..276db2a8a8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; import com.google.android.exoplayer2.BehindLiveWindowException; import com.google.android.exoplayer2.C; @@ -28,9 +28,9 @@ import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor; import com.google.android.exoplayer2.extractor.ts.AdtsExtractor; import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; import com.google.android.exoplayer2.extractor.ts.TsExtractor; -import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist; -import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser; -import com.google.android.exoplayer2.hls.playlist.Variant; +import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist; +import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser; +import com.google.android.exoplayer2.source.hls.playlist.Variant; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java index 859f66d5d9..6dc3d7ab91 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.chunk.MediaChunk; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 1ec15a33ec..f5d5c3f39c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.CompositeSequenceableLoader; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.MediaPeriod; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.ParserException; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.chunk.FormatEvaluator; -import com.google.android.exoplayer2.hls.playlist.HlsMasterPlaylist; -import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist; -import com.google.android.exoplayer2.hls.playlist.HlsPlaylist; -import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser; -import com.google.android.exoplayer2.hls.playlist.Variant; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.source.MediaPeriod; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist; +import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist; +import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist; +import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser; +import com.google.android.exoplayer2.source.hls.playlist.Variant; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackStreamWrapper.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackStreamWrapper.java index 61a1b6461b..dd9f0b1879 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsTrackStreamWrapper.java @@ -13,16 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DecoderInputBuffer; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.SequenceableLoader; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.chunk.Chunk; @@ -31,6 +28,9 @@ import com.google.android.exoplayer2.extractor.DefaultTrackOutput; import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; import com.google.android.exoplayer2.extractor.ExtractorOutput; import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.util.Assertions; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java index 3a44fa09c4..61e4d9f54c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java index f03901d58a..742c4273ee 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls; +package com.google.android.exoplayer2.source.hls; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java index 5da570acca..2e2ae1cc1b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.Format; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java index 673f99d0a5..a0e0504c36 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.C; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsParserUtil.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsParserUtil.java index 2a312dd504..9b74865895 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsParserUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.ParserException; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java index 3c9a7a532a..98f4b20723 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; /** * Represents an HLS playlist. diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java index 43fb3786bf..16a8faf7d0 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; -import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist.Segment; +import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.MimeTypes; diff --git a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/Variant.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java rename to library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/Variant.java index d51dd78eb6..6d7a2aeb43 100644 --- a/library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/Variant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.hls.playlist; +package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.Format; diff --git a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingChunkSource.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingChunkSource.java index c34e95efd3..211d345fdc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingChunkSource.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.smoothstreaming; +package com.google.android.exoplayer2.source.smoothstreaming; import com.google.android.exoplayer2.BehindLiveWindowException; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format.DecreasingBandwidthComparator; -import com.google.android.exoplayer2.TrackGroup; import com.google.android.exoplayer2.chunk.Chunk; import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper; import com.google.android.exoplayer2.chunk.ChunkHolder; @@ -31,7 +30,8 @@ import com.google.android.exoplayer2.chunk.MediaChunk; import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; import com.google.android.exoplayer2.extractor.mp4.Track; import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingManifest.StreamElement; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.Loader; diff --git a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifest.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java rename to library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifest.java index 15734bb6be..c5b2f3dd9f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.smoothstreaming; +package com.google.android.exoplayer2.source.smoothstreaming; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; diff --git a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParser.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java rename to library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParser.java index b3aad30648..6288de80bd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingManifestParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.smoothstreaming; +package com.google.android.exoplayer2.source.smoothstreaming; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; @@ -21,8 +21,8 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.ProtectionElement; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingManifest.ProtectionElement; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingManifest.StreamElement; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.CodecSpecificDataUtil; diff --git a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingMediaSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingMediaSource.java rename to library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingMediaSource.java index aa5f5a2e7d..30c349017e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SmoothStreamingMediaSource.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.smoothstreaming; +package com.google.android.exoplayer2.source.smoothstreaming; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener; -import com.google.android.exoplayer2.AdaptiveMediaSourceEventListener.EventDispatcher; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.CompositeSequenceableLoader; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.MediaPeriod; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.SequenceableLoader; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackStream; import com.google.android.exoplayer2.chunk.ChunkTrackStream; import com.google.android.exoplayer2.chunk.FormatEvaluator; import com.google.android.exoplayer2.chunk.FormatEvaluator.AdaptiveEvaluator; import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.ProtectionElement; -import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; +import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.source.MediaPeriod; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingManifest.ProtectionElement; +import com.google.android.exoplayer2.source.smoothstreaming.SmoothStreamingManifest.StreamElement; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSource; diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java index 8c3876e985..bb81158b5a 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/gts/DashTest.java @@ -22,18 +22,18 @@ import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.MediaCodecUtil; import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.TrackGroup; -import com.google.android.exoplayer2.TrackGroupArray; import com.google.android.exoplayer2.TrackSelection; import com.google.android.exoplayer2.TrackSelectionPolicy; -import com.google.android.exoplayer2.dash.DashMediaSource; import com.google.android.exoplayer2.playbacktests.util.ActionSchedule; import com.google.android.exoplayer2.playbacktests.util.CodecCountersUtil; import com.google.android.exoplayer2.playbacktests.util.ExoHostedTest; import com.google.android.exoplayer2.playbacktests.util.HostActivity; import com.google.android.exoplayer2.playbacktests.util.MetricsLogger; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.source.dash.DashMediaSource; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSourceFactory; import com.google.android.exoplayer2.util.Assertions; @@ -44,6 +44,7 @@ import android.annotation.TargetApi; import android.net.Uri; import android.test.ActivityInstrumentationTestCase2; import android.util.Log; + import junit.framework.AssertionFailedError; import java.util.ArrayList; diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java index 18503ea53a..54289eb77f 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ExoHostedTest.java @@ -22,11 +22,11 @@ import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.MediaSource; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.TrackSelectionPolicy; import com.google.android.exoplayer2.audio.AudioTrack; import com.google.android.exoplayer2.playbacktests.util.HostActivity.HostedTest; +import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; @@ -36,6 +36,7 @@ import android.os.Handler; import android.os.SystemClock; import android.util.Log; import android.view.Surface; + import junit.framework.Assert; /**