From ce55d1a712f686ba1749804302eca141d952a6dc Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 17 Mar 2017 10:36:15 -0700 Subject: [PATCH] Modularize ExoPlayer steps 1 + 2. 1. Move entire library from v2/library/ to v2/library/core 2. Add v2/library/all that depends on v2/library/core Issue: #2139 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=150455693 --- extensions/cronet/build.gradle | 2 +- extensions/ffmpeg/build.gradle | 2 +- extensions/flac/build.gradle | 2 +- extensions/gvr/build.gradle | 2 +- extensions/okhttp/build.gradle | 2 +- extensions/opus/build.gradle | 2 +- extensions/vp9/build.gradle | 2 +- library/{ => all}/build.gradle | 24 +------- .../{ => all}/src/main/AndroidManifest.xml | 0 library/core/build.gradle | 52 ++++++++++++++++++ library/{ => core}/proguard-rules.txt | 0 .../src/androidTest/AndroidManifest.xml | 4 +- .../src/androidTest/assets/dash/sample_mpd_1 | 0 .../dash/sample_mpd_2_unknown_mime_type | 0 .../assets/dash/sample_mpd_3_segment_template | 0 .../src/androidTest/assets/flv/sample.flv | Bin .../androidTest/assets/flv/sample.flv.0.dump | 0 .../src/androidTest/assets/mkv/sample.mkv | Bin .../androidTest/assets/mkv/sample.mkv.0.dump | 0 .../androidTest/assets/mkv/sample.mkv.1.dump | 0 .../androidTest/assets/mkv/sample.mkv.2.dump | 0 .../androidTest/assets/mkv/sample.mkv.3.dump | 0 .../mkv/subsample_encrypted_altref.webm | Bin .../subsample_encrypted_altref.webm.0.dump | 0 .../mkv/subsample_encrypted_noaltref.webm | Bin .../subsample_encrypted_noaltref.webm.0.dump | 0 .../src/androidTest/assets/mp3/bear.mp3 | Bin .../androidTest/assets/mp3/bear.mp3.0.dump | 0 .../androidTest/assets/mp3/bear.mp3.1.dump | 0 .../androidTest/assets/mp3/bear.mp3.2.dump | 0 .../androidTest/assets/mp3/bear.mp3.3.dump | 0 .../androidTest/assets/mp3/play-trimmed.mp3 | Bin .../assets/mp3/play-trimmed.mp3.0.dump | 0 .../assets/mp3/play-trimmed.mp3.1.dump | 0 .../assets/mp3/play-trimmed.mp3.2.dump | 0 .../assets/mp3/play-trimmed.mp3.3.dump | 0 .../assets/mp3/play-trimmed.mp3.unklen.dump | 0 .../src/androidTest/assets/mp4/sample.mp4 | Bin .../androidTest/assets/mp4/sample.mp4.0.dump | 0 .../androidTest/assets/mp4/sample.mp4.1.dump | 0 .../androidTest/assets/mp4/sample.mp4.2.dump | 0 .../androidTest/assets/mp4/sample.mp4.3.dump | 0 .../assets/mp4/sample_fragmented.mp4 | Bin .../assets/mp4/sample_fragmented.mp4.0.dump | 0 .../assets/mp4/sample_fragmented_sei.mp4 | Bin .../mp4/sample_fragmented_sei.mp4.0.dump | 0 .../mp4/sample_fragmented_zero_size_atom.mp4 | Bin .../src/androidTest/assets/ogg/bear.opus | Bin .../androidTest/assets/ogg/bear.opus.0.dump | 0 .../androidTest/assets/ogg/bear.opus.1.dump | 0 .../androidTest/assets/ogg/bear.opus.2.dump | 0 .../androidTest/assets/ogg/bear.opus.3.dump | 0 .../assets/ogg/bear.opus.unklen.dump | 0 .../src/androidTest/assets/ogg/bear_flac.ogg | Bin .../assets/ogg/bear_flac.ogg.0.dump | 0 .../assets/ogg/bear_flac.ogg.1.dump | 0 .../assets/ogg/bear_flac.ogg.2.dump | 0 .../assets/ogg/bear_flac.ogg.3.dump | 0 .../assets/ogg/bear_flac.ogg.unklen.dump | 0 .../assets/ogg/bear_flac_noseektable.ogg | Bin .../ogg/bear_flac_noseektable.ogg.0.dump | 0 .../ogg/bear_flac_noseektable.ogg.1.dump | 0 .../ogg/bear_flac_noseektable.ogg.2.dump | 0 .../ogg/bear_flac_noseektable.ogg.3.dump | 0 .../ogg/bear_flac_noseektable.ogg.unklen.dump | 0 .../androidTest/assets/ogg/bear_vorbis.ogg | Bin .../assets/ogg/bear_vorbis.ogg.0.dump | 0 .../assets/ogg/bear_vorbis.ogg.1.dump | 0 .../assets/ogg/bear_vorbis.ogg.2.dump | 0 .../assets/ogg/bear_vorbis.ogg.3.dump | 0 .../assets/ogg/bear_vorbis.ogg.unklen.dump | 0 .../src/androidTest/assets/rawcc/sample.rawcc | Bin .../assets/rawcc/sample.rawcc.0.dump | 0 .../assets/smoothstreaming/sample_ismc_1 | 0 .../assets/smoothstreaming/sample_ismc_2 | 0 .../src/androidTest/assets/subrip/empty | 0 .../assets/subrip/no_end_timecodes | 0 .../src/androidTest/assets/subrip/typical | 0 .../assets/subrip/typical_extra_blank_line | 0 .../assets/subrip/typical_missing_sequence | 0 .../assets/subrip/typical_missing_timecode | 0 .../assets/subrip/typical_negative_timestamps | 0 .../subrip/typical_with_byte_order_mark | 0 .../src/androidTest/assets/ts/sample.ac3 | Bin .../androidTest/assets/ts/sample.ac3.0.dump | 0 .../src/androidTest/assets/ts/sample.adts | Bin .../androidTest/assets/ts/sample.adts.0.dump | 0 .../src/androidTest/assets/ts/sample.ps | Bin .../androidTest/assets/ts/sample.ps.0.dump | 0 .../src/androidTest/assets/ts/sample.ts | Bin .../androidTest/assets/ts/sample.ts.0.dump | 0 .../androidTest/assets/ts/sample_with_sdt.ts | Bin .../assets/ttml/chain_multiple_styles.xml | 0 .../src/androidTest/assets/ttml/font_size.xml | 0 .../assets/ttml/font_size_empty.xml | 0 .../assets/ttml/font_size_invalid.xml | 0 .../assets/ttml/font_size_no_unit.xml | 0 .../androidTest/assets/ttml/frame_rate.xml | 0 .../ttml/inherit_and_override_style.xml | 0 .../assets/ttml/inherit_global_and_parent.xml | 0 .../assets/ttml/inherit_multiple_styles.xml | 0 .../androidTest/assets/ttml/inherit_style.xml | 0 .../assets/ttml/inline_style_attributes.xml | 0 .../assets/ttml/multiple_regions.xml | 0 .../assets/ttml/no_underline_linethrough.xml | 0 .../src/androidTest/assets/wav/sample.wav | Bin .../androidTest/assets/wav/sample.wav.0.dump | 0 .../androidTest/assets/wav/sample.wav.1.dump | 0 .../androidTest/assets/wav/sample.wav.2.dump | 0 .../androidTest/assets/wav/sample.wav.3.dump | 0 .../assets/webm/vorbis_codec_private | Bin .../src/androidTest/assets/webvtt/empty | 0 .../src/androidTest/assets/webvtt/typical | 0 .../assets/webvtt/typical_with_comments | 0 .../assets/webvtt/typical_with_identifiers | 0 .../assets/webvtt/with_bad_cue_header | 0 .../assets/webvtt/with_css_complex_selectors | 0 .../androidTest/assets/webvtt/with_css_styles | 0 .../assets/webvtt/with_positioning | 0 .../src/androidTest/assets/webvtt/with_tags | 0 .../com/google/android/exoplayer2/CTest.java | 0 .../android/exoplayer2/ExoPlayerTest.java | 0 .../google/android/exoplayer2/FormatTest.java | 0 .../exoplayer2/drm/DrmInitDataTest.java | 0 .../drm/OfflineLicenseHelperTest.java | 0 .../extractor/DefaultExtractorInputTest.java | 0 .../exoplayer2/extractor/ExtractorTest.java | 0 .../extractor/flv/FlvExtractorTest.java | 0 .../extractor/mkv/DefaultEbmlReaderTest.java | 0 .../extractor/mkv/MatroskaExtractorTest.java | 0 .../extractor/mkv/VarintReaderTest.java | 0 .../extractor/mp3/Mp3ExtractorTest.java | 0 .../extractor/mp3/XingSeekerTest.java | 0 .../extractor/mp4/AtomParsersTest.java | 0 .../mp4/FragmentedMp4ExtractorTest.java | 0 .../extractor/mp4/Mp4ExtractorTest.java | 0 .../extractor/ogg/DefaultOggSeekerTest.java | 0 .../ogg/DefaultOggSeekerUtilMethodsTest.java | 0 .../extractor/ogg/OggExtractorTest.java | 0 .../extractor/ogg/OggPacketTest.java | 0 .../extractor/ogg/OggPageHeaderTest.java | 0 .../exoplayer2/extractor/ogg/OggTestFile.java | 0 .../exoplayer2/extractor/ogg/TestData.java | 0 .../extractor/ogg/VorbisBitArrayTest.java | 0 .../extractor/ogg/VorbisReaderTest.java | 0 .../extractor/ogg/VorbisUtilTest.java | 0 .../extractor/rawcc/RawCcExtractorTest.java | 0 .../extractor/ts/Ac3ExtractorTest.java | 0 .../extractor/ts/AdtsExtractorTest.java | 0 .../extractor/ts/AdtsReaderTest.java | 0 .../extractor/ts/PsExtractorTest.java | 0 .../extractor/ts/SectionReaderTest.java | 0 .../extractor/ts/TsExtractorTest.java | 0 .../extractor/wav/WavExtractorTest.java | 0 .../emsg/EventMessageDecoderTest.java | 0 .../metadata/emsg/EventMessageTest.java | 0 .../metadata/id3/ChapterFrameTest.java | 0 .../metadata/id3/ChapterTocFrameTest.java | 0 .../metadata/id3/Id3DecoderTest.java | 0 .../scte35/SpliceInfoDecoderTest.java | 0 .../source/ClippingMediaSourceTest.java | 0 .../dash/manifest/DashManifestParserTest.java | 0 .../dash/manifest/DashManifestTest.java | 0 .../source/dash/manifest/RangedUriTest.java | 0 .../dash/manifest/RepresentationTest.java | 0 .../source/dash/manifest/UrlTemplateTest.java | 0 .../playlist/HlsMasterPlaylistParserTest.java | 0 .../playlist/HlsMediaPlaylistParserTest.java | 0 .../manifest/SsManifestParserTest.java | 0 .../text/subrip/SubripDecoderTest.java | 0 .../exoplayer2/text/ttml/TtmlDecoderTest.java | 0 .../text/ttml/TtmlRenderUtilTest.java | 0 .../exoplayer2/text/ttml/TtmlStyleTest.java | 0 .../exoplayer2/text/webvtt/CssParserTest.java | 0 .../text/webvtt/Mp4WebvttDecoderTest.java | 0 .../text/webvtt/WebvttCueParserTest.java | 0 .../text/webvtt/WebvttDecoderTest.java | 0 .../text/webvtt/WebvttSubtitleTest.java | 0 .../upstream/ByteArrayDataSourceTest.java | 0 .../upstream/DataSourceInputStreamTest.java | 0 .../upstream/cache/CacheDataSourceTest.java | 0 .../upstream/cache/CacheDataSourceTest2.java | 0 .../cache/CachedContentIndexTest.java | 0 .../cache/CachedRegionTrackerTest.java | 0 .../upstream/cache/SimpleCacheSpanTest.java | 0 .../upstream/cache/SimpleCacheTest.java | 0 .../crypto/AesFlushingCipherTest.java | 0 .../exoplayer2/util/AtomicFileTest.java | 0 .../exoplayer2/util/ColorParserTest.java | 0 .../exoplayer2/util/NalUnitUtilTest.java | 0 .../util/ParsableByteArrayTest.java | 0 .../util/ParsableNalUnitBitArrayTest.java | 0 .../ReusableBufferedOutputStreamTest.java | 0 .../android/exoplayer2/util/UriUtilTest.java | 0 .../android/exoplayer2/util/UtilTest.java | 0 library/core/src/main/AndroidManifest.xml | 17 ++++++ .../android/exoplayer2/BaseRenderer.java | 0 .../java/com/google/android/exoplayer2/C.java | 0 .../exoplayer2/DefaultLoadControl.java | 0 .../exoplayer2/ExoPlaybackException.java | 0 .../google/android/exoplayer2/ExoPlayer.java | 0 .../android/exoplayer2/ExoPlayerFactory.java | 0 .../android/exoplayer2/ExoPlayerImpl.java | 0 .../exoplayer2/ExoPlayerImplInternal.java | 0 .../exoplayer2/ExoPlayerLibraryInfo.java | 0 .../com/google/android/exoplayer2/Format.java | 0 .../android/exoplayer2/FormatHolder.java | 0 .../IllegalSeekPositionException.java | 0 .../android/exoplayer2/LoadControl.java | 0 .../android/exoplayer2/ParserException.java | 0 .../google/android/exoplayer2/Renderer.java | 0 .../exoplayer2/RendererCapabilities.java | 0 .../exoplayer2/RendererConfiguration.java | 0 .../android/exoplayer2/SimpleExoPlayer.java | 0 .../google/android/exoplayer2/Timeline.java | 0 .../android/exoplayer2/audio/Ac3Util.java | 0 .../exoplayer2/audio/AudioCapabilities.java | 0 .../audio/AudioCapabilitiesReceiver.java | 0 .../audio/AudioDecoderException.java | 0 .../exoplayer2/audio/AudioProcessor.java | 0 .../audio/AudioRendererEventListener.java | 0 .../android/exoplayer2/audio/AudioTrack.java | 0 .../audio/ChannelMappingAudioProcessor.java | 0 .../android/exoplayer2/audio/DtsUtil.java | 0 .../audio/MediaCodecAudioRenderer.java | 0 .../audio/ResamplingAudioProcessor.java | 0 .../audio/SimpleDecoderAudioRenderer.java | 0 .../android/exoplayer2/decoder/Buffer.java | 0 .../exoplayer2/decoder/CryptoInfo.java | 0 .../android/exoplayer2/decoder/Decoder.java | 0 .../exoplayer2/decoder/DecoderCounters.java | 0 .../decoder/DecoderInputBuffer.java | 0 .../exoplayer2/decoder/OutputBuffer.java | 0 .../exoplayer2/decoder/SimpleDecoder.java | 0 .../decoder/SimpleOutputBuffer.java | 0 .../exoplayer2/drm/DecryptionException.java | 0 .../drm/DefaultDrmSessionManager.java | 0 .../android/exoplayer2/drm/DrmInitData.java | 0 .../android/exoplayer2/drm/DrmSession.java | 0 .../exoplayer2/drm/DrmSessionManager.java | 0 .../exoplayer2/drm/ExoMediaCrypto.java | 0 .../android/exoplayer2/drm/ExoMediaDrm.java | 0 .../exoplayer2/drm/FrameworkMediaCrypto.java | 0 .../exoplayer2/drm/FrameworkMediaDrm.java | 0 .../exoplayer2/drm/HttpMediaDrmCallback.java | 0 .../exoplayer2/drm/KeysExpiredException.java | 0 .../exoplayer2/drm/MediaDrmCallback.java | 0 .../exoplayer2/drm/OfflineLicenseHelper.java | 0 .../drm/UnsupportedDrmException.java | 0 .../android/exoplayer2/drm/WidevineUtil.java | 0 .../exoplayer2/extractor/ChunkIndex.java | 0 .../extractor/DefaultExtractorInput.java | 0 .../extractor/DefaultExtractorsFactory.java | 0 .../extractor/DefaultTrackOutput.java | 0 .../extractor/DummyTrackOutput.java | 0 .../exoplayer2/extractor/Extractor.java | 0 .../exoplayer2/extractor/ExtractorInput.java | 0 .../exoplayer2/extractor/ExtractorOutput.java | 0 .../extractor/ExtractorsFactory.java | 0 .../extractor/GaplessInfoHolder.java | 0 .../exoplayer2/extractor/MpegAudioHeader.java | 0 .../exoplayer2/extractor/PositionHolder.java | 0 .../android/exoplayer2/extractor/SeekMap.java | 0 .../exoplayer2/extractor/TrackOutput.java | 0 .../extractor/flv/AudioTagPayloadReader.java | 0 .../extractor/flv/FlvExtractor.java | 0 .../extractor/flv/ScriptTagPayloadReader.java | 0 .../extractor/flv/TagPayloadReader.java | 0 .../extractor/flv/VideoTagPayloadReader.java | 0 .../extractor/mkv/DefaultEbmlReader.java | 0 .../exoplayer2/extractor/mkv/EbmlReader.java | 0 .../extractor/mkv/EbmlReaderOutput.java | 0 .../extractor/mkv/MatroskaExtractor.java | 0 .../exoplayer2/extractor/mkv/Sniffer.java | 0 .../extractor/mkv/VarintReader.java | 0 .../extractor/mp3/ConstantBitrateSeeker.java | 0 .../extractor/mp3/Mp3Extractor.java | 0 .../exoplayer2/extractor/mp3/VbriSeeker.java | 0 .../exoplayer2/extractor/mp3/XingSeeker.java | 0 .../exoplayer2/extractor/mp4/Atom.java | 0 .../exoplayer2/extractor/mp4/AtomParsers.java | 0 .../extractor/mp4/DefaultSampleValues.java | 0 .../mp4/FixedSampleSizeRechunker.java | 0 .../extractor/mp4/FragmentedMp4Extractor.java | 0 .../extractor/mp4/MetadataUtil.java | 0 .../extractor/mp4/Mp4Extractor.java | 0 .../extractor/mp4/PsshAtomUtil.java | 0 .../exoplayer2/extractor/mp4/Sniffer.java | 0 .../exoplayer2/extractor/mp4/Track.java | 0 .../extractor/mp4/TrackEncryptionBox.java | 0 .../extractor/mp4/TrackFragment.java | 0 .../extractor/mp4/TrackSampleTable.java | 0 .../extractor/ogg/DefaultOggSeeker.java | 0 .../exoplayer2/extractor/ogg/FlacReader.java | 0 .../extractor/ogg/OggExtractor.java | 0 .../exoplayer2/extractor/ogg/OggPacket.java | 0 .../extractor/ogg/OggPageHeader.java | 0 .../exoplayer2/extractor/ogg/OggSeeker.java | 0 .../exoplayer2/extractor/ogg/OpusReader.java | 0 .../extractor/ogg/StreamReader.java | 0 .../extractor/ogg/VorbisBitArray.java | 0 .../extractor/ogg/VorbisReader.java | 0 .../exoplayer2/extractor/ogg/VorbisUtil.java | 0 .../extractor/rawcc/RawCcExtractor.java | 0 .../exoplayer2/extractor/ts/Ac3Extractor.java | 0 .../exoplayer2/extractor/ts/Ac3Reader.java | 0 .../extractor/ts/AdtsExtractor.java | 0 .../exoplayer2/extractor/ts/AdtsReader.java | 0 .../ts/DefaultTsPayloadReaderFactory.java | 0 .../exoplayer2/extractor/ts/DtsReader.java | 0 .../extractor/ts/ElementaryStreamReader.java | 0 .../exoplayer2/extractor/ts/H262Reader.java | 0 .../exoplayer2/extractor/ts/H264Reader.java | 0 .../exoplayer2/extractor/ts/H265Reader.java | 0 .../exoplayer2/extractor/ts/Id3Reader.java | 0 .../extractor/ts/MpegAudioReader.java | 0 .../extractor/ts/NalUnitTargetBuffer.java | 0 .../exoplayer2/extractor/ts/PesReader.java | 0 .../exoplayer2/extractor/ts/PsExtractor.java | 0 .../extractor/ts/SectionPayloadReader.java | 0 .../extractor/ts/SectionReader.java | 0 .../exoplayer2/extractor/ts/SeiReader.java | 0 .../extractor/ts/SpliceInfoSectionReader.java | 0 .../exoplayer2/extractor/ts/TsExtractor.java | 0 .../extractor/ts/TsPayloadReader.java | 0 .../extractor/wav/WavExtractor.java | 0 .../exoplayer2/extractor/wav/WavHeader.java | 0 .../extractor/wav/WavHeaderReader.java | 0 .../exoplayer2/mediacodec/MediaCodecInfo.java | 0 .../mediacodec/MediaCodecRenderer.java | 0 .../mediacodec/MediaCodecSelector.java | 0 .../exoplayer2/mediacodec/MediaCodecUtil.java | 0 .../android/exoplayer2/metadata/Metadata.java | 0 .../exoplayer2/metadata/MetadataDecoder.java | 0 .../metadata/MetadataDecoderException.java | 0 .../metadata/MetadataDecoderFactory.java | 0 .../metadata/MetadataInputBuffer.java | 0 .../exoplayer2/metadata/MetadataRenderer.java | 0 .../metadata/emsg/EventMessage.java | 0 .../metadata/emsg/EventMessageDecoder.java | 0 .../exoplayer2/metadata/id3/ApicFrame.java | 0 .../exoplayer2/metadata/id3/BinaryFrame.java | 0 .../exoplayer2/metadata/id3/ChapterFrame.java | 0 .../metadata/id3/ChapterTocFrame.java | 0 .../exoplayer2/metadata/id3/CommentFrame.java | 0 .../exoplayer2/metadata/id3/GeobFrame.java | 0 .../exoplayer2/metadata/id3/Id3Decoder.java | 0 .../exoplayer2/metadata/id3/Id3Frame.java | 0 .../exoplayer2/metadata/id3/PrivFrame.java | 0 .../metadata/id3/TextInformationFrame.java | 0 .../exoplayer2/metadata/id3/UrlLinkFrame.java | 0 .../metadata/scte35/PrivateCommand.java | 0 .../metadata/scte35/SpliceCommand.java | 0 .../metadata/scte35/SpliceInfoDecoder.java | 0 .../metadata/scte35/SpliceInsertCommand.java | 0 .../metadata/scte35/SpliceNullCommand.java | 0 .../scte35/SpliceScheduleCommand.java | 0 .../metadata/scte35/TimeSignalCommand.java | 0 .../AdaptiveMediaSourceEventListener.java | 0 .../source/BehindLiveWindowException.java | 0 .../source/ClippingMediaPeriod.java | 0 .../source/ClippingMediaSource.java | 0 .../source/CompositeSequenceableLoader.java | 0 .../source/ConcatenatingMediaSource.java | 0 .../exoplayer2/source/EmptySampleStream.java | 0 .../source/ExtractorMediaPeriod.java | 0 .../source/ExtractorMediaSource.java | 0 .../exoplayer2/source/LoopingMediaSource.java | 0 .../exoplayer2/source/MediaPeriod.java | 0 .../exoplayer2/source/MediaSource.java | 0 .../exoplayer2/source/MergingMediaPeriod.java | 0 .../exoplayer2/source/MergingMediaSource.java | 0 .../exoplayer2/source/SampleStream.java | 0 .../exoplayer2/source/SequenceableLoader.java | 0 .../source/SinglePeriodTimeline.java | 0 .../source/SingleSampleMediaPeriod.java | 0 .../source/SingleSampleMediaSource.java | 0 .../android/exoplayer2/source/TrackGroup.java | 0 .../exoplayer2/source/TrackGroupArray.java | 0 .../UnrecognizedInputFormatException.java | 0 .../source/chunk/BaseMediaChunk.java | 0 .../source/chunk/BaseMediaChunkOutput.java | 0 .../exoplayer2/source/chunk/Chunk.java | 0 .../source/chunk/ChunkExtractorWrapper.java | 0 .../exoplayer2/source/chunk/ChunkHolder.java | 0 .../source/chunk/ChunkSampleStream.java | 0 .../exoplayer2/source/chunk/ChunkSource.java | 0 .../chunk/ChunkedTrackBlacklistUtil.java | 0 .../source/chunk/ContainerMediaChunk.java | 0 .../exoplayer2/source/chunk/DataChunk.java | 0 .../source/chunk/InitializationChunk.java | 0 .../exoplayer2/source/chunk/MediaChunk.java | 0 .../source/chunk/SingleSampleMediaChunk.java | 0 .../source/dash/DashChunkSource.java | 0 .../source/dash/DashMediaPeriod.java | 0 .../source/dash/DashMediaSource.java | 0 .../source/dash/DashSegmentIndex.java | 0 .../exoplayer2/source/dash/DashUtil.java | 0 .../source/dash/DashWrappingSegmentIndex.java | 0 .../source/dash/DefaultDashChunkSource.java | 0 .../source/dash/manifest/AdaptationSet.java | 0 .../source/dash/manifest/DashManifest.java | 0 .../dash/manifest/DashManifestParser.java | 0 .../source/dash/manifest/Period.java | 0 .../source/dash/manifest/RangedUri.java | 0 .../source/dash/manifest/Representation.java | 0 .../dash/manifest/RepresentationKey.java | 0 .../source/dash/manifest/SchemeValuePair.java | 0 .../source/dash/manifest/SegmentBase.java | 0 .../dash/manifest/SingleSegmentIndex.java | 0 .../source/dash/manifest/UrlTemplate.java | 0 .../dash/manifest/UtcTimingElement.java | 0 .../source/hls/Aes128DataSource.java | 0 .../hls/DefaultHlsDataSourceFactory.java | 0 .../exoplayer2/source/hls/HlsChunkSource.java | 0 .../source/hls/HlsDataSourceFactory.java | 0 .../exoplayer2/source/hls/HlsManifest.java | 0 .../exoplayer2/source/hls/HlsMediaChunk.java | 0 .../exoplayer2/source/hls/HlsMediaPeriod.java | 0 .../exoplayer2/source/hls/HlsMediaSource.java | 0 .../source/hls/HlsSampleStream.java | 0 .../source/hls/HlsSampleStreamWrapper.java | 0 .../source/hls/TimestampAdjusterProvider.java | 0 .../source/hls/WebvttExtractor.java | 0 .../hls/playlist/HlsMasterPlaylist.java | 0 .../source/hls/playlist/HlsMediaPlaylist.java | 0 .../source/hls/playlist/HlsPlaylist.java | 0 .../hls/playlist/HlsPlaylistParser.java | 0 .../hls/playlist/HlsPlaylistTracker.java | 0 .../smoothstreaming/DefaultSsChunkSource.java | 0 .../source/smoothstreaming/SsChunkSource.java | 0 .../source/smoothstreaming/SsMediaPeriod.java | 0 .../source/smoothstreaming/SsMediaSource.java | 0 .../smoothstreaming/manifest/SsManifest.java | 0 .../manifest/SsManifestParser.java | 0 .../exoplayer2/text/CaptionStyleCompat.java | 0 .../google/android/exoplayer2/text/Cue.java | 0 .../text/SimpleSubtitleDecoder.java | 0 .../text/SimpleSubtitleOutputBuffer.java | 0 .../android/exoplayer2/text/Subtitle.java | 0 .../exoplayer2/text/SubtitleDecoder.java | 0 .../text/SubtitleDecoderException.java | 0 .../text/SubtitleDecoderFactory.java | 0 .../exoplayer2/text/SubtitleInputBuffer.java | 0 .../exoplayer2/text/SubtitleOutputBuffer.java | 0 .../android/exoplayer2/text/TextRenderer.java | 0 .../exoplayer2/text/cea/Cea608Decoder.java | 0 .../exoplayer2/text/cea/Cea708Cue.java | 0 .../exoplayer2/text/cea/Cea708Decoder.java | 0 .../exoplayer2/text/cea/CeaDecoder.java | 0 .../exoplayer2/text/cea/CeaOutputBuffer.java | 0 .../exoplayer2/text/cea/CeaSubtitle.java | 0 .../android/exoplayer2/text/cea/CeaUtil.java | 0 .../exoplayer2/text/subrip/SubripDecoder.java | 0 .../text/subrip/SubripSubtitle.java | 0 .../exoplayer2/text/ttml/TtmlDecoder.java | 0 .../exoplayer2/text/ttml/TtmlNode.java | 0 .../exoplayer2/text/ttml/TtmlRegion.java | 0 .../exoplayer2/text/ttml/TtmlRenderUtil.java | 0 .../exoplayer2/text/ttml/TtmlStyle.java | 0 .../exoplayer2/text/ttml/TtmlSubtitle.java | 0 .../exoplayer2/text/tx3g/Tx3gDecoder.java | 0 .../exoplayer2/text/tx3g/Tx3gSubtitle.java | 0 .../exoplayer2/text/webvtt/CssParser.java | 0 .../text/webvtt/Mp4WebvttDecoder.java | 0 .../text/webvtt/Mp4WebvttSubtitle.java | 0 .../text/webvtt/WebvttCssStyle.java | 0 .../exoplayer2/text/webvtt/WebvttCue.java | 0 .../text/webvtt/WebvttCueParser.java | 0 .../exoplayer2/text/webvtt/WebvttDecoder.java | 0 .../text/webvtt/WebvttParserUtil.java | 0 .../text/webvtt/WebvttSubtitle.java | 0 .../AdaptiveTrackSelection.java | 0 .../trackselection/BaseTrackSelection.java | 0 .../trackselection/DefaultTrackSelector.java | 0 .../trackselection/FixedTrackSelection.java | 0 .../trackselection/MappingTrackSelector.java | 0 .../trackselection/RandomTrackSelection.java | 0 .../trackselection/TrackSelection.java | 0 .../trackselection/TrackSelectionArray.java | 0 .../trackselection/TrackSelector.java | 0 .../trackselection/TrackSelectorResult.java | 0 .../exoplayer2/ui/AspectRatioFrameLayout.java | 2 +- .../exoplayer2/ui/DebugTextViewHelper.java | 0 .../exoplayer2/ui/PlaybackControlView.java | 2 +- .../exoplayer2/ui/SimpleExoPlayerView.java | 2 +- .../exoplayer2/ui/SubtitlePainter.java | 0 .../android/exoplayer2/ui/SubtitleView.java | 0 .../exoplayer2/upstream/Allocation.java | 0 .../exoplayer2/upstream/Allocator.java | 0 .../exoplayer2/upstream/AssetDataSource.java | 0 .../exoplayer2/upstream/BandwidthMeter.java | 0 .../upstream/ByteArrayDataSink.java | 0 .../upstream/ByteArrayDataSource.java | 0 .../upstream/ContentDataSource.java | 0 .../android/exoplayer2/upstream/DataSink.java | 0 .../exoplayer2/upstream/DataSource.java | 0 .../upstream/DataSourceException.java | 0 .../upstream/DataSourceInputStream.java | 0 .../android/exoplayer2/upstream/DataSpec.java | 0 .../exoplayer2/upstream/DefaultAllocator.java | 0 .../upstream/DefaultBandwidthMeter.java | 0 .../upstream/DefaultDataSource.java | 0 .../upstream/DefaultDataSourceFactory.java | 0 .../upstream/DefaultHttpDataSource.java | 0 .../DefaultHttpDataSourceFactory.java | 0 .../exoplayer2/upstream/FileDataSource.java | 0 .../upstream/FileDataSourceFactory.java | 0 .../exoplayer2/upstream/HttpDataSource.java | 0 .../android/exoplayer2/upstream/Loader.java | 0 .../upstream/LoaderErrorThrower.java | 0 .../exoplayer2/upstream/ParsingLoadable.java | 0 .../upstream/PriorityDataSource.java | 0 .../upstream/PriorityDataSourceFactory.java | 0 .../upstream/RawResourceDataSource.java | 0 .../exoplayer2/upstream/TeeDataSource.java | 0 .../exoplayer2/upstream/TransferListener.java | 0 .../exoplayer2/upstream/UdpDataSource.java | 0 .../exoplayer2/upstream/cache/Cache.java | 0 .../upstream/cache/CacheDataSink.java | 0 .../upstream/cache/CacheDataSinkFactory.java | 0 .../upstream/cache/CacheDataSource.java | 0 .../cache/CacheDataSourceFactory.java | 0 .../upstream/cache/CacheEvictor.java | 0 .../exoplayer2/upstream/cache/CacheSpan.java | 0 .../upstream/cache/CachedContent.java | 0 .../upstream/cache/CachedContentIndex.java | 0 .../upstream/cache/CachedRegionTracker.java | 0 .../cache/LeastRecentlyUsedCacheEvictor.java | 0 .../upstream/cache/NoOpCacheEvictor.java | 0 .../upstream/cache/SimpleCache.java | 0 .../upstream/cache/SimpleCacheSpan.java | 0 .../upstream/crypto/AesCipherDataSink.java | 0 .../upstream/crypto/AesCipherDataSource.java | 0 .../upstream/crypto/AesFlushingCipher.java | 0 .../upstream/crypto/CryptoUtil.java | 0 .../android/exoplayer2/util/Assertions.java | 0 .../android/exoplayer2/util/AtomicFile.java | 0 .../google/android/exoplayer2/util/Clock.java | 0 .../android/exoplayer2/util/ClosedSource.java | 31 +++++++++++ .../util/CodecSpecificDataUtil.java | 0 .../android/exoplayer2/util/ColorParser.java | 0 .../exoplayer2/util/ConditionVariable.java | 0 .../exoplayer2/util/FlacStreamInfo.java | 0 .../exoplayer2/util/LibraryLoader.java | 0 .../android/exoplayer2/util/LongArray.java | 0 .../android/exoplayer2/util/MediaClock.java | 0 .../android/exoplayer2/util/MimeTypes.java | 0 .../android/exoplayer2/util/NalUnitUtil.java | 0 .../exoplayer2/util/ParsableBitArray.java | 0 .../exoplayer2/util/ParsableByteArray.java | 0 .../util/ParsableNalUnitBitArray.java | 0 .../android/exoplayer2/util/Predicate.java | 0 .../util/PriorityHandlerThread.java | 0 .../exoplayer2/util/PriorityTaskManager.java | 0 .../util/ReusableBufferedOutputStream.java | 0 .../exoplayer2/util/SlidingPercentile.java | 0 .../exoplayer2/util/StandaloneMediaClock.java | 0 .../android/exoplayer2/util/SystemClock.java | 0 .../exoplayer2/util/TimestampAdjuster.java | 0 .../android/exoplayer2/util/TraceUtil.java | 0 .../android/exoplayer2/util/UriUtil.java | 0 .../google/android/exoplayer2/util/Util.java | 0 .../exoplayer2/util/XmlPullParserUtil.java | 0 .../android/exoplayer2/video/AvcConfig.java | 0 .../android/exoplayer2/video/HevcConfig.java | 0 .../video/MediaCodecVideoRenderer.java | 0 .../video/VideoFrameReleaseTimeHelper.java | 0 .../video/VideoRendererEventListener.java | 0 .../doc-files/exoplayer-threading-model.svg | 0 .../exoplayer2/doc-files/renderer-states.svg | 0 .../doc-files/timeline-advanced.svg | 0 .../doc-files/timeline-live-indefinite.svg | 0 .../doc-files/timeline-live-limited.svg | 0 .../doc-files/timeline-live-multi-period.svg | 0 .../exoplayer2/doc-files/timeline-period.svg | 0 .../doc-files/timeline-playlist.svg | 0 .../doc-files/timeline-single-file.svg | 0 .../exoplayer2/doc-files/timeline-window.svg | 0 library/core/src/main/proguard-rules.txt | 7 +++ .../exo_controls_fastforward.xml | 0 .../drawable-anydpi-v21/exo_controls_next.xml | 0 .../exo_controls_pause.xml | 0 .../drawable-anydpi-v21/exo_controls_play.xml | 0 .../exo_controls_previous.xml | 0 .../exo_controls_rewind.xml | 0 .../exo_controls_fastforward.png | Bin .../res/drawable-hdpi/exo_controls_next.png | Bin .../res/drawable-hdpi/exo_controls_pause.png | Bin .../res/drawable-hdpi/exo_controls_play.png | Bin .../drawable-hdpi/exo_controls_previous.png | Bin .../res/drawable-hdpi/exo_controls_rewind.png | Bin .../exo_controls_fastforward.png | Bin .../res/drawable-ldpi/exo_controls_next.png | Bin .../res/drawable-ldpi/exo_controls_pause.png | Bin .../res/drawable-ldpi/exo_controls_play.png | Bin .../drawable-ldpi/exo_controls_previous.png | Bin .../res/drawable-ldpi/exo_controls_rewind.png | Bin .../exo_controls_fastforward.png | Bin .../res/drawable-mdpi/exo_controls_next.png | Bin .../res/drawable-mdpi/exo_controls_pause.png | Bin .../res/drawable-mdpi/exo_controls_play.png | Bin .../drawable-mdpi/exo_controls_previous.png | Bin .../res/drawable-mdpi/exo_controls_rewind.png | Bin .../exo_controls_fastforward.png | Bin .../res/drawable-xhdpi/exo_controls_next.png | Bin .../res/drawable-xhdpi/exo_controls_pause.png | Bin .../res/drawable-xhdpi/exo_controls_play.png | Bin .../drawable-xhdpi/exo_controls_previous.png | Bin .../drawable-xhdpi/exo_controls_rewind.png | Bin .../exo_controls_fastforward.png | Bin .../res/drawable-xxhdpi/exo_controls_next.png | Bin .../drawable-xxhdpi/exo_controls_pause.png | Bin .../res/drawable-xxhdpi/exo_controls_play.png | Bin .../drawable-xxhdpi/exo_controls_previous.png | Bin .../drawable-xxhdpi/exo_controls_rewind.png | Bin .../res/layout/exo_playback_control_view.xml | 0 .../res/layout/exo_simple_player_view.xml | 0 .../src/main/res/values-af/strings.xml | 0 .../src/main/res/values-am/strings.xml | 0 .../src/main/res/values-ar/strings.xml | 0 .../src/main/res/values-az-rAZ/strings.xml | 0 .../src/main/res/values-b+sr+Latn/strings.xml | 0 .../src/main/res/values-be-rBY/strings.xml | 0 .../src/main/res/values-bg/strings.xml | 0 .../src/main/res/values-bn-rBD/strings.xml | 0 .../src/main/res/values-bs-rBA/strings.xml | 0 .../src/main/res/values-ca/strings.xml | 0 .../src/main/res/values-cs/strings.xml | 0 .../src/main/res/values-da/strings.xml | 0 .../src/main/res/values-de/strings.xml | 0 .../src/main/res/values-el/strings.xml | 0 .../src/main/res/values-en-rAU/strings.xml | 0 .../src/main/res/values-en-rGB/strings.xml | 0 .../src/main/res/values-en-rIN/strings.xml | 0 .../src/main/res/values-es-rUS/strings.xml | 0 .../src/main/res/values-es/strings.xml | 0 .../src/main/res/values-et-rEE/strings.xml | 0 .../src/main/res/values-eu-rES/strings.xml | 0 .../src/main/res/values-fa/strings.xml | 0 .../src/main/res/values-fi/strings.xml | 0 .../src/main/res/values-fr-rCA/strings.xml | 0 .../src/main/res/values-fr/strings.xml | 0 .../src/main/res/values-gl-rES/strings.xml | 0 .../src/main/res/values-gu-rIN/strings.xml | 0 .../src/main/res/values-hi/strings.xml | 0 .../src/main/res/values-hr/strings.xml | 0 .../src/main/res/values-hu/strings.xml | 0 .../src/main/res/values-hy-rAM/strings.xml | 0 .../src/main/res/values-in/strings.xml | 0 .../src/main/res/values-is-rIS/strings.xml | 0 .../src/main/res/values-it/strings.xml | 0 .../src/main/res/values-iw/strings.xml | 0 .../src/main/res/values-ja/strings.xml | 0 .../src/main/res/values-ka-rGE/strings.xml | 0 .../src/main/res/values-kk-rKZ/strings.xml | 0 .../src/main/res/values-km-rKH/strings.xml | 0 .../src/main/res/values-kn-rIN/strings.xml | 0 .../src/main/res/values-ko/strings.xml | 0 .../src/main/res/values-ky-rKG/strings.xml | 0 .../src/main/res/values-lo-rLA/strings.xml | 0 .../src/main/res/values-lt/strings.xml | 0 .../src/main/res/values-lv/strings.xml | 0 .../src/main/res/values-mk-rMK/strings.xml | 0 .../src/main/res/values-ml-rIN/strings.xml | 0 .../src/main/res/values-mn-rMN/strings.xml | 0 .../src/main/res/values-mr-rIN/strings.xml | 0 .../src/main/res/values-ms-rMY/strings.xml | 0 .../src/main/res/values-my-rMM/strings.xml | 0 .../src/main/res/values-nb/strings.xml | 0 .../src/main/res/values-ne-rNP/strings.xml | 0 .../src/main/res/values-nl/strings.xml | 0 .../src/main/res/values-pa-rIN/strings.xml | 0 .../src/main/res/values-pl/strings.xml | 0 .../src/main/res/values-pt-rBR/strings.xml | 0 .../src/main/res/values-pt-rPT/strings.xml | 0 .../src/main/res/values-pt/strings.xml | 0 .../src/main/res/values-ro/strings.xml | 0 .../src/main/res/values-ru/strings.xml | 0 .../src/main/res/values-si-rLK/strings.xml | 0 .../src/main/res/values-sk/strings.xml | 0 .../src/main/res/values-sl/strings.xml | 0 .../src/main/res/values-sq-rAL/strings.xml | 0 .../src/main/res/values-sr/strings.xml | 0 .../src/main/res/values-sv/strings.xml | 0 .../src/main/res/values-sw/strings.xml | 0 .../src/main/res/values-ta-rIN/strings.xml | 0 .../src/main/res/values-te-rIN/strings.xml | 0 .../src/main/res/values-th/strings.xml | 0 .../src/main/res/values-tl/strings.xml | 0 .../src/main/res/values-tr/strings.xml | 0 .../src/main/res/values-uk/strings.xml | 0 .../src/main/res/values-ur-rPK/strings.xml | 0 .../src/main/res/values-uz-rUZ/strings.xml | 0 .../src/main/res/values-v11/styles.xml | 0 .../src/main/res/values-vi/strings.xml | 0 .../src/main/res/values-zh-rCN/strings.xml | 0 .../src/main/res/values-zh-rHK/strings.xml | 0 .../src/main/res/values-zh-rTW/strings.xml | 0 .../src/main/res/values-zu/strings.xml | 0 .../{ => core}/src/main/res/values/attrs.xml | 0 .../src/main/res/values/constants.xml | 0 .../{ => core}/src/main/res/values/ids.xml | 0 .../src/main/res/values/strings.xml | 0 .../{ => core}/src/main/res/values/styles.xml | 0 settings.gradle | 3 + 706 files changed, 125 insertions(+), 33 deletions(-) rename library/{ => all}/build.gradle (74%) rename library/{ => all}/src/main/AndroidManifest.xml (100%) create mode 100644 library/core/build.gradle rename library/{ => core}/proguard-rules.txt (100%) rename library/{ => core}/src/androidTest/AndroidManifest.xml (90%) rename library/{ => core}/src/androidTest/assets/dash/sample_mpd_1 (100%) rename library/{ => core}/src/androidTest/assets/dash/sample_mpd_2_unknown_mime_type (100%) rename library/{ => core}/src/androidTest/assets/dash/sample_mpd_3_segment_template (100%) rename library/{ => core}/src/androidTest/assets/flv/sample.flv (100%) rename library/{ => core}/src/androidTest/assets/flv/sample.flv.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/sample.mkv (100%) rename library/{ => core}/src/androidTest/assets/mkv/sample.mkv.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/sample.mkv.1.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/sample.mkv.2.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/sample.mkv.3.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/subsample_encrypted_altref.webm (100%) rename library/{ => core}/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm (100%) rename library/{ => core}/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/bear.mp3 (100%) rename library/{ => core}/src/androidTest/assets/mp3/bear.mp3.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/bear.mp3.1.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/bear.mp3.2.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/bear.mp3.3.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3 (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump (100%) rename library/{ => core}/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample.mp4 (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample.mp4.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample.mp4.1.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample.mp4.2.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample.mp4.3.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample_fragmented.mp4 (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample_fragmented_sei.mp4 (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump (100%) rename library/{ => core}/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus.1.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus.2.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus.3.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear.opus.unklen.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg.1.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg.2.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg.3.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump (100%) rename library/{ => core}/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump (100%) rename library/{ => core}/src/androidTest/assets/rawcc/sample.rawcc (100%) rename library/{ => core}/src/androidTest/assets/rawcc/sample.rawcc.0.dump (100%) rename library/{ => core}/src/androidTest/assets/smoothstreaming/sample_ismc_1 (100%) rename library/{ => core}/src/androidTest/assets/smoothstreaming/sample_ismc_2 (100%) rename library/{ => core}/src/androidTest/assets/subrip/empty (100%) rename library/{ => core}/src/androidTest/assets/subrip/no_end_timecodes (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical_extra_blank_line (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical_missing_sequence (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical_missing_timecode (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical_negative_timestamps (100%) rename library/{ => core}/src/androidTest/assets/subrip/typical_with_byte_order_mark (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ac3 (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ac3.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.adts (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.adts.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ps (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ps.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ts (100%) rename library/{ => core}/src/androidTest/assets/ts/sample.ts.0.dump (100%) rename library/{ => core}/src/androidTest/assets/ts/sample_with_sdt.ts (100%) rename library/{ => core}/src/androidTest/assets/ttml/chain_multiple_styles.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/font_size.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/font_size_empty.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/font_size_invalid.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/font_size_no_unit.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/frame_rate.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/inherit_and_override_style.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/inherit_global_and_parent.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/inherit_multiple_styles.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/inherit_style.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/inline_style_attributes.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/multiple_regions.xml (100%) rename library/{ => core}/src/androidTest/assets/ttml/no_underline_linethrough.xml (100%) rename library/{ => core}/src/androidTest/assets/wav/sample.wav (100%) rename library/{ => core}/src/androidTest/assets/wav/sample.wav.0.dump (100%) rename library/{ => core}/src/androidTest/assets/wav/sample.wav.1.dump (100%) rename library/{ => core}/src/androidTest/assets/wav/sample.wav.2.dump (100%) rename library/{ => core}/src/androidTest/assets/wav/sample.wav.3.dump (100%) rename library/{ => core}/src/androidTest/assets/webm/vorbis_codec_private (100%) rename library/{ => core}/src/androidTest/assets/webvtt/empty (100%) rename library/{ => core}/src/androidTest/assets/webvtt/typical (100%) rename library/{ => core}/src/androidTest/assets/webvtt/typical_with_comments (100%) rename library/{ => core}/src/androidTest/assets/webvtt/typical_with_identifiers (100%) rename library/{ => core}/src/androidTest/assets/webvtt/with_bad_cue_header (100%) rename library/{ => core}/src/androidTest/assets/webvtt/with_css_complex_selectors (100%) rename library/{ => core}/src/androidTest/assets/webvtt/with_css_styles (100%) rename library/{ => core}/src/androidTest/assets/webvtt/with_positioning (100%) rename library/{ => core}/src/androidTest/assets/webvtt/with_tags (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/CTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java (100%) rename library/{ => core}/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java (100%) create mode 100644 library/core/src/main/AndroidManifest.xml rename library/{ => core}/src/main/java/com/google/android/exoplayer2/BaseRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/C.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlayer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/Format.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/FormatHolder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/LoadControl.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ParserException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/Renderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/Timeline.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/MediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/SampleStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SchemeValuePair.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/Cue.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/Subtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java (99%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java (99%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java (99%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/Loader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/Assertions.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/Clock.java (100%) create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/util/ClosedSource.java rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ColorParser.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/LongArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/MediaClock.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/Predicate.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/SystemClock.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/UriUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/Util.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java (100%) rename library/{ => core}/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg (100%) rename library/{ => core}/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg (100%) create mode 100644 library/core/src/main/proguard-rules.txt rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml (100%) rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_next.xml (100%) rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_pause.xml (100%) rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_play.xml (100%) rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_previous.xml (100%) rename library/{ => core}/src/main/res/drawable-anydpi-v21/exo_controls_rewind.xml (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_fastforward.png (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_next.png (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_pause.png (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_play.png (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_previous.png (100%) rename library/{ => core}/src/main/res/drawable-hdpi/exo_controls_rewind.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_fastforward.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_next.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_pause.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_play.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_previous.png (100%) rename library/{ => core}/src/main/res/drawable-ldpi/exo_controls_rewind.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_fastforward.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_next.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_pause.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_play.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_previous.png (100%) rename library/{ => core}/src/main/res/drawable-mdpi/exo_controls_rewind.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_fastforward.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_next.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_pause.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_play.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_previous.png (100%) rename library/{ => core}/src/main/res/drawable-xhdpi/exo_controls_rewind.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_fastforward.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_next.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_pause.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_play.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_previous.png (100%) rename library/{ => core}/src/main/res/drawable-xxhdpi/exo_controls_rewind.png (100%) rename library/{ => core}/src/main/res/layout/exo_playback_control_view.xml (100%) rename library/{ => core}/src/main/res/layout/exo_simple_player_view.xml (100%) rename library/{ => core}/src/main/res/values-af/strings.xml (100%) rename library/{ => core}/src/main/res/values-am/strings.xml (100%) rename library/{ => core}/src/main/res/values-ar/strings.xml (100%) rename library/{ => core}/src/main/res/values-az-rAZ/strings.xml (100%) rename library/{ => core}/src/main/res/values-b+sr+Latn/strings.xml (100%) rename library/{ => core}/src/main/res/values-be-rBY/strings.xml (100%) rename library/{ => core}/src/main/res/values-bg/strings.xml (100%) rename library/{ => core}/src/main/res/values-bn-rBD/strings.xml (100%) rename library/{ => core}/src/main/res/values-bs-rBA/strings.xml (100%) rename library/{ => core}/src/main/res/values-ca/strings.xml (100%) rename library/{ => core}/src/main/res/values-cs/strings.xml (100%) rename library/{ => core}/src/main/res/values-da/strings.xml (100%) rename library/{ => core}/src/main/res/values-de/strings.xml (100%) rename library/{ => core}/src/main/res/values-el/strings.xml (100%) rename library/{ => core}/src/main/res/values-en-rAU/strings.xml (100%) rename library/{ => core}/src/main/res/values-en-rGB/strings.xml (100%) rename library/{ => core}/src/main/res/values-en-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-es-rUS/strings.xml (100%) rename library/{ => core}/src/main/res/values-es/strings.xml (100%) rename library/{ => core}/src/main/res/values-et-rEE/strings.xml (100%) rename library/{ => core}/src/main/res/values-eu-rES/strings.xml (100%) rename library/{ => core}/src/main/res/values-fa/strings.xml (100%) rename library/{ => core}/src/main/res/values-fi/strings.xml (100%) rename library/{ => core}/src/main/res/values-fr-rCA/strings.xml (100%) rename library/{ => core}/src/main/res/values-fr/strings.xml (100%) rename library/{ => core}/src/main/res/values-gl-rES/strings.xml (100%) rename library/{ => core}/src/main/res/values-gu-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-hi/strings.xml (100%) rename library/{ => core}/src/main/res/values-hr/strings.xml (100%) rename library/{ => core}/src/main/res/values-hu/strings.xml (100%) rename library/{ => core}/src/main/res/values-hy-rAM/strings.xml (100%) rename library/{ => core}/src/main/res/values-in/strings.xml (100%) rename library/{ => core}/src/main/res/values-is-rIS/strings.xml (100%) rename library/{ => core}/src/main/res/values-it/strings.xml (100%) rename library/{ => core}/src/main/res/values-iw/strings.xml (100%) rename library/{ => core}/src/main/res/values-ja/strings.xml (100%) rename library/{ => core}/src/main/res/values-ka-rGE/strings.xml (100%) rename library/{ => core}/src/main/res/values-kk-rKZ/strings.xml (100%) rename library/{ => core}/src/main/res/values-km-rKH/strings.xml (100%) rename library/{ => core}/src/main/res/values-kn-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-ko/strings.xml (100%) rename library/{ => core}/src/main/res/values-ky-rKG/strings.xml (100%) rename library/{ => core}/src/main/res/values-lo-rLA/strings.xml (100%) rename library/{ => core}/src/main/res/values-lt/strings.xml (100%) rename library/{ => core}/src/main/res/values-lv/strings.xml (100%) rename library/{ => core}/src/main/res/values-mk-rMK/strings.xml (100%) rename library/{ => core}/src/main/res/values-ml-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-mn-rMN/strings.xml (100%) rename library/{ => core}/src/main/res/values-mr-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-ms-rMY/strings.xml (100%) rename library/{ => core}/src/main/res/values-my-rMM/strings.xml (100%) rename library/{ => core}/src/main/res/values-nb/strings.xml (100%) rename library/{ => core}/src/main/res/values-ne-rNP/strings.xml (100%) rename library/{ => core}/src/main/res/values-nl/strings.xml (100%) rename library/{ => core}/src/main/res/values-pa-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-pl/strings.xml (100%) rename library/{ => core}/src/main/res/values-pt-rBR/strings.xml (100%) rename library/{ => core}/src/main/res/values-pt-rPT/strings.xml (100%) rename library/{ => core}/src/main/res/values-pt/strings.xml (100%) rename library/{ => core}/src/main/res/values-ro/strings.xml (100%) rename library/{ => core}/src/main/res/values-ru/strings.xml (100%) rename library/{ => core}/src/main/res/values-si-rLK/strings.xml (100%) rename library/{ => core}/src/main/res/values-sk/strings.xml (100%) rename library/{ => core}/src/main/res/values-sl/strings.xml (100%) rename library/{ => core}/src/main/res/values-sq-rAL/strings.xml (100%) rename library/{ => core}/src/main/res/values-sr/strings.xml (100%) rename library/{ => core}/src/main/res/values-sv/strings.xml (100%) rename library/{ => core}/src/main/res/values-sw/strings.xml (100%) rename library/{ => core}/src/main/res/values-ta-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-te-rIN/strings.xml (100%) rename library/{ => core}/src/main/res/values-th/strings.xml (100%) rename library/{ => core}/src/main/res/values-tl/strings.xml (100%) rename library/{ => core}/src/main/res/values-tr/strings.xml (100%) rename library/{ => core}/src/main/res/values-uk/strings.xml (100%) rename library/{ => core}/src/main/res/values-ur-rPK/strings.xml (100%) rename library/{ => core}/src/main/res/values-uz-rUZ/strings.xml (100%) rename library/{ => core}/src/main/res/values-v11/styles.xml (100%) rename library/{ => core}/src/main/res/values-vi/strings.xml (100%) rename library/{ => core}/src/main/res/values-zh-rCN/strings.xml (100%) rename library/{ => core}/src/main/res/values-zh-rHK/strings.xml (100%) rename library/{ => core}/src/main/res/values-zh-rTW/strings.xml (100%) rename library/{ => core}/src/main/res/values-zu/strings.xml (100%) rename library/{ => core}/src/main/res/values/attrs.xml (100%) rename library/{ => core}/src/main/res/values/constants.xml (100%) rename library/{ => core}/src/main/res/values/ids.xml (100%) rename library/{ => core}/src/main/res/values/strings.xml (100%) rename library/{ => core}/src/main/res/values/styles.xml (100%) diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index f031a9dc48..47d4cbef98 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -29,7 +29,7 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') compile files('libs/cronet_api.jar') compile files('libs/cronet_impl_common_java.jar') compile files('libs/cronet_impl_native_java.jar') diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index a6523788cb..be8ad761bb 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -30,5 +30,5 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') } diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index 1c23b9987c..33f8266deb 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -30,7 +30,7 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') androidTestCompile project(':testutils') } diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle index 5156cf0540..0e7a478186 100644 --- a/extensions/gvr/build.gradle +++ b/extensions/gvr/build.gradle @@ -24,7 +24,7 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') compile 'com.google.vr:sdk-audio:1.30.0' } diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 3a2daefb8f..3679ae8877 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -29,7 +29,7 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') compile('com.squareup.okhttp3:okhttp:3.6.0') { exclude group: 'org.json' } diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index a6523788cb..be8ad761bb 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -30,5 +30,5 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') } diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 91d80f4970..5c72f46a9f 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -30,6 +30,6 @@ android { } dependencies { - compile project(':library') + compile project(':library-core') } diff --git a/library/build.gradle b/library/all/build.gradle similarity index 74% rename from library/build.gradle rename to library/all/build.gradle index abca404cfa..0799a184f3 100644 --- a/library/build.gradle +++ b/library/all/build.gradle @@ -22,29 +22,11 @@ android { defaultConfig { minSdkVersion project.ext.minSdkVersion targetSdkVersion project.ext.targetSdkVersion - consumerProguardFiles 'proguard-rules.txt' - } - - buildTypes { - // Re-enable test coverage when the following issue is fixed: - // https://code.google.com/p/android/issues/detail?id=226070 - // debug { - // testCoverageEnabled = true - // } - } - - sourceSets { - androidTest { - java.srcDirs += "../testutils/src/main/java/" - } } } dependencies { - compile 'com.android.support:support-annotations:25.2.0' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile 'org.mockito:mockito-core:1.9.5' + compile project(':library-core') } android.libraryVariants.all { variant -> @@ -82,6 +64,6 @@ android.libraryVariants.all { variant -> ext { releaseArtifact = 'exoplayer' - releaseDescription = 'The ExoPlayer library.' + releaseDescription = 'The ExoPlayer library (all modules).' } -apply from: '../publish.gradle' +apply from: '../../publish.gradle' diff --git a/library/src/main/AndroidManifest.xml b/library/all/src/main/AndroidManifest.xml similarity index 100% rename from library/src/main/AndroidManifest.xml rename to library/all/src/main/AndroidManifest.xml diff --git a/library/core/build.gradle b/library/core/build.gradle new file mode 100644 index 0000000000..980d5ffe2c --- /dev/null +++ b/library/core/build.gradle @@ -0,0 +1,52 @@ +// Copyright (C) 2016 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +apply plugin: 'com.android.library' + +android { + compileSdkVersion project.ext.compileSdkVersion + buildToolsVersion project.ext.buildToolsVersion + + defaultConfig { + minSdkVersion project.ext.minSdkVersion + targetSdkVersion project.ext.targetSdkVersion + consumerProguardFiles 'proguard-rules.txt' + } + + buildTypes { + // Re-enable test coverage when the following issue is fixed: + // https://code.google.com/p/android/issues/detail?id=226070 + // debug { + // testCoverageEnabled = true + // } + } + + sourceSets { + androidTest { + java.srcDirs += "../../testutils/src/main/java/" + } + } +} + +dependencies { + compile 'com.android.support:support-annotations:25.2.0' + androidTestCompile 'com.google.dexmaker:dexmaker:1.2' + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestCompile 'org.mockito:mockito-core:1.9.5' +} + +ext { + releaseArtifact = 'exoplayer-core' + releaseDescription = 'The ExoPlayer library core module.' +} +apply from: '../../publish.gradle' diff --git a/library/proguard-rules.txt b/library/core/proguard-rules.txt similarity index 100% rename from library/proguard-rules.txt rename to library/core/proguard-rules.txt diff --git a/library/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml similarity index 90% rename from library/src/androidTest/AndroidManifest.xml rename to library/core/src/androidTest/AndroidManifest.xml index d8c7a2ce9f..9eab386b51 100644 --- a/library/src/androidTest/AndroidManifest.xml +++ b/library/core/src/androidTest/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.google.android.exoplayer2.core.test"> @@ -27,7 +27,7 @@ diff --git a/library/src/androidTest/assets/dash/sample_mpd_1 b/library/core/src/androidTest/assets/dash/sample_mpd_1 similarity index 100% rename from library/src/androidTest/assets/dash/sample_mpd_1 rename to library/core/src/androidTest/assets/dash/sample_mpd_1 diff --git a/library/src/androidTest/assets/dash/sample_mpd_2_unknown_mime_type b/library/core/src/androidTest/assets/dash/sample_mpd_2_unknown_mime_type similarity index 100% rename from library/src/androidTest/assets/dash/sample_mpd_2_unknown_mime_type rename to library/core/src/androidTest/assets/dash/sample_mpd_2_unknown_mime_type diff --git a/library/src/androidTest/assets/dash/sample_mpd_3_segment_template b/library/core/src/androidTest/assets/dash/sample_mpd_3_segment_template similarity index 100% rename from library/src/androidTest/assets/dash/sample_mpd_3_segment_template rename to library/core/src/androidTest/assets/dash/sample_mpd_3_segment_template diff --git a/library/src/androidTest/assets/flv/sample.flv b/library/core/src/androidTest/assets/flv/sample.flv similarity index 100% rename from library/src/androidTest/assets/flv/sample.flv rename to library/core/src/androidTest/assets/flv/sample.flv diff --git a/library/src/androidTest/assets/flv/sample.flv.0.dump b/library/core/src/androidTest/assets/flv/sample.flv.0.dump similarity index 100% rename from library/src/androidTest/assets/flv/sample.flv.0.dump rename to library/core/src/androidTest/assets/flv/sample.flv.0.dump diff --git a/library/src/androidTest/assets/mkv/sample.mkv b/library/core/src/androidTest/assets/mkv/sample.mkv similarity index 100% rename from library/src/androidTest/assets/mkv/sample.mkv rename to library/core/src/androidTest/assets/mkv/sample.mkv diff --git a/library/src/androidTest/assets/mkv/sample.mkv.0.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.0.dump similarity index 100% rename from library/src/androidTest/assets/mkv/sample.mkv.0.dump rename to library/core/src/androidTest/assets/mkv/sample.mkv.0.dump diff --git a/library/src/androidTest/assets/mkv/sample.mkv.1.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.1.dump similarity index 100% rename from library/src/androidTest/assets/mkv/sample.mkv.1.dump rename to library/core/src/androidTest/assets/mkv/sample.mkv.1.dump diff --git a/library/src/androidTest/assets/mkv/sample.mkv.2.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.2.dump similarity index 100% rename from library/src/androidTest/assets/mkv/sample.mkv.2.dump rename to library/core/src/androidTest/assets/mkv/sample.mkv.2.dump diff --git a/library/src/androidTest/assets/mkv/sample.mkv.3.dump b/library/core/src/androidTest/assets/mkv/sample.mkv.3.dump similarity index 100% rename from library/src/androidTest/assets/mkv/sample.mkv.3.dump rename to library/core/src/androidTest/assets/mkv/sample.mkv.3.dump diff --git a/library/src/androidTest/assets/mkv/subsample_encrypted_altref.webm b/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm similarity index 100% rename from library/src/androidTest/assets/mkv/subsample_encrypted_altref.webm rename to library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm diff --git a/library/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump b/library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump similarity index 100% rename from library/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump rename to library/core/src/androidTest/assets/mkv/subsample_encrypted_altref.webm.0.dump diff --git a/library/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm b/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm similarity index 100% rename from library/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm rename to library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm diff --git a/library/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump b/library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump similarity index 100% rename from library/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump rename to library/core/src/androidTest/assets/mkv/subsample_encrypted_noaltref.webm.0.dump diff --git a/library/src/androidTest/assets/mp3/bear.mp3 b/library/core/src/androidTest/assets/mp3/bear.mp3 similarity index 100% rename from library/src/androidTest/assets/mp3/bear.mp3 rename to library/core/src/androidTest/assets/mp3/bear.mp3 diff --git a/library/src/androidTest/assets/mp3/bear.mp3.0.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.0.dump similarity index 100% rename from library/src/androidTest/assets/mp3/bear.mp3.0.dump rename to library/core/src/androidTest/assets/mp3/bear.mp3.0.dump diff --git a/library/src/androidTest/assets/mp3/bear.mp3.1.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.1.dump similarity index 100% rename from library/src/androidTest/assets/mp3/bear.mp3.1.dump rename to library/core/src/androidTest/assets/mp3/bear.mp3.1.dump diff --git a/library/src/androidTest/assets/mp3/bear.mp3.2.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.2.dump similarity index 100% rename from library/src/androidTest/assets/mp3/bear.mp3.2.dump rename to library/core/src/androidTest/assets/mp3/bear.mp3.2.dump diff --git a/library/src/androidTest/assets/mp3/bear.mp3.3.dump b/library/core/src/androidTest/assets/mp3/bear.mp3.3.dump similarity index 100% rename from library/src/androidTest/assets/mp3/bear.mp3.3.dump rename to library/core/src/androidTest/assets/mp3/bear.mp3.3.dump diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3 b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3 similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3 rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3 diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3.0.dump diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3.1.dump diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3.2.dump diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3.3.dump diff --git a/library/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump b/library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump similarity index 100% rename from library/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump rename to library/core/src/androidTest/assets/mp3/play-trimmed.mp3.unklen.dump diff --git a/library/src/androidTest/assets/mp4/sample.mp4 b/library/core/src/androidTest/assets/mp4/sample.mp4 similarity index 100% rename from library/src/androidTest/assets/mp4/sample.mp4 rename to library/core/src/androidTest/assets/mp4/sample.mp4 diff --git a/library/src/androidTest/assets/mp4/sample.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.0.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample.mp4.0.dump rename to library/core/src/androidTest/assets/mp4/sample.mp4.0.dump diff --git a/library/src/androidTest/assets/mp4/sample.mp4.1.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.1.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample.mp4.1.dump rename to library/core/src/androidTest/assets/mp4/sample.mp4.1.dump diff --git a/library/src/androidTest/assets/mp4/sample.mp4.2.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.2.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample.mp4.2.dump rename to library/core/src/androidTest/assets/mp4/sample.mp4.2.dump diff --git a/library/src/androidTest/assets/mp4/sample.mp4.3.dump b/library/core/src/androidTest/assets/mp4/sample.mp4.3.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample.mp4.3.dump rename to library/core/src/androidTest/assets/mp4/sample.mp4.3.dump diff --git a/library/src/androidTest/assets/mp4/sample_fragmented.mp4 b/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4 similarity index 100% rename from library/src/androidTest/assets/mp4/sample_fragmented.mp4 rename to library/core/src/androidTest/assets/mp4/sample_fragmented.mp4 diff --git a/library/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump rename to library/core/src/androidTest/assets/mp4/sample_fragmented.mp4.0.dump diff --git a/library/src/androidTest/assets/mp4/sample_fragmented_sei.mp4 b/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4 similarity index 100% rename from library/src/androidTest/assets/mp4/sample_fragmented_sei.mp4 rename to library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4 diff --git a/library/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump b/library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump similarity index 100% rename from library/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump rename to library/core/src/androidTest/assets/mp4/sample_fragmented_sei.mp4.0.dump diff --git a/library/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 b/library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 similarity index 100% rename from library/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 rename to library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 diff --git a/library/src/androidTest/assets/ogg/bear.opus b/library/core/src/androidTest/assets/ogg/bear.opus similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus rename to library/core/src/androidTest/assets/ogg/bear.opus diff --git a/library/src/androidTest/assets/ogg/bear.opus.0.dump b/library/core/src/androidTest/assets/ogg/bear.opus.0.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus.0.dump rename to library/core/src/androidTest/assets/ogg/bear.opus.0.dump diff --git a/library/src/androidTest/assets/ogg/bear.opus.1.dump b/library/core/src/androidTest/assets/ogg/bear.opus.1.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus.1.dump rename to library/core/src/androidTest/assets/ogg/bear.opus.1.dump diff --git a/library/src/androidTest/assets/ogg/bear.opus.2.dump b/library/core/src/androidTest/assets/ogg/bear.opus.2.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus.2.dump rename to library/core/src/androidTest/assets/ogg/bear.opus.2.dump diff --git a/library/src/androidTest/assets/ogg/bear.opus.3.dump b/library/core/src/androidTest/assets/ogg/bear.opus.3.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus.3.dump rename to library/core/src/androidTest/assets/ogg/bear.opus.3.dump diff --git a/library/src/androidTest/assets/ogg/bear.opus.unklen.dump b/library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear.opus.unklen.dump rename to library/core/src/androidTest/assets/ogg/bear.opus.unklen.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg b/library/core/src/androidTest/assets/ogg/bear_flac.ogg similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg.0.dump rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg.0.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg.1.dump rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg.1.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg.2.dump rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg.2.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg.3.dump rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg.3.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump rename to library/core/src/androidTest/assets/ogg/bear_flac.ogg.unklen.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.0.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.1.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.2.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.3.dump diff --git a/library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump rename to library/core/src/androidTest/assets/ogg/bear_flac_noseektable.ogg.unklen.dump diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.0.dump diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.1.dump diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.2.dump diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.3.dump diff --git a/library/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump b/library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump similarity index 100% rename from library/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump rename to library/core/src/androidTest/assets/ogg/bear_vorbis.ogg.unklen.dump diff --git a/library/src/androidTest/assets/rawcc/sample.rawcc b/library/core/src/androidTest/assets/rawcc/sample.rawcc similarity index 100% rename from library/src/androidTest/assets/rawcc/sample.rawcc rename to library/core/src/androidTest/assets/rawcc/sample.rawcc diff --git a/library/src/androidTest/assets/rawcc/sample.rawcc.0.dump b/library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump similarity index 100% rename from library/src/androidTest/assets/rawcc/sample.rawcc.0.dump rename to library/core/src/androidTest/assets/rawcc/sample.rawcc.0.dump diff --git a/library/src/androidTest/assets/smoothstreaming/sample_ismc_1 b/library/core/src/androidTest/assets/smoothstreaming/sample_ismc_1 similarity index 100% rename from library/src/androidTest/assets/smoothstreaming/sample_ismc_1 rename to library/core/src/androidTest/assets/smoothstreaming/sample_ismc_1 diff --git a/library/src/androidTest/assets/smoothstreaming/sample_ismc_2 b/library/core/src/androidTest/assets/smoothstreaming/sample_ismc_2 similarity index 100% rename from library/src/androidTest/assets/smoothstreaming/sample_ismc_2 rename to library/core/src/androidTest/assets/smoothstreaming/sample_ismc_2 diff --git a/library/src/androidTest/assets/subrip/empty b/library/core/src/androidTest/assets/subrip/empty similarity index 100% rename from library/src/androidTest/assets/subrip/empty rename to library/core/src/androidTest/assets/subrip/empty diff --git a/library/src/androidTest/assets/subrip/no_end_timecodes b/library/core/src/androidTest/assets/subrip/no_end_timecodes similarity index 100% rename from library/src/androidTest/assets/subrip/no_end_timecodes rename to library/core/src/androidTest/assets/subrip/no_end_timecodes diff --git a/library/src/androidTest/assets/subrip/typical b/library/core/src/androidTest/assets/subrip/typical similarity index 100% rename from library/src/androidTest/assets/subrip/typical rename to library/core/src/androidTest/assets/subrip/typical diff --git a/library/src/androidTest/assets/subrip/typical_extra_blank_line b/library/core/src/androidTest/assets/subrip/typical_extra_blank_line similarity index 100% rename from library/src/androidTest/assets/subrip/typical_extra_blank_line rename to library/core/src/androidTest/assets/subrip/typical_extra_blank_line diff --git a/library/src/androidTest/assets/subrip/typical_missing_sequence b/library/core/src/androidTest/assets/subrip/typical_missing_sequence similarity index 100% rename from library/src/androidTest/assets/subrip/typical_missing_sequence rename to library/core/src/androidTest/assets/subrip/typical_missing_sequence diff --git a/library/src/androidTest/assets/subrip/typical_missing_timecode b/library/core/src/androidTest/assets/subrip/typical_missing_timecode similarity index 100% rename from library/src/androidTest/assets/subrip/typical_missing_timecode rename to library/core/src/androidTest/assets/subrip/typical_missing_timecode diff --git a/library/src/androidTest/assets/subrip/typical_negative_timestamps b/library/core/src/androidTest/assets/subrip/typical_negative_timestamps similarity index 100% rename from library/src/androidTest/assets/subrip/typical_negative_timestamps rename to library/core/src/androidTest/assets/subrip/typical_negative_timestamps diff --git a/library/src/androidTest/assets/subrip/typical_with_byte_order_mark b/library/core/src/androidTest/assets/subrip/typical_with_byte_order_mark similarity index 100% rename from library/src/androidTest/assets/subrip/typical_with_byte_order_mark rename to library/core/src/androidTest/assets/subrip/typical_with_byte_order_mark diff --git a/library/src/androidTest/assets/ts/sample.ac3 b/library/core/src/androidTest/assets/ts/sample.ac3 similarity index 100% rename from library/src/androidTest/assets/ts/sample.ac3 rename to library/core/src/androidTest/assets/ts/sample.ac3 diff --git a/library/src/androidTest/assets/ts/sample.ac3.0.dump b/library/core/src/androidTest/assets/ts/sample.ac3.0.dump similarity index 100% rename from library/src/androidTest/assets/ts/sample.ac3.0.dump rename to library/core/src/androidTest/assets/ts/sample.ac3.0.dump diff --git a/library/src/androidTest/assets/ts/sample.adts b/library/core/src/androidTest/assets/ts/sample.adts similarity index 100% rename from library/src/androidTest/assets/ts/sample.adts rename to library/core/src/androidTest/assets/ts/sample.adts diff --git a/library/src/androidTest/assets/ts/sample.adts.0.dump b/library/core/src/androidTest/assets/ts/sample.adts.0.dump similarity index 100% rename from library/src/androidTest/assets/ts/sample.adts.0.dump rename to library/core/src/androidTest/assets/ts/sample.adts.0.dump diff --git a/library/src/androidTest/assets/ts/sample.ps b/library/core/src/androidTest/assets/ts/sample.ps similarity index 100% rename from library/src/androidTest/assets/ts/sample.ps rename to library/core/src/androidTest/assets/ts/sample.ps diff --git a/library/src/androidTest/assets/ts/sample.ps.0.dump b/library/core/src/androidTest/assets/ts/sample.ps.0.dump similarity index 100% rename from library/src/androidTest/assets/ts/sample.ps.0.dump rename to library/core/src/androidTest/assets/ts/sample.ps.0.dump diff --git a/library/src/androidTest/assets/ts/sample.ts b/library/core/src/androidTest/assets/ts/sample.ts similarity index 100% rename from library/src/androidTest/assets/ts/sample.ts rename to library/core/src/androidTest/assets/ts/sample.ts diff --git a/library/src/androidTest/assets/ts/sample.ts.0.dump b/library/core/src/androidTest/assets/ts/sample.ts.0.dump similarity index 100% rename from library/src/androidTest/assets/ts/sample.ts.0.dump rename to library/core/src/androidTest/assets/ts/sample.ts.0.dump diff --git a/library/src/androidTest/assets/ts/sample_with_sdt.ts b/library/core/src/androidTest/assets/ts/sample_with_sdt.ts similarity index 100% rename from library/src/androidTest/assets/ts/sample_with_sdt.ts rename to library/core/src/androidTest/assets/ts/sample_with_sdt.ts diff --git a/library/src/androidTest/assets/ttml/chain_multiple_styles.xml b/library/core/src/androidTest/assets/ttml/chain_multiple_styles.xml similarity index 100% rename from library/src/androidTest/assets/ttml/chain_multiple_styles.xml rename to library/core/src/androidTest/assets/ttml/chain_multiple_styles.xml diff --git a/library/src/androidTest/assets/ttml/font_size.xml b/library/core/src/androidTest/assets/ttml/font_size.xml similarity index 100% rename from library/src/androidTest/assets/ttml/font_size.xml rename to library/core/src/androidTest/assets/ttml/font_size.xml diff --git a/library/src/androidTest/assets/ttml/font_size_empty.xml b/library/core/src/androidTest/assets/ttml/font_size_empty.xml similarity index 100% rename from library/src/androidTest/assets/ttml/font_size_empty.xml rename to library/core/src/androidTest/assets/ttml/font_size_empty.xml diff --git a/library/src/androidTest/assets/ttml/font_size_invalid.xml b/library/core/src/androidTest/assets/ttml/font_size_invalid.xml similarity index 100% rename from library/src/androidTest/assets/ttml/font_size_invalid.xml rename to library/core/src/androidTest/assets/ttml/font_size_invalid.xml diff --git a/library/src/androidTest/assets/ttml/font_size_no_unit.xml b/library/core/src/androidTest/assets/ttml/font_size_no_unit.xml similarity index 100% rename from library/src/androidTest/assets/ttml/font_size_no_unit.xml rename to library/core/src/androidTest/assets/ttml/font_size_no_unit.xml diff --git a/library/src/androidTest/assets/ttml/frame_rate.xml b/library/core/src/androidTest/assets/ttml/frame_rate.xml similarity index 100% rename from library/src/androidTest/assets/ttml/frame_rate.xml rename to library/core/src/androidTest/assets/ttml/frame_rate.xml diff --git a/library/src/androidTest/assets/ttml/inherit_and_override_style.xml b/library/core/src/androidTest/assets/ttml/inherit_and_override_style.xml similarity index 100% rename from library/src/androidTest/assets/ttml/inherit_and_override_style.xml rename to library/core/src/androidTest/assets/ttml/inherit_and_override_style.xml diff --git a/library/src/androidTest/assets/ttml/inherit_global_and_parent.xml b/library/core/src/androidTest/assets/ttml/inherit_global_and_parent.xml similarity index 100% rename from library/src/androidTest/assets/ttml/inherit_global_and_parent.xml rename to library/core/src/androidTest/assets/ttml/inherit_global_and_parent.xml diff --git a/library/src/androidTest/assets/ttml/inherit_multiple_styles.xml b/library/core/src/androidTest/assets/ttml/inherit_multiple_styles.xml similarity index 100% rename from library/src/androidTest/assets/ttml/inherit_multiple_styles.xml rename to library/core/src/androidTest/assets/ttml/inherit_multiple_styles.xml diff --git a/library/src/androidTest/assets/ttml/inherit_style.xml b/library/core/src/androidTest/assets/ttml/inherit_style.xml similarity index 100% rename from library/src/androidTest/assets/ttml/inherit_style.xml rename to library/core/src/androidTest/assets/ttml/inherit_style.xml diff --git a/library/src/androidTest/assets/ttml/inline_style_attributes.xml b/library/core/src/androidTest/assets/ttml/inline_style_attributes.xml similarity index 100% rename from library/src/androidTest/assets/ttml/inline_style_attributes.xml rename to library/core/src/androidTest/assets/ttml/inline_style_attributes.xml diff --git a/library/src/androidTest/assets/ttml/multiple_regions.xml b/library/core/src/androidTest/assets/ttml/multiple_regions.xml similarity index 100% rename from library/src/androidTest/assets/ttml/multiple_regions.xml rename to library/core/src/androidTest/assets/ttml/multiple_regions.xml diff --git a/library/src/androidTest/assets/ttml/no_underline_linethrough.xml b/library/core/src/androidTest/assets/ttml/no_underline_linethrough.xml similarity index 100% rename from library/src/androidTest/assets/ttml/no_underline_linethrough.xml rename to library/core/src/androidTest/assets/ttml/no_underline_linethrough.xml diff --git a/library/src/androidTest/assets/wav/sample.wav b/library/core/src/androidTest/assets/wav/sample.wav similarity index 100% rename from library/src/androidTest/assets/wav/sample.wav rename to library/core/src/androidTest/assets/wav/sample.wav diff --git a/library/src/androidTest/assets/wav/sample.wav.0.dump b/library/core/src/androidTest/assets/wav/sample.wav.0.dump similarity index 100% rename from library/src/androidTest/assets/wav/sample.wav.0.dump rename to library/core/src/androidTest/assets/wav/sample.wav.0.dump diff --git a/library/src/androidTest/assets/wav/sample.wav.1.dump b/library/core/src/androidTest/assets/wav/sample.wav.1.dump similarity index 100% rename from library/src/androidTest/assets/wav/sample.wav.1.dump rename to library/core/src/androidTest/assets/wav/sample.wav.1.dump diff --git a/library/src/androidTest/assets/wav/sample.wav.2.dump b/library/core/src/androidTest/assets/wav/sample.wav.2.dump similarity index 100% rename from library/src/androidTest/assets/wav/sample.wav.2.dump rename to library/core/src/androidTest/assets/wav/sample.wav.2.dump diff --git a/library/src/androidTest/assets/wav/sample.wav.3.dump b/library/core/src/androidTest/assets/wav/sample.wav.3.dump similarity index 100% rename from library/src/androidTest/assets/wav/sample.wav.3.dump rename to library/core/src/androidTest/assets/wav/sample.wav.3.dump diff --git a/library/src/androidTest/assets/webm/vorbis_codec_private b/library/core/src/androidTest/assets/webm/vorbis_codec_private similarity index 100% rename from library/src/androidTest/assets/webm/vorbis_codec_private rename to library/core/src/androidTest/assets/webm/vorbis_codec_private diff --git a/library/src/androidTest/assets/webvtt/empty b/library/core/src/androidTest/assets/webvtt/empty similarity index 100% rename from library/src/androidTest/assets/webvtt/empty rename to library/core/src/androidTest/assets/webvtt/empty diff --git a/library/src/androidTest/assets/webvtt/typical b/library/core/src/androidTest/assets/webvtt/typical similarity index 100% rename from library/src/androidTest/assets/webvtt/typical rename to library/core/src/androidTest/assets/webvtt/typical diff --git a/library/src/androidTest/assets/webvtt/typical_with_comments b/library/core/src/androidTest/assets/webvtt/typical_with_comments similarity index 100% rename from library/src/androidTest/assets/webvtt/typical_with_comments rename to library/core/src/androidTest/assets/webvtt/typical_with_comments diff --git a/library/src/androidTest/assets/webvtt/typical_with_identifiers b/library/core/src/androidTest/assets/webvtt/typical_with_identifiers similarity index 100% rename from library/src/androidTest/assets/webvtt/typical_with_identifiers rename to library/core/src/androidTest/assets/webvtt/typical_with_identifiers diff --git a/library/src/androidTest/assets/webvtt/with_bad_cue_header b/library/core/src/androidTest/assets/webvtt/with_bad_cue_header similarity index 100% rename from library/src/androidTest/assets/webvtt/with_bad_cue_header rename to library/core/src/androidTest/assets/webvtt/with_bad_cue_header diff --git a/library/src/androidTest/assets/webvtt/with_css_complex_selectors b/library/core/src/androidTest/assets/webvtt/with_css_complex_selectors similarity index 100% rename from library/src/androidTest/assets/webvtt/with_css_complex_selectors rename to library/core/src/androidTest/assets/webvtt/with_css_complex_selectors diff --git a/library/src/androidTest/assets/webvtt/with_css_styles b/library/core/src/androidTest/assets/webvtt/with_css_styles similarity index 100% rename from library/src/androidTest/assets/webvtt/with_css_styles rename to library/core/src/androidTest/assets/webvtt/with_css_styles diff --git a/library/src/androidTest/assets/webvtt/with_positioning b/library/core/src/androidTest/assets/webvtt/with_positioning similarity index 100% rename from library/src/androidTest/assets/webvtt/with_positioning rename to library/core/src/androidTest/assets/webvtt/with_positioning diff --git a/library/src/androidTest/assets/webvtt/with_tags b/library/core/src/androidTest/assets/webvtt/with_tags similarity index 100% rename from library/src/androidTest/assets/webvtt/with_tags rename to library/core/src/androidTest/assets/webvtt/with_tags diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/CTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/CTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RangedUriTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplateTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndexTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpanTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java diff --git a/library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java similarity index 100% rename from library/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java rename to library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java diff --git a/library/core/src/main/AndroidManifest.xml b/library/core/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..430930a3ca --- /dev/null +++ b/library/core/src/main/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + + diff --git a/library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/BaseRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/C.java b/library/core/src/main/java/com/google/android/exoplayer2/C.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/C.java rename to library/core/src/main/java/com/google/android/exoplayer2/C.java diff --git a/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java rename to library/core/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java rename to library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java diff --git a/library/src/main/java/com/google/android/exoplayer2/Format.java b/library/core/src/main/java/com/google/android/exoplayer2/Format.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/Format.java rename to library/core/src/main/java/com/google/android/exoplayer2/Format.java diff --git a/library/src/main/java/com/google/android/exoplayer2/FormatHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/FormatHolder.java rename to library/core/src/main/java/com/google/android/exoplayer2/FormatHolder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java b/library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java rename to library/core/src/main/java/com/google/android/exoplayer2/IllegalSeekPositionException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/LoadControl.java b/library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/LoadControl.java rename to library/core/src/main/java/com/google/android/exoplayer2/LoadControl.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ParserException.java b/library/core/src/main/java/com/google/android/exoplayer2/ParserException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ParserException.java rename to library/core/src/main/java/com/google/android/exoplayer2/ParserException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/Renderer.java b/library/core/src/main/java/com/google/android/exoplayer2/Renderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/Renderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/Renderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java rename to library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java diff --git a/library/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java rename to library/core/src/main/java/com/google/android/exoplayer2/RendererConfiguration.java diff --git a/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java rename to library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/Timeline.java b/library/core/src/main/java/com/google/android/exoplayer2/Timeline.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/Timeline.java rename to library/core/src/main/java/com/google/android/exoplayer2/Timeline.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioDecoderException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioProcessor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/ChannelMappingAudioProcessor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/ResamplingAudioProcessor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/Decoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/OutputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/decoder/SimpleOutputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSessionManager.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaDrm.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaCrypto.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/HttpMediaDrmCallback.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/OfflineLicenseHelper.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/drm/WidevineUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/MpegAudioHeader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java rename to library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecInfo.java diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecSelector.java diff --git a/library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderException.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderException.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoderFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java rename to library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java b/library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/BehindLiveWindowException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/ExtractorMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/LoopingMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/MediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/MediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/MergingMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/SampleStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/SampleStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/SinglePeriodTimeline.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/SingleSampleMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroup.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java b/library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/TrackGroupArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java b/library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/UnrecognizedInputFormatException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/Chunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkExtractorWrapper.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkHolder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkedTrackBlacklistUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ContainerMediaChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/DataChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/InitializationChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/MediaChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/chunk/SingleSampleMediaChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashSegmentIndex.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DashWrappingSegmentIndex.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/AdaptationSet.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifest.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Period.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RangedUri.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SchemeValuePair.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SchemeValuePair.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SchemeValuePair.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SchemeValuePair.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SegmentBase.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/SingleSegmentIndex.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UrlTemplate.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java b/library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/dash/manifest/UtcTimingElement.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/Aes128DataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsManifest.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/TimestampAdjusterProvider.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylist.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylist.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistTracker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/DefaultSsChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsChunkSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaPeriod.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifest.java diff --git a/library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java b/library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java b/library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/Cue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/Cue.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/Subtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/Subtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/Subtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleDecoderFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Cue.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaOutputBuffer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java rename to library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelection.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/BaseTrackSelection.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/FixedTrackSelection.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/RandomTrackSelection.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelection.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectionArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelector.java diff --git a/library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java b/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java rename to library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorResult.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java index d3034a8bc8..3b17e4ddcf 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ui/AspectRatioFrameLayout.java @@ -21,7 +21,7 @@ import android.support.annotation.IntDef; import android.util.AttributeSet; import android.widget.FrameLayout; -import com.google.android.exoplayer2.R; +import com.google.android.exoplayer2.core.R; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/DebugTextViewHelper.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java index dc3c398357..4bde88d972 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ui/PlaybackControlView.java @@ -29,8 +29,8 @@ import android.widget.TextView; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; -import com.google.android.exoplayer2.R; import com.google.android.exoplayer2.Timeline; +import com.google.android.exoplayer2.core.R; import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.util.Util; diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java index 3349e05eda..2dfb165960 100644 --- a/library/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/ui/SimpleExoPlayerView.java @@ -33,9 +33,9 @@ import android.widget.ImageView; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayer; -import com.google.android.exoplayer2.R; import com.google.android.exoplayer2.SimpleExoPlayer; import com.google.android.exoplayer2.Timeline; +import com.google.android.exoplayer2.core.R; import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.id3.ApicFrame; import com.google.android.exoplayer2.source.TrackGroupArray; diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java diff --git a/library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java b/library/core/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java rename to library/core/src/main/java/com/google/android/exoplayer2/ui/SubtitleView.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/FileDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/Loader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/LoaderErrorThrower.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/RawResourceDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSinkFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceFactory.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContent.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTracker.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheSpan.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java diff --git a/library/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/CryptoUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/Assertions.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/AtomicFile.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Clock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/Clock.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/Clock.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ClosedSource.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ClosedSource.java new file mode 100644 index 0000000000..ea70920d20 --- /dev/null +++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ClosedSource.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.android.exoplayer2.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * An annotation for classes and interfaces that should not be open sourced. + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.SOURCE) +@ClosedSource(reason = "Not required") +public @interface ClosedSource { + String reason(); +} diff --git a/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ColorParser.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/LongArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/LongArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/LongArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/LongArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/MediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/MediaClock.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/MediaClock.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Predicate.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Predicate.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/Predicate.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/Predicate.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java b/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java b/library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStream.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java b/library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/SystemClock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/SystemClock.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/SystemClock.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java b/library/core/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/UriUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/UriUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/UriUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/Util.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/Util.java diff --git a/library/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java rename to library/core/src/main/java/com/google/android/exoplayer2/util/XmlPullParserUtil.java diff --git a/library/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java b/library/core/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java rename to library/core/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java diff --git a/library/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java b/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java rename to library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java diff --git a/library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java rename to library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java diff --git a/library/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java rename to library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java diff --git a/library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java similarity index 100% rename from library/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java rename to library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/exoplayer-threading-model.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/renderer-states.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-advanced.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-indefinite.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-limited.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-live-multi-period.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-period.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-playlist.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-single-file.svg diff --git a/library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg b/library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg similarity index 100% rename from library/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg rename to library/core/src/main/javadoc/com/google/android/exoplayer2/doc-files/timeline-window.svg diff --git a/library/core/src/main/proguard-rules.txt b/library/core/src/main/proguard-rules.txt new file mode 100644 index 0000000000..75f2d095be --- /dev/null +++ b/library/core/src/main/proguard-rules.txt @@ -0,0 +1,7 @@ +# Accessed via reflection in SubtitleDecoderFactory.DEFAULT +-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea608Decoder { + public (java.lang.String, int); +} +-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea708Decoder { + public (int); +} diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_fastforward.xml diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_next.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_next.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_next.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_next.xml diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_pause.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_pause.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_pause.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_pause.xml diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_play.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_play.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_play.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_play.xml diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_previous.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_previous.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_previous.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_previous.xml diff --git a/library/src/main/res/drawable-anydpi-v21/exo_controls_rewind.xml b/library/core/src/main/res/drawable-anydpi-v21/exo_controls_rewind.xml similarity index 100% rename from library/src/main/res/drawable-anydpi-v21/exo_controls_rewind.xml rename to library/core/src/main/res/drawable-anydpi-v21/exo_controls_rewind.xml diff --git a/library/src/main/res/drawable-hdpi/exo_controls_fastforward.png b/library/core/src/main/res/drawable-hdpi/exo_controls_fastforward.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_fastforward.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_fastforward.png diff --git a/library/src/main/res/drawable-hdpi/exo_controls_next.png b/library/core/src/main/res/drawable-hdpi/exo_controls_next.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_next.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_next.png diff --git a/library/src/main/res/drawable-hdpi/exo_controls_pause.png b/library/core/src/main/res/drawable-hdpi/exo_controls_pause.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_pause.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_pause.png diff --git a/library/src/main/res/drawable-hdpi/exo_controls_play.png b/library/core/src/main/res/drawable-hdpi/exo_controls_play.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_play.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_play.png diff --git a/library/src/main/res/drawable-hdpi/exo_controls_previous.png b/library/core/src/main/res/drawable-hdpi/exo_controls_previous.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_previous.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_previous.png diff --git a/library/src/main/res/drawable-hdpi/exo_controls_rewind.png b/library/core/src/main/res/drawable-hdpi/exo_controls_rewind.png similarity index 100% rename from library/src/main/res/drawable-hdpi/exo_controls_rewind.png rename to library/core/src/main/res/drawable-hdpi/exo_controls_rewind.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_fastforward.png b/library/core/src/main/res/drawable-ldpi/exo_controls_fastforward.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_fastforward.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_fastforward.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_next.png b/library/core/src/main/res/drawable-ldpi/exo_controls_next.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_next.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_next.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_pause.png b/library/core/src/main/res/drawable-ldpi/exo_controls_pause.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_pause.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_pause.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_play.png b/library/core/src/main/res/drawable-ldpi/exo_controls_play.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_play.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_play.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_previous.png b/library/core/src/main/res/drawable-ldpi/exo_controls_previous.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_previous.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_previous.png diff --git a/library/src/main/res/drawable-ldpi/exo_controls_rewind.png b/library/core/src/main/res/drawable-ldpi/exo_controls_rewind.png similarity index 100% rename from library/src/main/res/drawable-ldpi/exo_controls_rewind.png rename to library/core/src/main/res/drawable-ldpi/exo_controls_rewind.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_fastforward.png b/library/core/src/main/res/drawable-mdpi/exo_controls_fastforward.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_fastforward.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_fastforward.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_next.png b/library/core/src/main/res/drawable-mdpi/exo_controls_next.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_next.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_next.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_pause.png b/library/core/src/main/res/drawable-mdpi/exo_controls_pause.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_pause.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_pause.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_play.png b/library/core/src/main/res/drawable-mdpi/exo_controls_play.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_play.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_play.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_previous.png b/library/core/src/main/res/drawable-mdpi/exo_controls_previous.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_previous.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_previous.png diff --git a/library/src/main/res/drawable-mdpi/exo_controls_rewind.png b/library/core/src/main/res/drawable-mdpi/exo_controls_rewind.png similarity index 100% rename from library/src/main/res/drawable-mdpi/exo_controls_rewind.png rename to library/core/src/main/res/drawable-mdpi/exo_controls_rewind.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_fastforward.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_fastforward.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_fastforward.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_fastforward.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_next.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_next.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_next.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_next.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_pause.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_pause.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_pause.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_pause.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_play.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_play.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_play.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_play.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_previous.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_previous.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_previous.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_previous.png diff --git a/library/src/main/res/drawable-xhdpi/exo_controls_rewind.png b/library/core/src/main/res/drawable-xhdpi/exo_controls_rewind.png similarity index 100% rename from library/src/main/res/drawable-xhdpi/exo_controls_rewind.png rename to library/core/src/main/res/drawable-xhdpi/exo_controls_rewind.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_fastforward.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_fastforward.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_fastforward.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_fastforward.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_next.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_next.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_next.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_next.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_pause.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_pause.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_pause.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_pause.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_play.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_play.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_play.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_play.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_previous.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_previous.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_previous.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_previous.png diff --git a/library/src/main/res/drawable-xxhdpi/exo_controls_rewind.png b/library/core/src/main/res/drawable-xxhdpi/exo_controls_rewind.png similarity index 100% rename from library/src/main/res/drawable-xxhdpi/exo_controls_rewind.png rename to library/core/src/main/res/drawable-xxhdpi/exo_controls_rewind.png diff --git a/library/src/main/res/layout/exo_playback_control_view.xml b/library/core/src/main/res/layout/exo_playback_control_view.xml similarity index 100% rename from library/src/main/res/layout/exo_playback_control_view.xml rename to library/core/src/main/res/layout/exo_playback_control_view.xml diff --git a/library/src/main/res/layout/exo_simple_player_view.xml b/library/core/src/main/res/layout/exo_simple_player_view.xml similarity index 100% rename from library/src/main/res/layout/exo_simple_player_view.xml rename to library/core/src/main/res/layout/exo_simple_player_view.xml diff --git a/library/src/main/res/values-af/strings.xml b/library/core/src/main/res/values-af/strings.xml similarity index 100% rename from library/src/main/res/values-af/strings.xml rename to library/core/src/main/res/values-af/strings.xml diff --git a/library/src/main/res/values-am/strings.xml b/library/core/src/main/res/values-am/strings.xml similarity index 100% rename from library/src/main/res/values-am/strings.xml rename to library/core/src/main/res/values-am/strings.xml diff --git a/library/src/main/res/values-ar/strings.xml b/library/core/src/main/res/values-ar/strings.xml similarity index 100% rename from library/src/main/res/values-ar/strings.xml rename to library/core/src/main/res/values-ar/strings.xml diff --git a/library/src/main/res/values-az-rAZ/strings.xml b/library/core/src/main/res/values-az-rAZ/strings.xml similarity index 100% rename from library/src/main/res/values-az-rAZ/strings.xml rename to library/core/src/main/res/values-az-rAZ/strings.xml diff --git a/library/src/main/res/values-b+sr+Latn/strings.xml b/library/core/src/main/res/values-b+sr+Latn/strings.xml similarity index 100% rename from library/src/main/res/values-b+sr+Latn/strings.xml rename to library/core/src/main/res/values-b+sr+Latn/strings.xml diff --git a/library/src/main/res/values-be-rBY/strings.xml b/library/core/src/main/res/values-be-rBY/strings.xml similarity index 100% rename from library/src/main/res/values-be-rBY/strings.xml rename to library/core/src/main/res/values-be-rBY/strings.xml diff --git a/library/src/main/res/values-bg/strings.xml b/library/core/src/main/res/values-bg/strings.xml similarity index 100% rename from library/src/main/res/values-bg/strings.xml rename to library/core/src/main/res/values-bg/strings.xml diff --git a/library/src/main/res/values-bn-rBD/strings.xml b/library/core/src/main/res/values-bn-rBD/strings.xml similarity index 100% rename from library/src/main/res/values-bn-rBD/strings.xml rename to library/core/src/main/res/values-bn-rBD/strings.xml diff --git a/library/src/main/res/values-bs-rBA/strings.xml b/library/core/src/main/res/values-bs-rBA/strings.xml similarity index 100% rename from library/src/main/res/values-bs-rBA/strings.xml rename to library/core/src/main/res/values-bs-rBA/strings.xml diff --git a/library/src/main/res/values-ca/strings.xml b/library/core/src/main/res/values-ca/strings.xml similarity index 100% rename from library/src/main/res/values-ca/strings.xml rename to library/core/src/main/res/values-ca/strings.xml diff --git a/library/src/main/res/values-cs/strings.xml b/library/core/src/main/res/values-cs/strings.xml similarity index 100% rename from library/src/main/res/values-cs/strings.xml rename to library/core/src/main/res/values-cs/strings.xml diff --git a/library/src/main/res/values-da/strings.xml b/library/core/src/main/res/values-da/strings.xml similarity index 100% rename from library/src/main/res/values-da/strings.xml rename to library/core/src/main/res/values-da/strings.xml diff --git a/library/src/main/res/values-de/strings.xml b/library/core/src/main/res/values-de/strings.xml similarity index 100% rename from library/src/main/res/values-de/strings.xml rename to library/core/src/main/res/values-de/strings.xml diff --git a/library/src/main/res/values-el/strings.xml b/library/core/src/main/res/values-el/strings.xml similarity index 100% rename from library/src/main/res/values-el/strings.xml rename to library/core/src/main/res/values-el/strings.xml diff --git a/library/src/main/res/values-en-rAU/strings.xml b/library/core/src/main/res/values-en-rAU/strings.xml similarity index 100% rename from library/src/main/res/values-en-rAU/strings.xml rename to library/core/src/main/res/values-en-rAU/strings.xml diff --git a/library/src/main/res/values-en-rGB/strings.xml b/library/core/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from library/src/main/res/values-en-rGB/strings.xml rename to library/core/src/main/res/values-en-rGB/strings.xml diff --git a/library/src/main/res/values-en-rIN/strings.xml b/library/core/src/main/res/values-en-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-en-rIN/strings.xml rename to library/core/src/main/res/values-en-rIN/strings.xml diff --git a/library/src/main/res/values-es-rUS/strings.xml b/library/core/src/main/res/values-es-rUS/strings.xml similarity index 100% rename from library/src/main/res/values-es-rUS/strings.xml rename to library/core/src/main/res/values-es-rUS/strings.xml diff --git a/library/src/main/res/values-es/strings.xml b/library/core/src/main/res/values-es/strings.xml similarity index 100% rename from library/src/main/res/values-es/strings.xml rename to library/core/src/main/res/values-es/strings.xml diff --git a/library/src/main/res/values-et-rEE/strings.xml b/library/core/src/main/res/values-et-rEE/strings.xml similarity index 100% rename from library/src/main/res/values-et-rEE/strings.xml rename to library/core/src/main/res/values-et-rEE/strings.xml diff --git a/library/src/main/res/values-eu-rES/strings.xml b/library/core/src/main/res/values-eu-rES/strings.xml similarity index 100% rename from library/src/main/res/values-eu-rES/strings.xml rename to library/core/src/main/res/values-eu-rES/strings.xml diff --git a/library/src/main/res/values-fa/strings.xml b/library/core/src/main/res/values-fa/strings.xml similarity index 100% rename from library/src/main/res/values-fa/strings.xml rename to library/core/src/main/res/values-fa/strings.xml diff --git a/library/src/main/res/values-fi/strings.xml b/library/core/src/main/res/values-fi/strings.xml similarity index 100% rename from library/src/main/res/values-fi/strings.xml rename to library/core/src/main/res/values-fi/strings.xml diff --git a/library/src/main/res/values-fr-rCA/strings.xml b/library/core/src/main/res/values-fr-rCA/strings.xml similarity index 100% rename from library/src/main/res/values-fr-rCA/strings.xml rename to library/core/src/main/res/values-fr-rCA/strings.xml diff --git a/library/src/main/res/values-fr/strings.xml b/library/core/src/main/res/values-fr/strings.xml similarity index 100% rename from library/src/main/res/values-fr/strings.xml rename to library/core/src/main/res/values-fr/strings.xml diff --git a/library/src/main/res/values-gl-rES/strings.xml b/library/core/src/main/res/values-gl-rES/strings.xml similarity index 100% rename from library/src/main/res/values-gl-rES/strings.xml rename to library/core/src/main/res/values-gl-rES/strings.xml diff --git a/library/src/main/res/values-gu-rIN/strings.xml b/library/core/src/main/res/values-gu-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-gu-rIN/strings.xml rename to library/core/src/main/res/values-gu-rIN/strings.xml diff --git a/library/src/main/res/values-hi/strings.xml b/library/core/src/main/res/values-hi/strings.xml similarity index 100% rename from library/src/main/res/values-hi/strings.xml rename to library/core/src/main/res/values-hi/strings.xml diff --git a/library/src/main/res/values-hr/strings.xml b/library/core/src/main/res/values-hr/strings.xml similarity index 100% rename from library/src/main/res/values-hr/strings.xml rename to library/core/src/main/res/values-hr/strings.xml diff --git a/library/src/main/res/values-hu/strings.xml b/library/core/src/main/res/values-hu/strings.xml similarity index 100% rename from library/src/main/res/values-hu/strings.xml rename to library/core/src/main/res/values-hu/strings.xml diff --git a/library/src/main/res/values-hy-rAM/strings.xml b/library/core/src/main/res/values-hy-rAM/strings.xml similarity index 100% rename from library/src/main/res/values-hy-rAM/strings.xml rename to library/core/src/main/res/values-hy-rAM/strings.xml diff --git a/library/src/main/res/values-in/strings.xml b/library/core/src/main/res/values-in/strings.xml similarity index 100% rename from library/src/main/res/values-in/strings.xml rename to library/core/src/main/res/values-in/strings.xml diff --git a/library/src/main/res/values-is-rIS/strings.xml b/library/core/src/main/res/values-is-rIS/strings.xml similarity index 100% rename from library/src/main/res/values-is-rIS/strings.xml rename to library/core/src/main/res/values-is-rIS/strings.xml diff --git a/library/src/main/res/values-it/strings.xml b/library/core/src/main/res/values-it/strings.xml similarity index 100% rename from library/src/main/res/values-it/strings.xml rename to library/core/src/main/res/values-it/strings.xml diff --git a/library/src/main/res/values-iw/strings.xml b/library/core/src/main/res/values-iw/strings.xml similarity index 100% rename from library/src/main/res/values-iw/strings.xml rename to library/core/src/main/res/values-iw/strings.xml diff --git a/library/src/main/res/values-ja/strings.xml b/library/core/src/main/res/values-ja/strings.xml similarity index 100% rename from library/src/main/res/values-ja/strings.xml rename to library/core/src/main/res/values-ja/strings.xml diff --git a/library/src/main/res/values-ka-rGE/strings.xml b/library/core/src/main/res/values-ka-rGE/strings.xml similarity index 100% rename from library/src/main/res/values-ka-rGE/strings.xml rename to library/core/src/main/res/values-ka-rGE/strings.xml diff --git a/library/src/main/res/values-kk-rKZ/strings.xml b/library/core/src/main/res/values-kk-rKZ/strings.xml similarity index 100% rename from library/src/main/res/values-kk-rKZ/strings.xml rename to library/core/src/main/res/values-kk-rKZ/strings.xml diff --git a/library/src/main/res/values-km-rKH/strings.xml b/library/core/src/main/res/values-km-rKH/strings.xml similarity index 100% rename from library/src/main/res/values-km-rKH/strings.xml rename to library/core/src/main/res/values-km-rKH/strings.xml diff --git a/library/src/main/res/values-kn-rIN/strings.xml b/library/core/src/main/res/values-kn-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-kn-rIN/strings.xml rename to library/core/src/main/res/values-kn-rIN/strings.xml diff --git a/library/src/main/res/values-ko/strings.xml b/library/core/src/main/res/values-ko/strings.xml similarity index 100% rename from library/src/main/res/values-ko/strings.xml rename to library/core/src/main/res/values-ko/strings.xml diff --git a/library/src/main/res/values-ky-rKG/strings.xml b/library/core/src/main/res/values-ky-rKG/strings.xml similarity index 100% rename from library/src/main/res/values-ky-rKG/strings.xml rename to library/core/src/main/res/values-ky-rKG/strings.xml diff --git a/library/src/main/res/values-lo-rLA/strings.xml b/library/core/src/main/res/values-lo-rLA/strings.xml similarity index 100% rename from library/src/main/res/values-lo-rLA/strings.xml rename to library/core/src/main/res/values-lo-rLA/strings.xml diff --git a/library/src/main/res/values-lt/strings.xml b/library/core/src/main/res/values-lt/strings.xml similarity index 100% rename from library/src/main/res/values-lt/strings.xml rename to library/core/src/main/res/values-lt/strings.xml diff --git a/library/src/main/res/values-lv/strings.xml b/library/core/src/main/res/values-lv/strings.xml similarity index 100% rename from library/src/main/res/values-lv/strings.xml rename to library/core/src/main/res/values-lv/strings.xml diff --git a/library/src/main/res/values-mk-rMK/strings.xml b/library/core/src/main/res/values-mk-rMK/strings.xml similarity index 100% rename from library/src/main/res/values-mk-rMK/strings.xml rename to library/core/src/main/res/values-mk-rMK/strings.xml diff --git a/library/src/main/res/values-ml-rIN/strings.xml b/library/core/src/main/res/values-ml-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-ml-rIN/strings.xml rename to library/core/src/main/res/values-ml-rIN/strings.xml diff --git a/library/src/main/res/values-mn-rMN/strings.xml b/library/core/src/main/res/values-mn-rMN/strings.xml similarity index 100% rename from library/src/main/res/values-mn-rMN/strings.xml rename to library/core/src/main/res/values-mn-rMN/strings.xml diff --git a/library/src/main/res/values-mr-rIN/strings.xml b/library/core/src/main/res/values-mr-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-mr-rIN/strings.xml rename to library/core/src/main/res/values-mr-rIN/strings.xml diff --git a/library/src/main/res/values-ms-rMY/strings.xml b/library/core/src/main/res/values-ms-rMY/strings.xml similarity index 100% rename from library/src/main/res/values-ms-rMY/strings.xml rename to library/core/src/main/res/values-ms-rMY/strings.xml diff --git a/library/src/main/res/values-my-rMM/strings.xml b/library/core/src/main/res/values-my-rMM/strings.xml similarity index 100% rename from library/src/main/res/values-my-rMM/strings.xml rename to library/core/src/main/res/values-my-rMM/strings.xml diff --git a/library/src/main/res/values-nb/strings.xml b/library/core/src/main/res/values-nb/strings.xml similarity index 100% rename from library/src/main/res/values-nb/strings.xml rename to library/core/src/main/res/values-nb/strings.xml diff --git a/library/src/main/res/values-ne-rNP/strings.xml b/library/core/src/main/res/values-ne-rNP/strings.xml similarity index 100% rename from library/src/main/res/values-ne-rNP/strings.xml rename to library/core/src/main/res/values-ne-rNP/strings.xml diff --git a/library/src/main/res/values-nl/strings.xml b/library/core/src/main/res/values-nl/strings.xml similarity index 100% rename from library/src/main/res/values-nl/strings.xml rename to library/core/src/main/res/values-nl/strings.xml diff --git a/library/src/main/res/values-pa-rIN/strings.xml b/library/core/src/main/res/values-pa-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-pa-rIN/strings.xml rename to library/core/src/main/res/values-pa-rIN/strings.xml diff --git a/library/src/main/res/values-pl/strings.xml b/library/core/src/main/res/values-pl/strings.xml similarity index 100% rename from library/src/main/res/values-pl/strings.xml rename to library/core/src/main/res/values-pl/strings.xml diff --git a/library/src/main/res/values-pt-rBR/strings.xml b/library/core/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from library/src/main/res/values-pt-rBR/strings.xml rename to library/core/src/main/res/values-pt-rBR/strings.xml diff --git a/library/src/main/res/values-pt-rPT/strings.xml b/library/core/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from library/src/main/res/values-pt-rPT/strings.xml rename to library/core/src/main/res/values-pt-rPT/strings.xml diff --git a/library/src/main/res/values-pt/strings.xml b/library/core/src/main/res/values-pt/strings.xml similarity index 100% rename from library/src/main/res/values-pt/strings.xml rename to library/core/src/main/res/values-pt/strings.xml diff --git a/library/src/main/res/values-ro/strings.xml b/library/core/src/main/res/values-ro/strings.xml similarity index 100% rename from library/src/main/res/values-ro/strings.xml rename to library/core/src/main/res/values-ro/strings.xml diff --git a/library/src/main/res/values-ru/strings.xml b/library/core/src/main/res/values-ru/strings.xml similarity index 100% rename from library/src/main/res/values-ru/strings.xml rename to library/core/src/main/res/values-ru/strings.xml diff --git a/library/src/main/res/values-si-rLK/strings.xml b/library/core/src/main/res/values-si-rLK/strings.xml similarity index 100% rename from library/src/main/res/values-si-rLK/strings.xml rename to library/core/src/main/res/values-si-rLK/strings.xml diff --git a/library/src/main/res/values-sk/strings.xml b/library/core/src/main/res/values-sk/strings.xml similarity index 100% rename from library/src/main/res/values-sk/strings.xml rename to library/core/src/main/res/values-sk/strings.xml diff --git a/library/src/main/res/values-sl/strings.xml b/library/core/src/main/res/values-sl/strings.xml similarity index 100% rename from library/src/main/res/values-sl/strings.xml rename to library/core/src/main/res/values-sl/strings.xml diff --git a/library/src/main/res/values-sq-rAL/strings.xml b/library/core/src/main/res/values-sq-rAL/strings.xml similarity index 100% rename from library/src/main/res/values-sq-rAL/strings.xml rename to library/core/src/main/res/values-sq-rAL/strings.xml diff --git a/library/src/main/res/values-sr/strings.xml b/library/core/src/main/res/values-sr/strings.xml similarity index 100% rename from library/src/main/res/values-sr/strings.xml rename to library/core/src/main/res/values-sr/strings.xml diff --git a/library/src/main/res/values-sv/strings.xml b/library/core/src/main/res/values-sv/strings.xml similarity index 100% rename from library/src/main/res/values-sv/strings.xml rename to library/core/src/main/res/values-sv/strings.xml diff --git a/library/src/main/res/values-sw/strings.xml b/library/core/src/main/res/values-sw/strings.xml similarity index 100% rename from library/src/main/res/values-sw/strings.xml rename to library/core/src/main/res/values-sw/strings.xml diff --git a/library/src/main/res/values-ta-rIN/strings.xml b/library/core/src/main/res/values-ta-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-ta-rIN/strings.xml rename to library/core/src/main/res/values-ta-rIN/strings.xml diff --git a/library/src/main/res/values-te-rIN/strings.xml b/library/core/src/main/res/values-te-rIN/strings.xml similarity index 100% rename from library/src/main/res/values-te-rIN/strings.xml rename to library/core/src/main/res/values-te-rIN/strings.xml diff --git a/library/src/main/res/values-th/strings.xml b/library/core/src/main/res/values-th/strings.xml similarity index 100% rename from library/src/main/res/values-th/strings.xml rename to library/core/src/main/res/values-th/strings.xml diff --git a/library/src/main/res/values-tl/strings.xml b/library/core/src/main/res/values-tl/strings.xml similarity index 100% rename from library/src/main/res/values-tl/strings.xml rename to library/core/src/main/res/values-tl/strings.xml diff --git a/library/src/main/res/values-tr/strings.xml b/library/core/src/main/res/values-tr/strings.xml similarity index 100% rename from library/src/main/res/values-tr/strings.xml rename to library/core/src/main/res/values-tr/strings.xml diff --git a/library/src/main/res/values-uk/strings.xml b/library/core/src/main/res/values-uk/strings.xml similarity index 100% rename from library/src/main/res/values-uk/strings.xml rename to library/core/src/main/res/values-uk/strings.xml diff --git a/library/src/main/res/values-ur-rPK/strings.xml b/library/core/src/main/res/values-ur-rPK/strings.xml similarity index 100% rename from library/src/main/res/values-ur-rPK/strings.xml rename to library/core/src/main/res/values-ur-rPK/strings.xml diff --git a/library/src/main/res/values-uz-rUZ/strings.xml b/library/core/src/main/res/values-uz-rUZ/strings.xml similarity index 100% rename from library/src/main/res/values-uz-rUZ/strings.xml rename to library/core/src/main/res/values-uz-rUZ/strings.xml diff --git a/library/src/main/res/values-v11/styles.xml b/library/core/src/main/res/values-v11/styles.xml similarity index 100% rename from library/src/main/res/values-v11/styles.xml rename to library/core/src/main/res/values-v11/styles.xml diff --git a/library/src/main/res/values-vi/strings.xml b/library/core/src/main/res/values-vi/strings.xml similarity index 100% rename from library/src/main/res/values-vi/strings.xml rename to library/core/src/main/res/values-vi/strings.xml diff --git a/library/src/main/res/values-zh-rCN/strings.xml b/library/core/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from library/src/main/res/values-zh-rCN/strings.xml rename to library/core/src/main/res/values-zh-rCN/strings.xml diff --git a/library/src/main/res/values-zh-rHK/strings.xml b/library/core/src/main/res/values-zh-rHK/strings.xml similarity index 100% rename from library/src/main/res/values-zh-rHK/strings.xml rename to library/core/src/main/res/values-zh-rHK/strings.xml diff --git a/library/src/main/res/values-zh-rTW/strings.xml b/library/core/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from library/src/main/res/values-zh-rTW/strings.xml rename to library/core/src/main/res/values-zh-rTW/strings.xml diff --git a/library/src/main/res/values-zu/strings.xml b/library/core/src/main/res/values-zu/strings.xml similarity index 100% rename from library/src/main/res/values-zu/strings.xml rename to library/core/src/main/res/values-zu/strings.xml diff --git a/library/src/main/res/values/attrs.xml b/library/core/src/main/res/values/attrs.xml similarity index 100% rename from library/src/main/res/values/attrs.xml rename to library/core/src/main/res/values/attrs.xml diff --git a/library/src/main/res/values/constants.xml b/library/core/src/main/res/values/constants.xml similarity index 100% rename from library/src/main/res/values/constants.xml rename to library/core/src/main/res/values/constants.xml diff --git a/library/src/main/res/values/ids.xml b/library/core/src/main/res/values/ids.xml similarity index 100% rename from library/src/main/res/values/ids.xml rename to library/core/src/main/res/values/ids.xml diff --git a/library/src/main/res/values/strings.xml b/library/core/src/main/res/values/strings.xml similarity index 100% rename from library/src/main/res/values/strings.xml rename to library/core/src/main/res/values/strings.xml diff --git a/library/src/main/res/values/styles.xml b/library/core/src/main/res/values/styles.xml similarity index 100% rename from library/src/main/res/values/styles.xml rename to library/core/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index b69c134fc4..9578420959 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. include ':library' +include ':library-core' include ':testutils' include ':demo' include ':playbacktests' @@ -24,6 +25,8 @@ include ':extension-vp9' // Uncomment the following line to use the Cronet Extension. // include ':extension-cronet' +project(':library').projectDir = new File(settingsDir, 'library/all') +project(':library-core').projectDir = new File(settingsDir, 'library/core') project(':extension-ffmpeg').projectDir = new File(settingsDir, 'extensions/ffmpeg') project(':extension-flac').projectDir = new File(settingsDir, 'extensions/flac') project(':extension-gvr').projectDir = new File(settingsDir, 'extensions/gvr')