Introduce source package for sources

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=127073630

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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;

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;

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;

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;
 

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;

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.

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;

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;

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;
 
 /**

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;

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;

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;

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}.
  */

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;
 
 /**

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;

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;

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.

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;

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;

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.

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;

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,

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;

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;

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;
 

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;

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.source.AdaptiveMediaSourceEventListener;
-import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescription;
+import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
-import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescriptionParser;
+import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.dash.mpd.Period;
+import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.dash.mpd.Representation;
+import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.dash.mpd.UtcTimingElement;
+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;

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.

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

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;

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.

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;
 

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;

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;

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;

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.source.dash.DashSegmentIndex;
-import com.google.android.exoplayer2.dash.mpd.SegmentBase.MultiSegmentBase;
+import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.MultiSegmentBase;
-import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase;
+import com.google.android.exoplayer2.source.dash.mpd.SegmentBase.SingleSegmentBase;
 
 import android.net.Uri;
 

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;

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;
 

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.

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;

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.source.hls.playlist.HlsMediaPlaylist;
-import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser;
+import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser;
-import com.google.android.exoplayer2.hls.playlist.Variant;
+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;

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;

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.source.AdaptiveMediaSourceEventListener;
-import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist;
+import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
-import com.google.android.exoplayer2.hls.playlist.HlsPlaylist;
+import com.google.android.exoplayer2.source.MediaPeriod;
-import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser;
+import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.hls.playlist.Variant;
+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;

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;

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;
 

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;

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;
 

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;
 

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;
 

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.

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;
 

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;
 

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;

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;

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.source.smoothstreaming.SmoothStreamingManifest.ProtectionElement;
-import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement;
+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;

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.source.AdaptiveMediaSourceEventListener;
-import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement;
+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;

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;

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;
 
 /**