From 8d122a101d86071e6edb45cd859a93b25b7c3c5e Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 12 Jul 2016 02:09:35 +0100 Subject: [PATCH] Use new import ordering. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=128967776 --- .../android/exoplayer2/demo/EventLogger.java | 6 +-- .../exoplayer2/demo/PlayerActivity.java | 42 +++++++++---------- .../demo/SampleChooserActivity.java | 18 ++++---- .../exoplayer2/demo/TrackSelectionHelper.java | 22 +++++----- .../ext/ffmpeg/FfmpegAudioRenderer.java | 3 +- .../exoplayer2/ext/ffmpeg/FfmpegDecoder.java | 1 - .../ext/flac/FlacExtractorTest.java | 3 +- .../exoplayer2/ext/flac/FlacPlaybackTest.java | 9 ++-- .../exoplayer2/ext/flac/FlacDecoder.java | 1 - .../exoplayer2/ext/flac/FlacExtractor.java | 1 - .../android/exoplayer2/ext/flac/FlacJni.java | 1 - .../ext/flac/LibflacAudioRenderer.java | 3 +- .../DefaultOkHttpDataSourceFactory.java | 3 +- .../ext/okhttp/OkHttpDataSource.java | 19 ++++----- .../exoplayer2/ext/opus/OpusPlaybackTest.java | 9 ++-- .../ext/opus/LibopusAudioRenderer.java | 3 +- .../exoplayer2/ext/opus/OpusDecoder.java | 1 - .../exoplayer2/ext/vp9/VpxPlaybackTest.java | 9 ++-- .../ext/vp9/LibvpxVideoRenderer.java | 11 +++-- .../exoplayer2/ext/vp9/VpxDecoder.java | 1 - .../exoplayer2/ext/vp9/VpxOutputBuffer.java | 1 - .../exoplayer2/ext/vp9/VpxRenderer.java | 2 - .../com/google/android/exoplayer2/CTest.java | 1 - .../google/android/exoplayer2/FormatTest.java | 13 +++--- .../exoplayer2/drm/DrmInitDataTest.java | 6 +-- .../extractor/DefaultExtractorInputTest.java | 7 +--- .../exoplayer2/extractor/ExtractorTest.java | 1 - .../extractor/flv/FlvExtractorTest.java | 3 +- .../extractor/mkv/DefaultEbmlReaderTest.java | 4 +- .../extractor/mkv/MatroskaExtractorTest.java | 3 +- .../extractor/mkv/VarintReaderTest.java | 4 +- .../extractor/mp3/Mp3ExtractorTest.java | 3 +- .../extractor/mp3/XingSeekerTest.java | 3 +- .../mp4/FragmentedMp4ExtractorTest.java | 3 +- .../extractor/mp4/Mp4ExtractorTest.java | 5 +-- .../extractor/ogg/DefaultOggSeekerTest.java | 4 +- .../ogg/DefaultOggSeekerUtilMethodsTest.java | 4 +- .../extractor/ogg/OggExtractorTest.java | 4 +- .../extractor/ogg/OggPacketTest.java | 6 +-- .../extractor/ogg/OggPageHeaderTest.java | 4 +- .../exoplayer2/extractor/ogg/OggTestFile.java | 4 +- .../extractor/ogg/VorbisBitArrayTest.java | 1 - .../extractor/ogg/VorbisReaderTest.java | 4 +- .../extractor/ogg/VorbisUtilTest.java | 1 - .../extractor/ts/AdtsExtractorTest.java | 3 +- .../extractor/ts/AdtsReaderTest.java | 4 +- .../extractor/ts/PsExtractorTest.java | 3 +- .../extractor/ts/TsExtractorTest.java | 4 +- .../extractor/wav/WavExtractorTest.java | 3 +- .../metadata/id3/Id3DecoderTest.java | 7 +--- .../dash/manifest/DashManifestParserTest.java | 4 +- .../dash/manifest/RepresentationTest.java | 1 - .../playlist/HlsMasterPlaylistParserTest.java | 7 +--- .../playlist/HlsMediaPlaylistParserTest.java | 7 +--- .../manifest/SsManifestParserTest.java | 4 +- .../text/subrip/SubripDecoderTest.java | 4 +- .../exoplayer2/text/ttml/TtmlDecoderTest.java | 10 ++--- .../text/ttml/TtmlRenderUtilTest.java | 1 - .../exoplayer2/text/webvtt/CssParserTest.java | 3 +- .../text/webvtt/Mp4WebvttDecoderTest.java | 4 +- .../text/webvtt/WebvttCueParserTest.java | 1 - .../text/webvtt/WebvttDecoderTest.java | 8 ++-- .../text/webvtt/WebvttSubtitleTest.java | 4 +- .../upstream/ByteArrayDataSourceTest.java | 4 +- .../exoplayer2/util/NalUnitUtilTest.java | 3 +- .../util/ParsableByteArrayTest.java | 3 +- .../android/exoplayer2/util/UtilTest.java | 3 +- .../android/exoplayer2/BaseRenderer.java | 1 - .../java/com/google/android/exoplayer2/C.java | 4 +- .../exoplayer2/ExoPlaybackException.java | 1 - .../android/exoplayer2/ExoPlayerFactory.java | 5 +-- .../android/exoplayer2/ExoPlayerImpl.java | 12 +++--- .../exoplayer2/ExoPlayerImplInternal.java | 16 ++++--- .../com/google/android/exoplayer2/Format.java | 8 ++-- .../google/android/exoplayer2/Renderer.java | 1 - .../android/exoplayer2/SimpleExoPlayer.java | 20 ++++----- .../android/exoplayer2/audio/Ac3Util.java | 1 - .../exoplayer2/audio/AudioCapabilities.java | 1 - .../audio/AudioCapabilitiesReceiver.java | 5 +-- .../audio/AudioRendererEventListener.java | 5 +-- .../android/exoplayer2/audio/AudioTrack.java | 10 ++--- .../android/exoplayer2/audio/DtsUtil.java | 1 - .../audio/MediaCodecAudioRenderer.java | 20 ++++----- .../audio/SimpleDecoderAudioRenderer.java | 9 ++-- .../exoplayer2/decoder/CryptoInfo.java | 3 +- .../decoder/DecoderInputBuffer.java | 1 - .../exoplayer2/decoder/SimpleDecoder.java | 1 - .../android/exoplayer2/drm/DrmInitData.java | 6 +-- .../exoplayer2/drm/HttpMediaDrmCallback.java | 12 +++--- .../exoplayer2/drm/MediaDrmCallback.java | 1 - .../drm/StreamingDrmSessionManager.java | 12 +++--- .../extractor/DefaultExtractorInput.java | 1 - .../extractor/DefaultTrackOutput.java | 1 - .../extractor/DummyTrackOutput.java | 1 - .../exoplayer2/extractor/Extractor.java | 1 - .../exoplayer2/extractor/ExtractorInput.java | 1 - .../extractor/GaplessInfoHolder.java | 1 - .../exoplayer2/extractor/TrackOutput.java | 1 - .../extractor/flv/AudioTagPayloadReader.java | 4 +- .../extractor/flv/FlvExtractor.java | 1 - .../extractor/flv/ScriptTagPayloadReader.java | 1 - .../extractor/flv/VideoTagPayloadReader.java | 1 - .../extractor/mkv/DefaultEbmlReader.java | 1 - .../exoplayer2/extractor/mkv/EbmlReader.java | 1 - .../extractor/mkv/EbmlReaderOutput.java | 1 - .../extractor/mkv/MatroskaExtractor.java | 6 +-- .../exoplayer2/extractor/mkv/Sniffer.java | 2 - .../extractor/mkv/VarintReader.java | 1 - .../exoplayer2/extractor/mp3/Id3Util.java | 4 +- .../extractor/mp3/Mp3Extractor.java | 3 +- .../exoplayer2/extractor/mp4/Atom.java | 1 - .../exoplayer2/extractor/mp4/AtomParsers.java | 4 +- .../extractor/mp4/FragmentedMp4Extractor.java | 8 ++-- .../extractor/mp4/Mp4Extractor.java | 1 - .../extractor/mp4/PsshAtomUtil.java | 4 +- .../exoplayer2/extractor/mp4/Sniffer.java | 1 - .../extractor/mp4/TrackFragment.java | 1 - .../extractor/ogg/DefaultOggSeeker.java | 1 - .../exoplayer2/extractor/ogg/FlacReader.java | 1 - .../extractor/ogg/OggExtractor.java | 1 - .../exoplayer2/extractor/ogg/OggPacket.java | 1 - .../extractor/ogg/OggPageHeader.java | 1 - .../exoplayer2/extractor/ogg/OggSeeker.java | 1 - .../exoplayer2/extractor/ogg/OpusReader.java | 1 - .../extractor/ogg/StreamReader.java | 1 - .../extractor/ogg/VorbisReader.java | 1 - .../exoplayer2/extractor/ogg/VorbisUtil.java | 4 +- .../extractor/rawcc/RawCcExtractor.java | 1 - .../extractor/ts/AdtsExtractor.java | 1 - .../exoplayer2/extractor/ts/AdtsReader.java | 6 +-- .../exoplayer2/extractor/ts/H262Reader.java | 4 +- .../exoplayer2/extractor/ts/H264Reader.java | 4 +- .../exoplayer2/extractor/ts/H265Reader.java | 4 +- .../extractor/ts/MpegAudioReader.java | 2 +- .../extractor/ts/NalUnitTargetBuffer.java | 1 - .../exoplayer2/extractor/ts/PsExtractor.java | 4 +- .../exoplayer2/extractor/ts/TsExtractor.java | 8 ++-- .../extractor/wav/WavExtractor.java | 1 - .../extractor/wav/WavHeaderReader.java | 4 +- .../exoplayer2/mediacodec/MediaCodecInfo.java | 7 ++-- .../mediacodec/MediaCodecRenderer.java | 20 ++++----- .../mediacodec/MediaCodecSelector.java | 3 +- .../exoplayer2/mediacodec/MediaCodecUtil.java | 6 +-- .../exoplayer2/metadata/MetadataRenderer.java | 10 ++--- .../exoplayer2/metadata/id3/Id3Decoder.java | 1 - .../AdaptiveMediaSourceEventListener.java | 6 +-- .../source/ConcatenatingMediaSource.java | 1 - .../source/ExtractorMediaSource.java | 6 +-- .../exoplayer2/source/MediaPeriod.java | 1 - .../exoplayer2/source/MergingMediaPeriod.java | 1 - .../exoplayer2/source/MergingMediaSource.java | 1 - .../exoplayer2/source/SampleStream.java | 1 - .../source/SingleSampleMediaSource.java | 6 +-- .../android/exoplayer2/source/TrackGroup.java | 1 - .../source/chunk/ChunkExtractorWrapper.java | 1 - .../source/chunk/ChunkSampleStream.java | 1 - .../chunk/ChunkedTrackBlacklistUtil.java | 3 +- .../source/chunk/ContainerMediaChunk.java | 1 - .../exoplayer2/source/chunk/DataChunk.java | 1 - .../source/chunk/InitializationChunk.java | 1 - .../source/chunk/SingleSampleMediaChunk.java | 1 - .../source/dash/DashMediaPeriod.java | 1 - .../source/dash/DashMediaSource.java | 10 ++--- .../source/dash/DefaultDashChunkSource.java | 4 +- .../source/dash/manifest/DashManifest.java | 1 - .../dash/manifest/DashManifestParser.java | 21 ++++------ .../source/dash/manifest/RangedUri.java | 3 +- .../source/dash/manifest/Representation.java | 3 +- .../source/dash/manifest/SegmentBase.java | 1 - .../source/hls/Aes128DataSource.java | 5 +-- .../exoplayer2/source/hls/HlsChunkSource.java | 8 ++-- .../exoplayer2/source/hls/HlsMediaChunk.java | 1 - .../exoplayer2/source/hls/HlsMediaSource.java | 8 ++-- .../source/hls/HlsSampleStreamWrapper.java | 4 +- .../hls/PtsTimestampAdjusterProvider.java | 3 +- .../source/hls/WebvttExtractor.java | 4 +- .../hls/playlist/HlsMasterPlaylist.java | 1 - .../source/hls/playlist/HlsMediaPlaylist.java | 1 - .../hls/playlist/HlsPlaylistParser.java | 4 +- .../smoothstreaming/DefaultSsChunkSource.java | 4 +- .../source/smoothstreaming/SsMediaPeriod.java | 4 +- .../source/smoothstreaming/SsMediaSource.java | 8 ++-- .../smoothstreaming/manifest/SsManifest.java | 4 +- .../manifest/SsManifestParser.java | 17 ++++---- .../exoplayer2/text/CaptionStyleCompat.java | 3 +- .../text/SimpleSubtitleDecoder.java | 1 - .../exoplayer2/text/SubtitleOutputBuffer.java | 1 - .../android/exoplayer2/text/TextRenderer.java | 10 ++--- .../exoplayer2/text/eia608/Eia608Decoder.java | 6 +-- .../text/eia608/Eia608Subtitle.java | 4 +- .../exoplayer2/text/subrip/SubripDecoder.java | 10 ++--- .../text/subrip/SubripSubtitle.java | 1 - .../exoplayer2/text/ttml/TtmlDecoder.java | 15 +++---- .../exoplayer2/text/ttml/TtmlNode.java | 4 +- .../exoplayer2/text/ttml/TtmlRenderUtil.java | 1 - .../exoplayer2/text/ttml/TtmlStyle.java | 3 +- .../exoplayer2/text/ttml/TtmlSubtitle.java | 1 - .../exoplayer2/text/tx3g/Tx3gSubtitle.java | 1 - .../exoplayer2/text/webvtt/CssParser.java | 4 +- .../text/webvtt/Mp4WebvttDecoder.java | 1 - .../text/webvtt/Mp4WebvttSubtitle.java | 1 - .../text/webvtt/WebvttCssStyle.java | 4 +- .../exoplayer2/text/webvtt/WebvttCue.java | 3 +- .../text/webvtt/WebvttCueParser.java | 6 +-- .../exoplayer2/text/webvtt/WebvttDecoder.java | 4 +- .../text/webvtt/WebvttParserUtil.java | 1 - .../text/webvtt/WebvttSubtitle.java | 4 +- .../AdaptiveVideoTrackSelection.java | 4 +- .../trackselection/BaseTrackSelection.java | 4 +- .../trackselection/DefaultTrackSelector.java | 16 ++++--- .../trackselection/MappingTrackSelector.java | 10 ++--- .../trackselection/RandomTrackSelection.java | 4 +- .../trackselection/TrackSelection.java | 1 - .../trackselection/TrackSelector.java | 3 +- .../exoplayer2/ui/DebugTextViewHelper.java | 3 +- .../MediaControllerPrevNextClickListener.java | 3 +- .../android/exoplayer2/ui/PlayerControl.java | 3 +- .../exoplayer2/ui/SubtitlePainter.java | 7 ++-- .../android/exoplayer2/ui/SubtitleView.java | 10 ++--- .../exoplayer2/upstream/AssetDataSource.java | 4 +- .../upstream/ByteArrayDataSink.java | 1 - .../upstream/ByteArrayDataSource.java | 4 +- .../upstream/ContentDataSource.java | 4 +- .../exoplayer2/upstream/DataSource.java | 4 +- .../upstream/DataSourceInputStream.java | 1 - .../android/exoplayer2/upstream/DataSpec.java | 4 +- .../exoplayer2/upstream/DefaultAllocator.java | 1 - .../upstream/DefaultBandwidthMeter.java | 5 +-- .../upstream/DefaultDataSource.java | 6 +-- .../upstream/DefaultDataSourceFactory.java | 3 +- .../upstream/DefaultHttpDataSource.java | 8 ++-- .../exoplayer2/upstream/FileDataSource.java | 4 +- .../exoplayer2/upstream/HttpDataSource.java | 4 +- .../android/exoplayer2/upstream/Loader.java | 8 ++-- .../upstream/LoaderErrorThrower.java | 1 - .../exoplayer2/upstream/ParsingLoadable.java | 4 +- .../upstream/PriorityDataSource.java | 4 +- .../exoplayer2/upstream/TeeDataSource.java | 4 +- .../exoplayer2/upstream/UdpDataSource.java | 4 +- .../upstream/cache/CacheDataSink.java | 1 - .../upstream/cache/CacheDataSource.java | 6 +-- .../exoplayer2/upstream/cache/CacheSpan.java | 1 - .../upstream/cache/SimpleCache.java | 4 +- .../android/exoplayer2/util/Assertions.java | 3 +- .../util/CodecSpecificDataUtil.java | 1 - .../android/exoplayer2/util/ColorParser.java | 1 - .../android/exoplayer2/util/NalUnitUtil.java | 1 - .../android/exoplayer2/util/TraceUtil.java | 3 +- .../google/android/exoplayer2/util/Util.java | 10 ++--- .../video/MediaCodecVideoRenderer.java | 22 +++++----- .../video/VideoRendererEventListener.java | 9 ++-- .../playbacktests/gts/DashTest.java | 16 ++++--- .../exoplayer2/playbacktests/util/Action.java | 3 +- .../playbacktests/util/ActionSchedule.java | 3 +- .../util/DebugMediaCodecVideoRenderer.java | 7 ++-- .../util/DecoderCountersUtil.java | 1 - .../playbacktests/util/ExoHostedTest.java | 9 ++-- .../playbacktests/util/HostActivity.java | 7 ++-- .../android/exoplayer2/testutil/Dumper.java | 1 - .../exoplayer2/testutil/FakeDataSource.java | 4 +- .../testutil/FakeExtractorInput.java | 6 +-- .../testutil/FakeExtractorOutput.java | 10 ++--- .../exoplayer2/testutil/FakeTrackOutput.java | 6 +-- .../android/exoplayer2/testutil/TestUtil.java | 10 ++--- 264 files changed, 402 insertions(+), 792 deletions(-) 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 8871e718d6..699851b37b 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,6 +15,8 @@ */ package com.google.android.exoplayer2.demo; +import android.os.SystemClock; +import android.util.Log; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; @@ -38,10 +40,6 @@ import com.google.android.exoplayer2.trackselection.MappingTrackSelector; import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.DataSpec; - -import android.os.SystemClock; -import android.util.Log; - import java.io.IOException; import java.text.NumberFormat; import java.util.List; 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 f9dd3ea1cb..936ec09f0d 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 @@ -15,6 +15,26 @@ */ package com.google.android.exoplayer2.demo; +import android.app.Activity; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Bundle; +import android.os.Handler; +import android.text.TextUtils; +import android.view.KeyEvent; +import android.view.MotionEvent; +import android.view.Surface; +import android.view.SurfaceView; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.View.OnKeyListener; +import android.view.View.OnTouchListener; +import android.widget.Button; +import android.widget.LinearLayout; +import android.widget.MediaController; +import android.widget.TextView; +import android.widget.Toast; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.ExoPlaybackException; @@ -54,28 +74,6 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.util.Util; - -import android.app.Activity; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.net.Uri; -import android.os.Bundle; -import android.os.Handler; -import android.text.TextUtils; -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.Surface; -import android.view.SurfaceView; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnKeyListener; -import android.view.View.OnTouchListener; -import android.widget.Button; -import android.widget.LinearLayout; -import android.widget.MediaController; -import android.widget.TextView; -import android.widget.Toast; - import java.net.CookieHandler; import java.net.CookieManager; import java.net.CookiePolicy; diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java index 3fe4359227..11ae06a527 100644 --- a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java +++ b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java @@ -15,15 +15,6 @@ */ package com.google.android.exoplayer2.demo; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ParserException; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSourceInputStream; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.DefaultDataSource; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; - import android.app.Activity; import android.content.Context; import android.content.Intent; @@ -40,7 +31,14 @@ import android.widget.ExpandableListView; import android.widget.ExpandableListView.OnChildClickListener; import android.widget.TextView; import android.widget.Toast; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceInputStream; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.DefaultDataSource; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; 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 e8d856a68e..03acd21b22 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 @@ -15,17 +15,6 @@ */ package com.google.android.exoplayer2.demo; -import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.RendererCapabilities; -import com.google.android.exoplayer2.source.TrackGroup; -import com.google.android.exoplayer2.source.TrackGroupArray; -import com.google.android.exoplayer2.trackselection.FixedTrackSelection; -import com.google.android.exoplayer2.trackselection.MappingTrackSelector; -import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo; -import com.google.android.exoplayer2.trackselection.RandomTrackSelection; -import com.google.android.exoplayer2.trackselection.TrackSelection; -import com.google.android.exoplayer2.util.MimeTypes; - import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; @@ -36,7 +25,16 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.CheckedTextView; - +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.RendererCapabilities; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.trackselection.FixedTrackSelection; +import com.google.android.exoplayer2.trackselection.MappingTrackSelector; +import com.google.android.exoplayer2.trackselection.MappingTrackSelector.TrackInfo; +import com.google.android.exoplayer2.trackselection.RandomTrackSelection; +import com.google.android.exoplayer2.trackselection.TrackSelection; +import com.google.android.exoplayer2.util.MimeTypes; import java.util.Arrays; import java.util.Locale; diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java index 3a19a348e0..fd5568a908 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioRenderer.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.ext.ffmpeg; +import android.os.Handler; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.audio.AudioCapabilities; @@ -23,8 +24,6 @@ import com.google.android.exoplayer2.audio.AudioTrack; import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer; import com.google.android.exoplayer2.util.MimeTypes; -import android.os.Handler; - /** * Decodes and renders audio using FFmpeg. */ diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java index 994b06244f..6ff2894429 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.SimpleDecoder; import com.google.android.exoplayer2.decoder.SimpleOutputBuffer; import com.google.android.exoplayer2.util.MimeTypes; - import java.nio.ByteBuffer; import java.util.List; diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java index 1ee523b2f3..4196f1ea63 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java +++ b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.ext.flac; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link FlacExtractor}. */ 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 aa7df3c14b..aa7a6a2630 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 @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.ext.flac; +import android.content.Context; +import android.net.Uri; +import android.os.Looper; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; @@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; -import android.content.Context; -import android.net.Uri; -import android.os.Looper; -import android.test.InstrumentationTestCase; - /** * Playback tests using {@link LibflacAudioRenderer}. */ diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java index 91f7f6b304..87fef263cb 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.SimpleDecoder; import com.google.android.exoplayer2.decoder.SimpleOutputBuffer; import com.google.android.exoplayer2.util.FlacStreamInfo; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java index 07f7e991af..2cbe7964a7 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.FlacStreamInfo; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java index 85511acfd7..a3e6c1ca53 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.flac; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.FlacStreamInfo; - import java.io.IOException; import java.nio.ByteBuffer; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java index 0bbd9178a3..498a038f50 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java +++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioRenderer.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.ext.flac; +import android.os.Handler; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.audio.AudioCapabilities; import com.google.android.exoplayer2.audio.AudioRendererEventListener; @@ -22,8 +23,6 @@ import com.google.android.exoplayer2.audio.AudioTrack; import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer; import com.google.android.exoplayer2.util.MimeTypes; -import android.os.Handler; - /** * Decodes and renders audio using the native Flac decoder. */ diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java index 6a1d1e5a12..87b1ec4ef6 100644 --- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java +++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java @@ -15,12 +15,11 @@ */ package com.google.android.exoplayer2.ext.okhttp; +import android.content.Context; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSource.Factory; import com.google.android.exoplayer2.upstream.DefaultDataSource; import com.google.android.exoplayer2.upstream.TransferListener; - -import android.content.Context; import okhttp3.CacheControl; import okhttp3.OkHttpClient; diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java index 37b65598d2..0e2bddf820 100644 --- a/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java +++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java @@ -15,23 +15,13 @@ */ package com.google.android.exoplayer2.ext.okhttp; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.HttpDataSource; import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Predicate; - -import android.net.Uri; - -import okhttp3.CacheControl; -import okhttp3.HttpUrl; -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - import java.io.EOFException; import java.io.IOException; import java.io.InputStream; @@ -40,6 +30,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import okhttp3.CacheControl; +import okhttp3.HttpUrl; +import okhttp3.MediaType; +import okhttp3.OkHttpClient; +import okhttp3.Request; +import okhttp3.RequestBody; +import okhttp3.Response; /** * An {@link HttpDataSource} that delegates to Square's {@link OkHttpClient}. 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 950b11f2fa..59dbf3de06 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 @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.ext.opus; +import android.content.Context; +import android.net.Uri; +import android.os.Looper; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; @@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; -import android.content.Context; -import android.net.Uri; -import android.os.Looper; -import android.test.InstrumentationTestCase; - /** * Playback tests using {@link LibopusAudioRenderer}. */ diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java index c51045cca7..dec67d1fa8 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioRenderer.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.ext.opus; +import android.os.Handler; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.audio.AudioCapabilities; import com.google.android.exoplayer2.audio.AudioRendererEventListener; @@ -22,8 +23,6 @@ import com.google.android.exoplayer2.audio.AudioTrack; import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer; import com.google.android.exoplayer2.util.MimeTypes; -import android.os.Handler; - /** * Decodes and renders audio using the native Opus decoder. */ diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java index 51007adcd5..e8f637a34f 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.SimpleDecoder; import com.google.android.exoplayer2.decoder.SimpleOutputBuffer; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.List; 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 f3d6d6289d..5ca5953925 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 @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.ext.vp9; +import android.content.Context; +import android.net.Uri; +import android.os.Looper; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; @@ -25,11 +29,6 @@ import com.google.android.exoplayer2.source.Timeline; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; -import android.content.Context; -import android.net.Uri; -import android.os.Looper; -import android.test.InstrumentationTestCase; - /** * Playback tests using {@link LibvpxVideoRenderer}. */ diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java index dce38ffc9e..a156c5506f 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoRenderer.java @@ -15,6 +15,11 @@ */ package com.google.android.exoplayer2.ext.vp9; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.os.Handler; +import android.os.SystemClock; +import android.view.Surface; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; @@ -28,12 +33,6 @@ import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.os.Handler; -import android.os.SystemClock; -import android.view.Surface; - /** * Decodes and renders video using the native VP9 decoder. */ diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java index 2e30cc6e11..48606b25ea 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.vp9; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.SimpleDecoder; - import java.nio.ByteBuffer; /** diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java index f637424e7b..d07b1443fd 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.ext.vp9; import com.google.android.exoplayer2.decoder.OutputBuffer; - import java.nio.ByteBuffer; /** diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java index 9303b09382..a0eccb41a7 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java @@ -17,12 +17,10 @@ package com.google.android.exoplayer2.ext.vp9; import android.opengl.GLES20; import android.opengl.GLSurfaceView; - import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.concurrent.atomic.AtomicReference; - import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/CTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/CTest.java index c3e9fb659d..ddcdc4ac8a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/CTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/CTest.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2; import android.annotation.SuppressLint; import android.media.MediaCodec; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java index a1a04d8280..ebd6011b88 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java @@ -19,23 +19,20 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM; -import com.google.android.exoplayer2.drm.DrmInitData; -import com.google.android.exoplayer2.testutil.TestUtil; -import com.google.android.exoplayer2.util.MimeTypes; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.media.MediaFormat; import android.os.Parcel; - -import junit.framework.TestCase; - +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import junit.framework.TestCase; /** * Unit test for {@link Format}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java index 9e8b6a03cf..df2e8756a5 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java @@ -19,13 +19,11 @@ import static com.google.android.exoplayer2.C.PLAYREADY_UUID; import static com.google.android.exoplayer2.C.WIDEVINE_UUID; import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4; +import android.os.Parcel; +import android.test.MoreAsserts; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.testutil.TestUtil; - -import android.os.Parcel; -import android.test.MoreAsserts; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java index e22562c960..a42f384956 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java @@ -15,17 +15,14 @@ */ package com.google.android.exoplayer2.extractor; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.FakeDataSource; import com.google.android.exoplayer2.upstream.DataSpec; - -import android.net.Uri; - -import junit.framework.TestCase; - import java.io.EOFException; import java.io.IOException; import java.util.Arrays; +import junit.framework.TestCase; /** * Test for {@link DefaultExtractorInput}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java index dad648826a..250ae8c513 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java index da2a28b45b..321181621e 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.flv; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link FlvExtractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java index 956a2bba6e..acc62f41f9 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java @@ -18,13 +18,11 @@ package com.google.android.exoplayer2.extractor.mkv; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.TestUtil; - -import junit.framework.TestCase; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import junit.framework.TestCase; /** * Tests {@link DefaultEbmlReader}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java index c2fd6444c5..a11ed20625 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.mkv; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Tests for {@link MatroskaExtractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java index d66b4902bd..ec0df17d88 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java @@ -19,11 +19,9 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; - -import junit.framework.TestCase; - import java.io.EOFException; import java.io.IOException; +import junit.framework.TestCase; /** * Tests for {@link VarintReader}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java index 4f17b39618..e268d9f12d 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.mp3; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link Mp3Extractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java index 592d250030..dccc6073e7 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java @@ -15,13 +15,12 @@ */ package com.google.android.exoplayer2.extractor.mp3; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.MpegAudioHeader; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; -import android.test.InstrumentationTestCase; - /** * Tests for {@link XingSeeker}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java index 3310b51160..c47614e4ee 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.mp4; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link FragmentedMp4Extractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java index 0ff6e40bcd..6ad777da70 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.mp4; -import com.google.android.exoplayer2.extractor.Extractor; -import com.google.android.exoplayer2.testutil.TestUtil; - import android.annotation.TargetApi; import android.test.InstrumentationTestCase; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.testutil.TestUtil; /** * Tests for {@link Mp4Extractor}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java index 2d1eaae11a..058ec00883 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java @@ -18,11 +18,9 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.util.ParsableByteArray; - -import junit.framework.TestCase; - import java.io.IOException; import java.util.Random; +import junit.framework.TestCase; /** * Unit test for {@link DefaultOggSeeker}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java index 0410c8737c..052f45b8f4 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java @@ -18,12 +18,10 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.TestUtil; - -import junit.framework.TestCase; - import java.io.EOFException; import java.io.IOException; import java.util.Random; +import junit.framework.TestCase; /** * Unit test for {@link DefaultOggSeeker} utility methods. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java index ce964a38ca..04a6131652 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.extractor.ogg; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil.ExtractorFactory; - -import android.test.InstrumentationTestCase; - import java.io.IOException; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java index a0f22977b9..991d31ff03 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.extractor.ogg; +import android.test.InstrumentationTestCase; +import android.test.MoreAsserts; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.test.InstrumentationTestCase; -import android.test.MoreAsserts; - import java.io.IOException; import java.util.Arrays; import java.util.Random; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java index 86c6509721..9d39eba174 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java @@ -18,10 +18,8 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.testutil.TestUtil; - -import junit.framework.TestCase; - import java.io.IOException; +import junit.framework.TestCase; /** * Unit test for {@link OggPageHeader}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java index a1a0cbf7f8..6dad77ccf0 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java @@ -16,11 +16,9 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.testutil.TestUtil; - -import junit.framework.Assert; - import java.util.ArrayList; import java.util.Random; +import junit.framework.Assert; /** * Generates test data. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java index f7ab3cdd3b..9a65cad6a5 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.testutil.TestUtil; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java index e156cefa9d..c3165b34f6 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java @@ -20,10 +20,8 @@ import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.util.ParsableByteArray; - -import junit.framework.TestCase; - import java.io.IOException; +import junit.framework.TestCase; /** * Unit test for {@link VorbisReader}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java index 0589becae3..560175089c 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.util.ParsableByteArray; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java index 51edcf9fbc..e30a863d07 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link AdtsExtractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java index 1bedb03ed2..7faea926e0 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java @@ -19,10 +19,8 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.testutil.FakeTrackOutput; import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.util.ParsableByteArray; - -import junit.framework.TestCase; - import java.util.Arrays; +import junit.framework.TestCase; /** * Test for {@link AdtsReader}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java index 180afddd4b..ef97bef0ff 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link PsExtractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java index 09d4f9c914..083ade6ac5 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; - -import android.test.InstrumentationTestCase; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Random; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java index bdecba4b3c..a416d644b7 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.extractor.wav; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.testutil.TestUtil; -import android.test.InstrumentationTestCase; - /** * Unit test for {@link WavExtractor}. */ diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java index c0fa6abc54..f9ec1ee92b 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java @@ -15,13 +15,10 @@ */ package com.google.android.exoplayer2.metadata.id3; -import com.google.android.exoplayer2.metadata.MetadataDecoderException; - import android.test.MoreAsserts; - -import junit.framework.TestCase; - +import com.google.android.exoplayer2.metadata.MetadataDecoderException; import java.util.List; +import junit.framework.TestCase; /** * Test for {@link Id3Decoder} diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java index d547f73c8e..66ee298daf 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.source.dash.manifest; -import com.google.android.exoplayer2.testutil.TestUtil; - import android.net.Uri; import android.test.InstrumentationTestCase; - +import com.google.android.exoplayer2.testutil.TestUtil; import java.io.IOException; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java index 564585596c..d010164102 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.dash.manifest; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase; import com.google.android.exoplayer2.util.MimeTypes; - import junit.framework.TestCase; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java index 2e24d27adf..dc06daff3a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java @@ -15,16 +15,13 @@ */ package com.google.android.exoplayer2.source.hls.playlist; -import com.google.android.exoplayer2.C; - import android.net.Uri; - -import junit.framework.TestCase; - +import com.google.android.exoplayer2.C; import java.io.ByteArrayInputStream; import java.io.IOException; import java.nio.charset.Charset; import java.util.List; +import junit.framework.TestCase; /** * Test for {@link HlsMasterPlaylistParserTest} diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java index e6c4eb2987..67c0a8866a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java @@ -15,18 +15,15 @@ */ package com.google.android.exoplayer2.source.hls.playlist; -import com.google.android.exoplayer2.C; - import android.net.Uri; - -import junit.framework.TestCase; - +import com.google.android.exoplayer2.C; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.util.List; import java.util.Locale; +import junit.framework.TestCase; /** * Test for {@link HlsMediaPlaylistParserTest} diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java index 57c440a3a7..8116755a0a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.source.smoothstreaming.manifest; -import com.google.android.exoplayer2.testutil.TestUtil; - import android.net.Uri; import android.test.InstrumentationTestCase; - +import com.google.android.exoplayer2.testutil.TestUtil; import java.io.IOException; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java index dddf9281c3..eca126347c 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java @@ -15,10 +15,8 @@ */ package com.google.android.exoplayer2.text.subrip; -import com.google.android.exoplayer2.testutil.TestUtil; - import android.test.InstrumentationTestCase; - +import com.google.android.exoplayer2.testutil.TestUtil; import java.io.IOException; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java index d085e9e648..d601775009 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java @@ -15,11 +15,6 @@ */ package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer2.testutil.TestUtil; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.SubtitleDecoderException; -import com.google.android.exoplayer2.util.ColorParser; - import android.test.InstrumentationTestCase; import android.text.Layout; import android.text.Spannable; @@ -33,7 +28,10 @@ import android.text.style.StrikethroughSpan; import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.text.style.UnderlineSpan; - +import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SubtitleDecoderException; +import com.google.android.exoplayer2.util.ColorParser; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java index 104909490d..82dc6b4ad5 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text.ttml; import android.graphics.Color; import android.test.InstrumentationTestCase; - import java.util.HashMap; import java.util.Map; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java index ada4a4e7c2..33da3ffbd9 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer2.util.ParsableByteArray; - import android.test.InstrumentationTestCase; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Unit test for {@link CssParser}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java index 8ce350f109..9f52453908 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java @@ -18,10 +18,8 @@ package com.google.android.exoplayer2.text.webvtt; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.text.SubtitleDecoderException; - -import junit.framework.TestCase; - import java.util.List; +import junit.framework.TestCase; /** * Unit test for {@link Mp4WebvttDecoder}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java index ecdf91b513..1ee8976a7e 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java @@ -20,7 +20,6 @@ import android.test.InstrumentationTestCase; import android.text.Spanned; import android.text.style.StyleSpan; import android.text.style.UnderlineSpan; - import java.util.Collections; /** diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java index 1afce6bea8..013e82bd85 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java @@ -15,10 +15,6 @@ */ package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer2.testutil.TestUtil; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.SubtitleDecoderException; - import android.graphics.Typeface; import android.test.InstrumentationTestCase; import android.text.Layout.Alignment; @@ -28,7 +24,9 @@ import android.text.style.ForegroundColorSpan; import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.text.style.UnderlineSpan; - +import com.google.android.exoplayer2.testutil.TestUtil; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SubtitleDecoderException; import java.io.IOException; import java.util.List; diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java index 10636bf381..6506dd2bd6 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java @@ -16,12 +16,10 @@ package com.google.android.exoplayer2.text.webvtt; import com.google.android.exoplayer2.text.Cue; - -import junit.framework.TestCase; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import junit.framework.TestCase; /** * Unit test for {@link WebvttSubtitle}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java index 66fece1443..7d3d7dbcb8 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java @@ -16,10 +16,8 @@ package com.google.android.exoplayer2.upstream; import com.google.android.exoplayer2.C; - -import junit.framework.TestCase; - import java.io.IOException; +import junit.framework.TestCase; /** * Unit tests for {@link ByteArrayDataSource}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java index 794524d8ce..286013e83a 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java @@ -17,10 +17,9 @@ package com.google.android.exoplayer2.util; import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray; -import junit.framework.TestCase; - import java.nio.ByteBuffer; import java.util.Arrays; +import junit.framework.TestCase; /** * Tests for {@link NalUnitUtil}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java index f0c0e03788..a747930152 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.util; -import junit.framework.TestCase; - import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.util.Arrays; +import junit.framework.TestCase; /** * Tests for {@link ParsableByteArray}. diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java b/library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java index 6991c88423..af857c6e6b 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.util; -import junit.framework.TestCase; - import java.text.ParseException; import java.util.ArrayList; import java.util.List; +import junit.framework.TestCase; /** * Unit tests for {@link Util}. diff --git a/library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java index ac9012a09f..fb67b9e7ce 100644 --- a/library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.source.SampleStream; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MediaClock; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/C.java b/library/src/main/java/com/google/android/exoplayer2/C.java index e173122a92..250b60c1d1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/C.java +++ b/library/src/main/java/com/google/android/exoplayer2/C.java @@ -15,12 +15,10 @@ */ package com.google.android.exoplayer2; -import com.google.android.exoplayer2.util.Util; - import android.media.AudioFormat; import android.media.MediaCodec; import android.view.Surface; - +import com.google.android.exoplayer2.util.Util; import java.util.UUID; /** 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 6ccb8f991a..7c25e0f9c4 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java @@ -17,7 +17,6 @@ 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/ExoPlayerFactory.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java index 9cc0b467c0..97ae1a996c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2; -import com.google.android.exoplayer2.drm.DrmSessionManager; -import com.google.android.exoplayer2.trackselection.TrackSelector; - import android.content.Context; import android.os.Looper; +import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.trackselection.TrackSelector; /** * A factory for instantiating {@link ExoPlayer} instances. 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 f62c77abe5..2753580dc8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -15,18 +15,16 @@ */ package com.google.android.exoplayer2; -import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo; -import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.Timeline; -import com.google.android.exoplayer2.trackselection.TrackSelector; -import com.google.android.exoplayer2.util.Assertions; - import android.annotation.SuppressLint; import android.os.Handler; import android.os.Looper; import android.os.Message; import android.util.Log; - +import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo; +import com.google.android.exoplayer2.source.MediaSource; +import com.google.android.exoplayer2.source.Timeline; +import com.google.android.exoplayer2.trackselection.TrackSelector; +import com.google.android.exoplayer2.util.Assertions; import java.util.concurrent.CopyOnWriteArraySet; /** 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 84a2441b8f..c6ae5007f6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -15,6 +15,13 @@ */ package com.google.android.exoplayer2; +import android.os.Handler; +import android.os.HandlerThread; +import android.os.Message; +import android.os.Process; +import android.os.SystemClock; +import android.util.Log; +import android.util.Pair; import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage; import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.source.MediaSource; @@ -29,15 +36,6 @@ import com.google.android.exoplayer2.util.PriorityHandlerThread; import com.google.android.exoplayer2.util.StandaloneMediaClock; import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.Util; - -import android.os.Handler; -import android.os.HandlerThread; -import android.os.Message; -import android.os.Process; -import android.os.SystemClock; -import android.util.Log; -import android.util.Pair; - import java.io.IOException; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/exoplayer2/Format.java b/library/src/main/java/com/google/android/exoplayer2/Format.java index dfbdecb7d5..a92a9b236d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/Format.java +++ b/library/src/main/java/com/google/android/exoplayer2/Format.java @@ -15,16 +15,14 @@ */ package com.google.android.exoplayer2; -import com.google.android.exoplayer2.drm.DrmInitData; -import com.google.android.exoplayer2.util.MimeTypes; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.media.MediaFormat; import android.os.Parcel; import android.os.Parcelable; - +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/src/main/java/com/google/android/exoplayer2/Renderer.java index 9beb12d5b6..0b0a96b8c8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/Renderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/Renderer.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2; import com.google.android.exoplayer2.ExoPlayer.ExoPlayerComponent; import com.google.android.exoplayer2.source.SampleStream; import com.google.android.exoplayer2.util.MediaClock; - import java.io.IOException; /** 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 51fb0bedb4..4c497efe36 100644 --- a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -15,6 +15,15 @@ */ package com.google.android.exoplayer2; +import android.annotation.TargetApi; +import android.content.Context; +import android.media.AudioManager; +import android.media.MediaCodec; +import android.media.PlaybackParams; +import android.os.Handler; +import android.util.Log; +import android.view.Surface; +import android.view.SurfaceHolder; import com.google.android.exoplayer2.audio.AudioCapabilities; import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioTrack; @@ -32,17 +41,6 @@ import com.google.android.exoplayer2.text.TextRenderer; import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; import com.google.android.exoplayer2.video.VideoRendererEventListener; - -import android.annotation.TargetApi; -import android.content.Context; -import android.media.AudioManager; -import android.media.MediaCodec; -import android.media.PlaybackParams; -import android.os.Handler; -import android.util.Log; -import android.view.Surface; -import android.view.SurfaceHolder; - import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java index 66928cbbaa..c2ab70608c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java index 903bea7366..499ea488c7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioFormat; import android.media.AudioManager; - import java.util.Arrays; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java index fff301cb85..49ec96e3d6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java @@ -15,14 +15,13 @@ */ package com.google.android.exoplayer2.audio; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; /** * Receives broadcast events indicating changes to the device's audio capabilities, notifying a diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java index 9cd577a35d..28be35afdb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java @@ -15,14 +15,13 @@ */ package com.google.android.exoplayer2.audio; +import android.os.Handler; +import android.os.SystemClock; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Renderer; import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.util.Assertions; -import android.os.Handler; -import android.os.SystemClock; - /** * Listener of audio {@link Renderer} events. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java index 32427917ab..e83846d3b4 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java @@ -15,11 +15,6 @@ */ package com.google.android.exoplayer2.audio; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.MimeTypes; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.media.AudioFormat; import android.media.AudioTimestamp; @@ -27,7 +22,10 @@ import android.media.PlaybackParams; import android.os.ConditionVariable; import android.os.SystemClock; import android.util.Log; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import java.lang.reflect.Method; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java b/library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java index 7a5603585f..9e9b927fab 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.drm.DrmInitData; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableBitArray; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 8249a91ede..88aeab3341 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -15,6 +15,15 @@ */ package com.google.android.exoplayer2.audio; +import android.annotation.TargetApi; +import android.media.AudioManager; +import android.media.MediaCodec; +import android.media.MediaCrypto; +import android.media.MediaFormat; +import android.media.PlaybackParams; +import android.media.audiofx.Virtualizer; +import android.os.Handler; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.Format; @@ -27,17 +36,6 @@ import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryExcep import com.google.android.exoplayer2.util.MediaClock; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; - -import android.annotation.TargetApi; -import android.media.AudioManager; -import android.media.MediaCodec; -import android.media.MediaCrypto; -import android.media.MediaFormat; -import android.media.PlaybackParams; -import android.media.audiofx.Virtualizer; -import android.os.Handler; -import android.os.SystemClock; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java index 86209ae1a4..96a98492ee 100644 --- a/library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.audio; +import android.media.AudioManager; +import android.media.PlaybackParams; +import android.os.Handler; +import android.os.SystemClock; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; @@ -29,11 +33,6 @@ import com.google.android.exoplayer2.util.MediaClock; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.TraceUtil; -import android.media.AudioManager; -import android.media.PlaybackParams; -import android.os.Handler; -import android.os.SystemClock; - /** * Decodes and renders audio using a {@link SimpleDecoder}. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java index a85d2ac7cc..bd0af4a77b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.decoder; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; +import com.google.android.exoplayer2.util.Util; /** * Compatibility wrapper around {@link android.media.MediaCodec.CryptoInfo}. diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java index 3e59bedee6..e63c81dcb4 100644 --- a/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.decoder; import com.google.android.exoplayer2.C; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java index 8c8893bbe0..1d380ef858 100644 --- a/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.decoder; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - import java.util.LinkedList; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java index 9d1e001b0e..709f6d38fa 100644 --- a/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.drm; +import android.os.Parcel; +import android.os.Parcelable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - -import android.os.Parcel; -import android.os.Parcelable; - import java.util.Arrays; import java.util.Comparator; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java index 161bc4282e..0740e7a8bf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java @@ -15,18 +15,16 @@ */ package com.google.android.exoplayer2.drm; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.upstream.DataSourceInputStream; -import com.google.android.exoplayer2.upstream.DataSpec; -import com.google.android.exoplayer2.upstream.HttpDataSource; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.media.MediaDrm.KeyRequest; import android.media.MediaDrm.ProvisionRequest; import android.net.Uri; import android.text.TextUtils; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataSourceInputStream; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.HttpDataSource; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java b/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java index 2a3274d6a1..d90a841177 100644 --- a/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.drm; import android.annotation.TargetApi; import android.media.MediaDrm; - import java.util.UUID; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java index 18bf70a56f..770838ca2e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java @@ -15,12 +15,6 @@ */ package com.google.android.exoplayer2.drm; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.media.DeniedByServerException; @@ -36,7 +30,11 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.text.TextUtils; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.util.HashMap; import java.util.UUID; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java index d78ddb7a12..c0f9bc1cc0 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.util.Assertions; - import java.io.EOFException; import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java index 83385f59ef..08ec103e40 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java @@ -24,7 +24,6 @@ import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.EOFException; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java index 8e13895713..e317dd589c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java index 6e80e1d6dd..66850a086a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java index fcdedb683a..52a016dd92 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java b/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java index 72d2e1abdf..6eb9bc50de 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.Format; - import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java index 98468181c7..0ce807ebb1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java index 2f10c8f9df..b48c4881d9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java @@ -15,15 +15,13 @@ */ package com.google.android.exoplayer2.extractor.flv; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.CodecSpecificDataUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.util.Pair; - import java.util.Collections; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java index 50eb7d7e93..cf0f634732 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java index 54632890f6..b3ee6900c2 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.util.ArrayList; import java.util.Date; import java.util.HashMap; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java index ef6fd78cc3..4c31d233a2 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java index 4054c67414..3e33816895 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.Assertions; - import java.io.EOFException; import java.io.IOException; import java.util.Stack; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java index cabeb51226..dc059d2cc8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.mkv; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java index c4467fd956..6c97e802b9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.mkv; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index bc5c527383..592ad0a66d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.extractor.mkv; +import android.util.Pair; +import android.util.SparseArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -33,10 +35,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Pair; -import android.util.SparseArray; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java index 16a35168ff..feaef174d0 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java @@ -16,10 +16,8 @@ package com.google.android.exoplayer2.extractor.mkv; import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java index 3a9ebcd0a1..4bd3efa70b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.mkv; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.ExtractorInput; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java index 9ca68c4b20..53f18df844 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.extractor.mp3; +import android.util.Pair; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.GaplessInfoHolder; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Pair; - import java.io.IOException; import java.nio.charset.Charset; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java index d08ec7c93f..b2af6a5705 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java @@ -23,13 +23,12 @@ 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.GaplessInfoHolder; +import com.google.android.exoplayer2.extractor.MpegAudioHeader; 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.extractor.MpegAudioHeader; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java index 6801fd4214..7f494aad8f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.mp4; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index e6b1b3484f..f6c19f6d29 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.extractor.mp4; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -27,9 +28,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Pair; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java index b48370a7f0..efd262ca69 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.extractor.mp4; +import android.util.Log; +import android.util.Pair; +import android.util.SparseArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.drm.DrmInitData; @@ -34,11 +37,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Log; -import android.util.Pair; -import android.util.SparseArray; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java index bddad29dc1..0c2b1beed3 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java @@ -31,7 +31,6 @@ import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java index f4446571b3..6d5c372619 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.extractor.mp4; -import com.google.android.exoplayer2.util.ParsableByteArray; - import android.util.Log; import android.util.Pair; - +import com.google.android.exoplayer2.util.ParsableByteArray; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java index 05c75a0b6a..bdb377a662 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java index 9db7aec9e8..40fb6bc279 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.mp4; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java index ed3f493874..ec3f0cc238 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.util.Assertions; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java index f3e2511a81..0353933982 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java @@ -22,7 +22,6 @@ import com.google.android.exoplayer2.util.FlacStreamInfo; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java index a408baa131..2792a9c963 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java index 2ab15bcb39..06bce66e04 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java index 2511ea9c23..9c2fd0a3cd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java index 6bb9efc85d..34dd4f89bd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.ogg; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.SeekMap; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java index ee75a75385..108743c764 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java index 6067b749f4..631cdb94e3 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java @@ -24,7 +24,6 @@ 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.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java index 64f4cfdbdc..ae0a69ef7d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ogg.VorbisUtil.Mode; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java index 238dcc791a..043f99d693 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.extractor.ogg; +import android.util.Log; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.util.Log; - import java.util.Arrays; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java index 8bbeb0b92a..d67198ad7b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java index 2a95aadc2e..a62ca8decd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java @@ -25,7 +25,6 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java index 6e67ea58c3..f6579eeb41 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.Log; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; @@ -22,10 +24,6 @@ import com.google.android.exoplayer2.util.CodecSpecificDataUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.util.Log; -import android.util.Pair; - import java.util.Arrays; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java index d0604c7741..fe5bcbe9a0 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java @@ -15,15 +15,13 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.util.Pair; - import java.util.Arrays; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java index 19c253eb08..8bb72f6e79 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.SparseArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; @@ -23,9 +24,6 @@ import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.NalUnitUtil.SpsData; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableNalUnitBitArray; - -import android.util.SparseArray; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java index b93de54dd2..d6c431edec 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.TrackOutput; @@ -22,9 +23,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.ParsableNalUnitBitArray; - -import android.util.Log; - import java.util.Collections; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java index ab27839b88..381a52b4bc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java @@ -17,8 +17,8 @@ package com.google.android.exoplayer2.extractor.ts; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.extractor.MpegAudioHeader; +import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.ParsableByteArray; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java index 57e6795e44..ece2fdf767 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.extractor.ts; import com.google.android.exoplayer2.util.Assertions; - import java.util.Arrays; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java index 7d80185234..fca43df4f4 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.SparseArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.ExtractorInput; @@ -24,9 +25,6 @@ import com.google.android.exoplayer2.extractor.PositionHolder; import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.util.SparseArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java index cb334af4e7..5a53db1e9c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.extractor.ts; +import android.util.Log; +import android.util.SparseArray; +import android.util.SparseBooleanArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.DummyTrackOutput; import com.google.android.exoplayer2.extractor.Extractor; @@ -27,11 +30,6 @@ import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Log; -import android.util.SparseArray; -import android.util.SparseBooleanArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java index 214c18cfaf..7ec7ae967c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java @@ -26,7 +26,6 @@ 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.util.MimeTypes; - import java.io.IOException; /** {@link Extractor} to extract samples from a WAV byte stream. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java index 398f92cfd5..36fbcf40af 100644 --- a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java @@ -15,15 +15,13 @@ */ package com.google.android.exoplayer2.extractor.wav; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - -import android.util.Log; - import java.io.IOException; /** Reads a {@code WavHeader} from an input stream; supports resuming from input failures. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java index f99b7fba36..75c4338dcf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java @@ -15,10 +15,6 @@ */ package com.google.android.exoplayer2.mediacodec; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.MimeTypes; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.media.MediaCodec; import android.media.MediaCodecInfo.AudioCapabilities; @@ -26,6 +22,9 @@ import android.media.MediaCodecInfo.CodecCapabilities; import android.media.MediaCodecInfo.CodecProfileLevel; import android.media.MediaCodecInfo.VideoCapabilities; import android.util.Pair; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; /** * Contains information about a {@link MediaCodec} decoder. diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java index e0ff11fb4d..4e92a929f9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java @@ -15,6 +15,15 @@ */ package com.google.android.exoplayer2.mediacodec; +import android.annotation.TargetApi; +import android.media.MediaCodec; +import android.media.MediaCodec.CodecException; +import android.media.MediaCodec.CryptoException; +import android.media.MediaCrypto; +import android.media.MediaFormat; +import android.os.Looper; +import android.os.SystemClock; +import android.util.Log; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; @@ -30,17 +39,6 @@ import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.NalUnitUtil; import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.Util; - -import android.annotation.TargetApi; -import android.media.MediaCodec; -import android.media.MediaCodec.CodecException; -import android.media.MediaCodec.CryptoException; -import android.media.MediaCrypto; -import android.media.MediaFormat; -import android.os.Looper; -import android.os.SystemClock; -import android.util.Log; - import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java index 7430147000..250faaa993 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.mediacodec; -import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException; - import android.media.MediaCodec; +import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException; /** * Selector of {@link MediaCodec} instances. diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index 23090abd71..e6262321ee 100644 --- a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -15,9 +15,6 @@ */ package com.google.android.exoplayer2.mediacodec; -import com.google.android.exoplayer2.util.MimeTypes; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.media.MediaCodecInfo.CodecCapabilities; @@ -26,7 +23,8 @@ import android.media.MediaCodecList; import android.text.TextUtils; import android.util.Log; import android.util.Pair; - +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java index 1071078a0b..d1fb783268 100644 --- a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.metadata; +import android.os.Handler; +import android.os.Handler.Callback; +import android.os.Looper; +import android.os.Message; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; @@ -22,12 +26,6 @@ import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.util.Assertions; - -import android.os.Handler; -import android.os.Handler.Callback; -import android.os.Looper; -import android.os.Message; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java index 5858f2bd89..723a29e057 100644 --- a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.metadata.MetadataDecoder; import com.google.android.exoplayer2.metadata.MetadataDecoderException; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java b/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java index b8480b3b8b..3376a1a84d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.source; +import android.os.Handler; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Assertions; - -import android.os.Handler; -import android.os.SystemClock; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java index 3f42b902ea..86531fe29d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java index 81167337b8..01d4e29dc9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.source; +import android.net.Uri; +import android.os.Handler; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -40,10 +42,6 @@ import com.google.android.exoplayer2.upstream.Loader.Loadable; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ConditionVariable; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.os.Handler; - import java.io.EOFException; import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java index 617e2f3be8..f88d74d1dc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.Allocator; - import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java index 77079cbc16..917ce72f87 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.Allocator; - import java.io.IOException; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java index 3adebe2ebc..0a8f02d5d7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.util.Assertions; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java b/library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java index 72cdd13178..39374acb33 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java index a17c488ee6..d9845e3f21 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.source; +import android.net.Uri; +import android.os.Handler; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -26,10 +28,6 @@ import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.upstream.Loader.Loadable; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; -import android.os.Handler; - import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java index 27abf26f9f..29051e55cc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.source; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Assertions; - import java.util.Arrays; // TODO: Add an allowMultipleStreams boolean to indicate where the one stream per group restriction diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java index 93c601ea94..dfeb727f14 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java @@ -24,7 +24,6 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java index b8e6f9fa35..bd171a41c9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java @@ -26,7 +26,6 @@ import com.google.android.exoplayer2.source.SequenceableLoader; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.util.Assertions; - import java.io.IOException; import java.util.Collections; import java.util.LinkedList; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java index 984285a54d..6c085418bd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.source.chunk; +import android.util.Log; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException; -import android.util.Log; - /** * Helper class for blacklisting tracks in a {@link TrackSelection} when 404 (Not Found) and 410 * (Gone) HTTP response codes are encountered. diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java index 971f08d9c8..130dddc5eb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java @@ -25,7 +25,6 @@ import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper.SingleTr import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java index b5779df03d..2a484a2982 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; - import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java index 04c7e8c7c1..494e219e4c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java @@ -27,7 +27,6 @@ import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java index bed252dc1c..587a0a32ae 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java index ef3e7cdb16..f111b5539f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java @@ -32,7 +32,6 @@ import com.google.android.exoplayer2.source.dash.manifest.Representation; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.LoaderErrorThrower; - import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index 020bc4be00..5b2fc2d5fe 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.source.dash; +import android.net.Uri; +import android.os.Handler; +import android.os.SystemClock; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; @@ -29,12 +33,6 @@ import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.os.Handler; -import android.os.SystemClock; -import android.util.Log; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java index 97653f403f..9362e7ba59 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.source.dash; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.ChunkIndex; @@ -42,9 +43,6 @@ import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCode import com.google.android.exoplayer2.upstream.LoaderErrorThrower; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; - -import android.os.SystemClock; - import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java index fefe576d81..a984091400 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.source.dash.manifest; import android.net.Uri; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java index fe7eee614a..ea2e308f93 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java @@ -15,6 +15,11 @@ */ package com.google.android.exoplayer2.source.dash.manifest; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Base64; +import android.util.Log; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -31,18 +36,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.UriUtil; import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.XmlPullParserUtil; - -import android.net.Uri; -import android.text.TextUtils; -import android.util.Base64; -import android.util.Log; -import android.util.Pair; - -import org.xml.sax.helpers.DefaultHandler; -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - import java.io.IOException; import java.io.InputStream; import java.text.ParseException; @@ -51,6 +44,10 @@ import java.util.List; import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.xml.sax.helpers.DefaultHandler; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; /** * A parser of media presentation description files. diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java index 4dc2f21442..106059fddd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.source.dash.manifest; +import android.net.Uri; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.UriUtil; -import android.net.Uri; - /** * Defines a range of data located at a {@link Uri}. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java index eee488112c..705c329572 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java @@ -15,13 +15,12 @@ */ package com.google.android.exoplayer2.source.dash.manifest; +import android.net.Uri; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.dash.DashSegmentIndex; import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.MultiSegmentBase; import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SingleSegmentBase; -import android.net.Uri; - /** * A DASH representation. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java index 2925669dbe..39225f5979 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.source.dash.manifest; import com.google.android.exoplayer2.C; 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/source/hls/Aes128DataSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java index 2bdc110b81..7c8288e47e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java @@ -15,21 +15,18 @@ */ package com.google.android.exoplayer2.source.hls; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSourceInputStream; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; - import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.Key; import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; - import javax.crypto.Cipher; import javax.crypto.CipherInputStream; import javax.crypto.NoSuchPaddingException; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java index 6f54d75f41..604c823799 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.source.hls; +import android.net.Uri; +import android.os.SystemClock; +import android.text.TextUtils; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.Extractor; @@ -38,11 +41,6 @@ import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.UriUtil; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.os.SystemClock; -import android.text.TextUtils; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.math.BigInteger; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java index e0ebfdb44f..9a2b785aa6 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java @@ -23,7 +23,6 @@ import com.google.android.exoplayer2.source.chunk.MediaChunk; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Util; - import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java index 74e649cc9c..53dcba6052 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.source.hls; +import android.net.Uri; +import android.os.Handler; +import android.text.TextUtils; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -40,11 +43,6 @@ import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; - -import android.net.Uri; -import android.os.Handler; -import android.text.TextUtils; - import java.io.IOException; import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java index 0547231d23..f16cf7891e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.source.hls; +import android.util.SparseArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; @@ -35,9 +36,6 @@ import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; - -import android.util.SparseArray; - import java.io.IOException; import java.util.LinkedList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java index 0efdb3646d..3196d79e03 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/PtsTimestampAdjusterProvider.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.source.hls; -import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; - import android.util.SparseArray; +import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; /** * Provides {@link PtsTimestampAdjuster} instances for use during HLS playbacks. diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java index edeb2eb6ce..a8980d2380 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.source.hls; +import android.text.TextUtils; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -29,9 +30,6 @@ import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.text.webvtt.WebvttParserUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.text.TextUtils; - import java.io.IOException; import java.util.Arrays; import java.util.regex.Matcher; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java index 2e2ae1cc1b..3b9fd1c0b9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.Format; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java index a0e0504c36..439f57be9a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.source.hls.playlist; import com.google.android.exoplayer2.C; - import java.util.List; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java index 854488002b..f0c1c8038b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java @@ -15,15 +15,13 @@ */ package com.google.android.exoplayer2.source.hls.playlist; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.MimeTypes; - -import android.net.Uri; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java index 0bd19c6bfc..727e89a820 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.source.smoothstreaming; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; @@ -33,9 +34,6 @@ import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.LoaderErrorThrower; - -import android.net.Uri; - import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java index 6ca7772c05..4a9656ce0d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.source.smoothstreaming; +import android.util.Base64; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox; import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher; @@ -30,9 +31,6 @@ import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest. import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.upstream.Allocator; import com.google.android.exoplayer2.upstream.LoaderErrorThrower; - -import android.util.Base64; - import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java index 072bee8587..19e88a35ae 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.source.smoothstreaming; +import android.net.Uri; +import android.os.Handler; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener; @@ -30,11 +33,6 @@ import com.google.android.exoplayer2.upstream.Loader; import com.google.android.exoplayer2.upstream.ParsingLoadable; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.os.Handler; -import android.os.SystemClock; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java index 869190fc24..f7b9f2e745 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.source.smoothstreaming.manifest; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.UriUtil; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; - import java.util.List; import java.util.UUID; diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java index db99636205..14e74e4908 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.source.smoothstreaming.manifest; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Base64; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; @@ -28,16 +32,6 @@ import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.CodecSpecificDataUtil; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.text.TextUtils; -import android.util.Base64; -import android.util.Pair; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -45,6 +39,9 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.UUID; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; /** * Parses SmoothStreaming client manifests. diff --git a/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java b/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java index c62f910a42..b7b6c701bf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java @@ -15,13 +15,12 @@ */ package com.google.android.exoplayer2.text; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.graphics.Color; import android.graphics.Typeface; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; +import com.google.android.exoplayer2.util.Util; /** * A compatibility wrapper for {@link CaptionStyle}. diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java index cd09a87030..ae3bd309ff 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.text; import com.google.android.exoplayer2.decoder.SimpleDecoder; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java index e72f2a80a3..75b7a01673 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.decoder.OutputBuffer; - import java.util.List; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java index ffa61c5d09..32ead0c99c 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.text; +import android.os.Handler; +import android.os.Handler.Callback; +import android.os.Looper; +import android.os.Message; import com.google.android.exoplayer2.BaseRenderer; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; @@ -22,12 +26,6 @@ import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.FormatHolder; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; - -import android.os.Handler; -import android.os.Handler.Callback; -import android.os.Looper; -import android.os.Message; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Decoder.java b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Decoder.java index 0c9f4a3eb5..b5249cde78 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Decoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Decoder.java @@ -15,16 +15,14 @@ */ package com.google.android.exoplayer2.text.eia608; +import android.text.TextUtils; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.text.SubtitleDecoder; +import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.text.SubtitleInputBuffer; import com.google.android.exoplayer2.text.SubtitleOutputBuffer; -import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.text.TextUtils; - import java.util.LinkedList; import java.util.TreeSet; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java index 5ec7911dae..6b27004174 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.text.eia608; +import android.text.TextUtils; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; - -import android.text.TextUtils; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java index 72acdb90c7..43a93353c3 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java @@ -15,16 +15,14 @@ */ package com.google.android.exoplayer2.text.subrip; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.SimpleSubtitleDecoder; -import com.google.android.exoplayer2.util.LongArray; -import com.google.android.exoplayer2.util.ParsableByteArray; - import android.text.Html; import android.text.Spanned; import android.text.TextUtils; import android.util.Log; - +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SimpleSubtitleDecoder; +import com.google.android.exoplayer2.util.LongArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java index 7f5047685e..3f9e5da4dd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java @@ -19,7 +19,6 @@ import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java index db15148b4d..875e7395e8 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java @@ -15,6 +15,9 @@ */ package com.google.android.exoplayer2.text.ttml; +import android.text.Layout; +import android.util.Log; +import android.util.Pair; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.SimpleSubtitleDecoder; @@ -22,15 +25,6 @@ import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.util.ColorParser; import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.XmlPullParserUtil; - -import android.text.Layout; -import android.util.Log; -import android.util.Pair; - -import org.xmlpull.v1.XmlPullParser; -import org.xmlpull.v1.XmlPullParserException; -import org.xmlpull.v1.XmlPullParserFactory; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.HashMap; @@ -38,6 +32,9 @@ import java.util.LinkedList; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlPullParserFactory; /** * A {@link SimpleSubtitleDecoder} for TTML supporting the DFXP presentation profile. diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java index 428e73574d..72e733fb87 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.text.ttml; +import android.text.SpannableStringBuilder; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.util.Assertions; - -import android.text.SpannableStringBuilder; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java index b45233ecb7..bb89b05603 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java @@ -27,7 +27,6 @@ import android.text.style.StrikethroughSpan; import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.text.style.UnderlineSpan; - import java.util.Map; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java index b0ede005aa..aa87af0e57 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java @@ -15,10 +15,9 @@ */ package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer2.util.Assertions; - import android.graphics.Typeface; import android.text.Layout; +import com.google.android.exoplayer2.util.Assertions; /** * Style object of a TtmlNode diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java index 8b2956cc38..a5d70ea101 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.ttml; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.util.Util; - import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java index d3662de110..af0240f000 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.tx3g; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.util.Assertions; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java index 95070e015e..996df88c31 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.text.webvtt; +import android.text.TextUtils; import com.google.android.exoplayer2.util.ColorParser; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.text.TextUtils; - import java.util.Arrays; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java index 8cb80e9fc8..916e67128a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.text.SimpleSubtitleDecoder; import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java index 47e771ae4c..a3f7e10ee1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.text.webvtt; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.util.Assertions; - import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java index 94c1d1a985..169bc6a8bf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer2.util.Util; - import android.graphics.Typeface; import android.text.Layout; - +import com.google.android.exoplayer2.util.Util; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java index 345f3ef50b..f1ce0e28fc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer2.text.Cue; - import android.text.Layout.Alignment; import android.text.SpannableStringBuilder; import android.util.Log; +import com.google.android.exoplayer2.text.Cue; /** * A representation of a WebVTT cue. diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java index 2dd5bc6d46..28bf3b6087 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java @@ -15,9 +15,6 @@ */ package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.util.ParsableByteArray; - import android.graphics.Typeface; import android.text.Layout.Alignment; import android.text.Spannable; @@ -33,7 +30,8 @@ import android.text.style.StyleSpan; import android.text.style.TypefaceSpan; import android.text.style.UnderlineSpan; import android.util.Log; - +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java index d88f84e455..1579866303 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java @@ -15,12 +15,10 @@ */ package com.google.android.exoplayer2.text.webvtt; +import android.text.TextUtils; import com.google.android.exoplayer2.text.SimpleSubtitleDecoder; import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.text.TextUtils; - import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java index 0a62d94f07..4d0cd17304 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.text.webvtt; import com.google.android.exoplayer2.text.SubtitleDecoderException; import com.google.android.exoplayer2.util.ParsableByteArray; - import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java index 6526269c23..95e42a5494 100644 --- a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.text.webvtt; +import android.text.SpannableStringBuilder; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.Subtitle; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - -import android.text.SpannableStringBuilder; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveVideoTrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveVideoTrackSelection.java index 99db909ffd..09f9133aaf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveVideoTrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveVideoTrackSelection.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.trackselection; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.chunk.MediaChunk; import com.google.android.exoplayer2.upstream.BandwidthMeter; - -import android.os.SystemClock; - import java.util.List; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java index 8e9303a178..60ddb983d9 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.trackselection; +import android.os.SystemClock; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format.DecreasingBandwidthComparator; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.chunk.MediaChunk; import com.google.android.exoplayer2.util.Assertions; - -import android.os.SystemClock; - import java.util.Arrays; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java index d95e64f02e..05708c80bc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java @@ -15,14 +15,6 @@ */ package com.google.android.exoplayer2.trackselection; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.RendererCapabilities; -import com.google.android.exoplayer2.source.TrackGroup; -import com.google.android.exoplayer2.source.TrackGroupArray; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.content.Context; import android.graphics.Point; @@ -31,7 +23,13 @@ import android.text.TextUtils; import android.util.Log; import android.view.Display; import android.view.WindowManager; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlaybackException; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.RendererCapabilities; +import com.google.android.exoplayer2.source.TrackGroup; +import com.google.android.exoplayer2.source.TrackGroupArray; +import com.google.android.exoplayer2.util.Util; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java index ae2c4af3da..dec1fae6bb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java @@ -15,18 +15,16 @@ */ package com.google.android.exoplayer2.trackselection; +import android.os.Handler; +import android.util.Pair; +import android.util.SparseArray; +import android.util.SparseBooleanArray; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.RendererCapabilities; 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; - -import android.os.Handler; -import android.util.Pair; -import android.util.SparseArray; -import android.util.SparseBooleanArray; - import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java index a4ba2cae8c..0c871ceef7 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.trackselection; +import android.os.SystemClock; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.source.TrackGroup; - -import android.os.SystemClock; - import java.util.Random; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java index edf8d7dfee..c5ef1b48db 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java @@ -18,7 +18,6 @@ package com.google.android.exoplayer2.trackselection; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.chunk.MediaChunk; - import java.util.List; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java index fcb152179f..b18184ab3e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java @@ -15,12 +15,11 @@ */ package com.google.android.exoplayer2.trackselection; +import android.util.Pair; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.RendererCapabilities; import com.google.android.exoplayer2.source.TrackGroupArray; -import android.util.Pair; - /** * Selects tracks to be consumed by available renderers. */ diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java b/library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java index f06ccc0b35..3eb4d2a04b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java +++ b/library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.ui; +import android.widget.TextView; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.Format; @@ -22,8 +23,6 @@ import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.source.Timeline; -import android.widget.TextView; - /** * A helper class for periodically updating a {@link TextView} with debug information obtained from * a {@link SimpleExoPlayer}. diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/MediaControllerPrevNextClickListener.java b/library/src/main/java/com/google/android/exoplayer2/ui/MediaControllerPrevNextClickListener.java index 1fbb1fcc20..765f2a9efb 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/MediaControllerPrevNextClickListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/ui/MediaControllerPrevNextClickListener.java @@ -15,10 +15,9 @@ */ package com.google.android.exoplayer2.ui; -import com.google.android.exoplayer2.ExoPlayer; - import android.view.View; import android.view.View.OnClickListener; +import com.google.android.exoplayer2.ExoPlayer; /** * An {@link OnClickListener} that can be passed to diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/PlayerControl.java b/library/src/main/java/com/google/android/exoplayer2/ui/PlayerControl.java index 7ffb707c8e..32cdd32b08 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/PlayerControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/ui/PlayerControl.java @@ -15,12 +15,11 @@ */ package com.google.android.exoplayer2.ui; +import android.widget.MediaController.MediaPlayerControl; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.audio.MediaCodecAudioRenderer; import com.google.android.exoplayer2.util.Util; -import android.widget.MediaController.MediaPlayerControl; - /** * An implementation of {@link MediaPlayerControl} for controlling an {@link ExoPlayer} instance. *

diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java index 4ebfc11237..cb4eec40f1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java +++ b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java @@ -15,10 +15,6 @@ */ package com.google.android.exoplayer2.ui; -import com.google.android.exoplayer2.text.CaptionStyleCompat; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.util.Util; - import android.content.Context; import android.content.res.Resources; import android.content.res.TypedArray; @@ -34,6 +30,9 @@ import android.text.TextPaint; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; +import com.google.android.exoplayer2.text.CaptionStyleCompat; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.util.Util; /** * Paints subtitle {@link Cue}s. diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java index 751f4855c1..0c8d9ef92e 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java +++ b/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java @@ -15,11 +15,6 @@ */ package com.google.android.exoplayer2.ui; -import com.google.android.exoplayer2.text.CaptionStyleCompat; -import com.google.android.exoplayer2.text.Cue; -import com.google.android.exoplayer2.text.TextRenderer; -import com.google.android.exoplayer2.util.Util; - import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; @@ -28,7 +23,10 @@ import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; import android.view.accessibility.CaptioningManager; - +import com.google.android.exoplayer2.text.CaptionStyleCompat; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.TextRenderer; +import com.google.android.exoplayer2.util.Util; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java index 8487b7e6d2..94bcf5de32 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java @@ -15,12 +15,10 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.C; - import android.content.Context; import android.content.res.AssetManager; import android.net.Uri; - +import com.google.android.exoplayer2.C; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java index 69d5ed1cd3..16631dcbe2 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.upstream; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java index 754815be03..ffb32bd25f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java index 44a5ac5a36..3f7437e94a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.C; - import android.content.ContentResolver; import android.content.Context; import android.content.res.AssetFileDescriptor; import android.net.Uri; - +import com.google.android.exoplayer2.C; import java.io.EOFException; import java.io.FileInputStream; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java index 4cc10edf88..083578de1d 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java @@ -15,10 +15,8 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.C; - import android.net.Uri; - +import com.google.android.exoplayer2.C; import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java index 56cd33bba5..ae591d889b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.upstream; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java index 6d711ff2dc..88ca803255 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; - import java.util.Arrays; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java index ace9c61011..7ba61a8079 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java @@ -17,7 +17,6 @@ package com.google.android.exoplayer2.upstream; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - import java.util.Arrays; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java index 86324638b8..c395c73da2 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.SlidingPercentile; - import android.os.Handler; import android.os.SystemClock; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.SlidingPercentile; /** * Estimates bandwidth by listening to data transfers. The bandwidth estimate is calculated using diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java index fd87709d8e..f5802b1160 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java @@ -15,12 +15,10 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; - import android.content.Context; import android.net.Uri; - +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java index 4438860389..e79300a774 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.upstream.DataSource.Factory; - import android.content.Context; +import com.google.android.exoplayer2.upstream.DataSource.Factory; /** * A {@link Factory} that produces {@link DefaultDataSource} instances that delegate to diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 65bc7078e2..9015814652 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -15,15 +15,13 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; +import android.text.TextUtils; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Predicate; import com.google.android.exoplayer2.util.Util; - -import android.net.Uri; -import android.text.TextUtils; -import android.util.Log; - import java.io.EOFException; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java index c66374614d..503882ec5a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java @@ -15,10 +15,8 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.C; - import android.net.Uri; - +import com.google.android.exoplayer2.C; import java.io.EOFException; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java index 423bc0d60c..b96fe515fc 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.upstream; +import android.text.TextUtils; import com.google.android.exoplayer2.util.Predicate; import com.google.android.exoplayer2.util.Util; - -import android.text.TextUtils; - import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java index 3ecb4e17ca..3a49761073 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java @@ -15,17 +15,15 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.TraceUtil; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.os.Handler; import android.os.Looper; import android.os.Message; import android.os.SystemClock; import android.util.Log; - +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.TraceUtil; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java b/library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java index 98c9894f85..e5d62378b3 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.upstream; import com.google.android.exoplayer2.upstream.Loader.Loadable; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java index 616fd6c9b7..9059f3817f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java @@ -15,12 +15,10 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.upstream.Loader.Loadable; - -import android.net.Uri; - import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java index 814341ab8e..a36ccd11b1 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.PriorityTaskManager; - -import android.net.Uri; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java index d04201600c..9731bad2c5 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java @@ -15,11 +15,9 @@ */ package com.google.android.exoplayer2.upstream; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; - import java.io.IOException; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java index b12182aede..4c25bc453a 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java @@ -15,10 +15,8 @@ */ package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer2.C; - import android.net.Uri; - +import com.google.android.exoplayer2.C; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java index 5ea47fb30d..bb04f8604b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java @@ -20,7 +20,6 @@ import com.google.android.exoplayer2.upstream.DataSink; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java index b704617f4e..3c82957ce0 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.upstream.cache; +import android.net.Uri; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSink; import com.google.android.exoplayer2.upstream.DataSource; @@ -22,10 +24,6 @@ import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.upstream.FileDataSource; import com.google.android.exoplayer2.upstream.TeeDataSource; import com.google.android.exoplayer2.upstream.cache.CacheDataSink.CacheDataSinkException; - -import android.net.Uri; -import android.util.Log; - import java.io.IOException; import java.io.InterruptedIOException; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java index dbb00c197b..aba5677bee 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.upstream.cache; import com.google.android.exoplayer2.util.Util; - import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java index fd59a74418..ab36497810 100644 --- a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java @@ -15,10 +15,8 @@ */ package com.google.android.exoplayer2.upstream.cache; -import com.google.android.exoplayer2.util.Assertions; - import android.os.ConditionVariable; - +import com.google.android.exoplayer2.util.Assertions; import java.io.File; import java.util.ArrayList; import java.util.HashMap; diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java b/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java index 73d2e809c0..237e16192f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java @@ -15,10 +15,9 @@ */ package com.google.android.exoplayer2.util; -import com.google.android.exoplayer2.ExoPlayerLibraryInfo; - import android.os.Looper; import android.text.TextUtils; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; /** * Provides methods for asserting the truth of expressions and properties. diff --git a/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java index 8bffd16749..ba753e00be 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.util; import android.util.Pair; - import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java b/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java index 6188dad2f3..a9df80e9fe 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.util; import android.text.TextUtils; - import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; diff --git a/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java index 09894e3efb..7f35cbb0cd 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.util; import android.util.Log; - import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java index 1a4efe9127..c458069907 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java @@ -15,9 +15,8 @@ */ package com.google.android.exoplayer2.util; -import com.google.android.exoplayer2.ExoPlayerLibraryInfo; - import android.annotation.TargetApi; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; /** * Calls through to {@link android.os.Trace} methods on supported API levels. diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/src/main/java/com/google/android/exoplayer2/util/Util.java index 01629d78b1..03bdc25706 100644 --- a/library/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -15,11 +15,6 @@ */ package com.google.android.exoplayer2.util; -import com.google.android.exoplayer2.C; -import com.google.android.exoplayer2.ExoPlayerLibraryInfo; -import com.google.android.exoplayer2.upstream.DataSource; -import com.google.android.exoplayer2.upstream.DataSpec; - import android.Manifest.permission; import android.annotation.TargetApi; import android.app.Activity; @@ -30,7 +25,10 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.net.Uri; import android.os.Build; import android.text.TextUtils; - +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java index 0d4ec4b867..9d81e8b83b 100644 --- a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java @@ -15,6 +15,16 @@ */ package com.google.android.exoplayer2.video; +import android.annotation.SuppressLint; +import android.annotation.TargetApi; +import android.content.Context; +import android.media.MediaCodec; +import android.media.MediaCrypto; +import android.media.MediaFormat; +import android.os.Handler; +import android.os.SystemClock; +import android.util.Log; +import android.view.Surface; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.Format; @@ -29,18 +39,6 @@ import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.video.VideoRendererEventListener.EventDispatcher; - -import android.annotation.SuppressLint; -import android.annotation.TargetApi; -import android.content.Context; -import android.media.MediaCodec; -import android.media.MediaCrypto; -import android.media.MediaFormat; -import android.os.Handler; -import android.os.SystemClock; -import android.util.Log; -import android.view.Surface; - import java.nio.ByteBuffer; /** diff --git a/library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java index 1319f3981d..f999eeee48 100644 --- a/library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java @@ -15,15 +15,14 @@ */ package com.google.android.exoplayer2.video; -import com.google.android.exoplayer2.Format; -import com.google.android.exoplayer2.Renderer; -import com.google.android.exoplayer2.decoder.DecoderCounters; -import com.google.android.exoplayer2.util.Assertions; - import android.os.Handler; import android.os.SystemClock; import android.view.Surface; import android.view.TextureView; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.Renderer; +import com.google.android.exoplayer2.decoder.DecoderCounters; +import com.google.android.exoplayer2.util.Assertions; /** * Listener of video {@link Renderer} events. 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 446f4b6281..d22a2f9a98 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 @@ -15,6 +15,12 @@ */ package com.google.android.exoplayer2.playbacktests.gts; +import android.annotation.TargetApi; +import android.media.MediaDrm; +import android.media.UnsupportedSchemeException; +import android.net.Uri; +import android.test.ActivityInstrumentationTestCase2; +import android.util.Log; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; @@ -49,19 +55,11 @@ import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.Util; - -import android.annotation.TargetApi; -import android.media.MediaDrm; -import android.media.UnsupportedSchemeException; -import android.net.Uri; -import android.test.ActivityInstrumentationTestCase2; -import android.util.Log; -import junit.framework.AssertionFailedError; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.UUID; +import junit.framework.AssertionFailedError; /** * Tests DASH playbacks using {@link ExoPlayer}. diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java index 9108e5bdba..64484f7c5d 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/Action.java @@ -15,11 +15,10 @@ */ package com.google.android.exoplayer2.playbacktests.util; +import android.util.Log; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.trackselection.MappingTrackSelector; -import android.util.Log; - /** * Base class for actions to perform during playback tests. */ diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java index c5bb3083c6..5e2ae24c2c 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/ActionSchedule.java @@ -15,6 +15,7 @@ */ package com.google.android.exoplayer2.playbacktests.util; +import android.os.Handler; import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.playbacktests.util.Action.Seek; import com.google.android.exoplayer2.playbacktests.util.Action.SetPlayWhenReady; @@ -22,8 +23,6 @@ import com.google.android.exoplayer2.playbacktests.util.Action.SetRendererDisabl import com.google.android.exoplayer2.playbacktests.util.Action.Stop; import com.google.android.exoplayer2.trackselection.MappingTrackSelector; -import android.os.Handler; - /** * Schedules a sequence of {@link Action}s for execution during a test. */ diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DebugMediaCodecVideoRenderer.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DebugMediaCodecVideoRenderer.java index 433313e73b..cbc5f35e94 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DebugMediaCodecVideoRenderer.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DebugMediaCodecVideoRenderer.java @@ -15,16 +15,15 @@ */ package com.google.android.exoplayer2.playbacktests.util; +import android.annotation.TargetApi; +import android.content.Context; +import android.os.Handler; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.mediacodec.MediaCodecSelector; import com.google.android.exoplayer2.video.MediaCodecVideoRenderer; import com.google.android.exoplayer2.video.VideoRendererEventListener; -import android.annotation.TargetApi; -import android.content.Context; -import android.os.Handler; - /** * Decodes and renders video using {@link MediaCodecVideoRenderer}. Provides buffer timestamp * assertions. diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DecoderCountersUtil.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DecoderCountersUtil.java index 747117cf59..aafb828345 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DecoderCountersUtil.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/DecoderCountersUtil.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.playbacktests.util; import com.google.android.exoplayer2.decoder.DecoderCounters; - import junit.framework.TestCase; /** 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 cde2c06aa1..ccf896b733 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 @@ -15,6 +15,10 @@ */ package com.google.android.exoplayer2.playbacktests.util; +import android.os.Handler; +import android.os.SystemClock; +import android.util.Log; +import android.view.Surface; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; @@ -34,11 +38,6 @@ import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.TransferListener; import com.google.android.exoplayer2.util.Util; - -import android.os.Handler; -import android.os.SystemClock; -import android.util.Log; -import android.view.Surface; import junit.framework.Assert; diff --git a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/HostActivity.java b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/HostActivity.java index 82106ed6a1..2a890b7c7f 100644 --- a/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/HostActivity.java +++ b/playbacktests/src/main/java/com/google/android/exoplayer2/playbacktests/util/HostActivity.java @@ -17,10 +17,6 @@ package com.google.android.exoplayer2.playbacktests.util; import static junit.framework.Assert.fail; -import com.google.android.exoplayer2.playbacktests.R; -import com.google.android.exoplayer2.util.Assertions; -import com.google.android.exoplayer2.util.Util; - import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; @@ -36,6 +32,9 @@ import android.view.Surface; import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.Window; +import com.google.android.exoplayer2.playbacktests.R; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; /** * A host activity for performing playback tests. diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java index 7e74102173..62967a380c 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java @@ -16,7 +16,6 @@ package com.google.android.exoplayer2.testutil; import com.google.android.exoplayer2.C; - import java.util.Arrays; import java.util.Locale; diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java index ea73f35683..97022b463b 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java @@ -15,13 +15,11 @@ */ package com.google.android.exoplayer2.testutil; +import android.net.Uri; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; import com.google.android.exoplayer2.util.Assertions; - -import android.net.Uri; - import java.io.IOException; import java.util.ArrayList; diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java index c4315f57ff..fc057f90b8 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java @@ -15,14 +15,12 @@ */ package com.google.android.exoplayer2.testutil; +import android.util.SparseBooleanArray; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.ExtractorInput; - -import android.util.SparseBooleanArray; -import junit.framework.Assert; - import java.io.EOFException; import java.io.IOException; +import junit.framework.Assert; /** * A fake {@link ExtractorInput} capable of simulating various scenarios. diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java index c7550d04f9..064c989449 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java @@ -15,17 +15,15 @@ */ package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer2.extractor.ExtractorOutput; -import com.google.android.exoplayer2.extractor.SeekMap; - import android.app.Instrumentation; import android.util.SparseArray; -import junit.framework.Assert; -import junit.framework.TestCase; - +import com.google.android.exoplayer2.extractor.ExtractorOutput; +import com.google.android.exoplayer2.extractor.SeekMap; import java.io.File; import java.io.IOException; import java.io.PrintWriter; +import junit.framework.Assert; +import junit.framework.TestCase; /** * A fake {@link ExtractorOutput}. diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java index a077d150b8..a66e13cfd6 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java @@ -15,19 +15,17 @@ */ package com.google.android.exoplayer2.testutil; +import android.test.MoreAsserts; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.extractor.ExtractorInput; import com.google.android.exoplayer2.extractor.TrackOutput; import com.google.android.exoplayer2.util.ParsableByteArray; - -import android.test.MoreAsserts; -import junit.framework.Assert; - import java.io.EOFException; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import junit.framework.Assert; /** * A fake {@link TrackOutput}. diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java index 5d7c0f80c0..5c8de99842 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java @@ -15,6 +15,8 @@ */ package com.google.android.exoplayer2.testutil; +import android.app.Instrumentation; +import android.test.InstrumentationTestCase; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.extractor.Extractor; import com.google.android.exoplayer2.extractor.PositionHolder; @@ -22,16 +24,12 @@ import com.google.android.exoplayer2.extractor.SeekMap; import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Util; - -import android.app.Instrumentation; -import android.test.InstrumentationTestCase; -import junit.framework.Assert; -import org.mockito.MockitoAnnotations; - import java.io.IOException; import java.io.InputStream; import java.util.Arrays; import java.util.Random; +import junit.framework.Assert; +import org.mockito.MockitoAnnotations; /** * Utility methods for tests.