diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ce3bd3a362..353605251b 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -13,6 +13,7 @@ clarifying the distinction between `Format` and `MediaFormat`. * Move player message-related constants from `C` to `Renderer`, to avoid having the constants class depend on player/renderer classes. + * Split out `common` and `extractor` submodules. * Text: * Parse `` and `` tags in WebVTT subtitles (rendering is coming later). diff --git a/core_settings.gradle b/core_settings.gradle index 0f9746af96..2c6ddbda78 100644 --- a/core_settings.gradle +++ b/core_settings.gradle @@ -18,8 +18,10 @@ if (gradle.ext.has('exoplayerModulePrefix')) { } include modulePrefix + 'library' +include modulePrefix + 'library-common' include modulePrefix + 'library-core' include modulePrefix + 'library-dash' +include modulePrefix + 'library-extractor' include modulePrefix + 'library-hls' include modulePrefix + 'library-smoothstreaming' include modulePrefix + 'library-ui' @@ -41,8 +43,10 @@ include modulePrefix + 'extension-jobdispatcher' include modulePrefix + 'extension-workmanager' project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all') +project(modulePrefix + 'library-common').projectDir = new File(rootDir, 'library/common') project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core') project(modulePrefix + 'library-dash').projectDir = new File(rootDir, 'library/dash') +project(modulePrefix + 'library-extractor').projectDir = new File(rootDir, 'library/extractor') project(modulePrefix + 'library-hls').projectDir = new File(rootDir, 'library/hls') project(modulePrefix + 'library-smoothstreaming').projectDir = new File(rootDir, 'library/smoothstreaming') project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui') diff --git a/library/common/README.md b/library/common/README.md new file mode 100644 index 0000000000..af7264bcad --- /dev/null +++ b/library/common/README.md @@ -0,0 +1,10 @@ +# ExoPlayer common library module # + +Common code used by other ExoPlayer modules. + +## Links ## + +* [Javadoc][]: Note that this Javadoc is combined with that of other modules. + +[Javadoc]: https://exoplayer.dev/doc/reference/index.html + diff --git a/library/common/build.gradle b/library/common/build.gradle new file mode 100644 index 0000000000..9dc3aabac3 --- /dev/null +++ b/library/common/build.gradle @@ -0,0 +1,58 @@ +// Copyright (C) 2020 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 from: '../../constants.gradle' +apply plugin: 'com.android.library' + +android { + compileSdkVersion project.ext.compileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion project.ext.minSdkVersion + targetSdkVersion project.ext.targetSdkVersion + } + + buildTypes { + debug { + testCoverageEnabled = true + } + } + + testOptions.unitTests.includeAndroidResources = true +} + +dependencies { + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version + compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion + testImplementation project(modulePrefix + 'testutils') + testImplementation 'org.robolectric:robolectric:' + robolectricVersion +} + +ext { + javadocTitle = 'Common module' +} +apply from: '../../javadoc_library.gradle' + +ext { + releaseArtifact = 'exoplayer-common' + releaseDescription = 'The ExoPlayer library common module.' +} +apply from: '../../publish.gradle' diff --git a/library/common/proguard-rules.txt b/library/common/proguard-rules.txt new file mode 100644 index 0000000000..c83dbaee2d --- /dev/null +++ b/library/common/proguard-rules.txt @@ -0,0 +1,6 @@ +# Proguard rules specific to the common module. + +# Don't warn about checkerframework and Kotlin annotations +-dontwarn org.checkerframework.** +-dontwarn kotlin.annotations.jvm.** +-dontwarn javax.annotation.** diff --git a/library/common/src/main/AndroidManifest.xml b/library/common/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..83cb0cbde6 --- /dev/null +++ b/library/common/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/library/core/src/main/java/com/google/android/exoplayer2/C.java b/library/common/src/main/java/com/google/android/exoplayer2/C.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/C.java rename to library/common/src/main/java/com/google/android/exoplayer2/C.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java rename to library/common/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/Format.java b/library/common/src/main/java/com/google/android/exoplayer2/Format.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/Format.java rename to library/common/src/main/java/com/google/android/exoplayer2/Format.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ParserException.java b/library/common/src/main/java/com/google/android/exoplayer2/ParserException.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/ParserException.java rename to library/common/src/main/java/com/google/android/exoplayer2/ParserException.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/Ac3Util.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/Ac4Util.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/DtsUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/MpegAudioUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/audio/WavUtil.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java new file mode 100644 index 0000000000..5ae2413d92 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/audio/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.audio; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/Buffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/CryptoInfo.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java rename to library/common/src/main/java/com/google/android/exoplayer2/decoder/DecoderInputBuffer.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java new file mode 100644 index 0000000000..0c4dbde9d3 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/decoder/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.decoder; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java rename to library/common/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java rename to library/common/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java rename to library/common/src/main/java/com/google/android/exoplayer2/drm/ExoMediaCrypto.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java new file mode 100644 index 0000000000..d4820dd204 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/drm/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.drm; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/Metadata.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataInputBuffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java new file mode 100644 index 0000000000..a55cc1b6b3 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/metadata/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.metadata; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/common/src/main/java/com/google/android/exoplayer2/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/package-info.java new file mode 100644 index 0000000000..690f2c40c3 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSourceException.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java new file mode 100644 index 0000000000..1fb49d4b96 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/upstream/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.upstream; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/Assertions.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/Assertions.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java b/library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/FlacConstants.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Log.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Log.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/Log.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/Log.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/LongArray.java b/library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/LongArray.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/LongArray.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java b/library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/NonNullApi.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java b/library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Predicate.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/Predicate.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/Predicate.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java b/library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/TimestampAdjuster.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/util/Util.java rename to library/common/src/main/java/com/google/android/exoplayer2/util/Util.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java new file mode 100644 index 0000000000..76899fc452 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/util/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.util; diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java b/library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java rename to library/common/src/main/java/com/google/android/exoplayer2/video/AvcConfig.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java rename to library/common/src/main/java/com/google/android/exoplayer2/video/ColorInfo.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java b/library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java rename to library/common/src/main/java/com/google/android/exoplayer2/video/DolbyVisionConfig.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java b/library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java rename to library/common/src/main/java/com/google/android/exoplayer2/video/HevcConfig.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java new file mode 100644 index 0000000000..3c2cd217e0 --- /dev/null +++ b/library/common/src/main/java/com/google/android/exoplayer2/video/package-info.java @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2019 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. + */ +@NonNullApi +package com.google.android.exoplayer2.video; + +import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/common/src/main/proguard-rules.txt b/library/common/src/main/proguard-rules.txt new file mode 120000 index 0000000000..499fb08b36 --- /dev/null +++ b/library/common/src/main/proguard-rules.txt @@ -0,0 +1 @@ +../../proguard-rules.txt \ No newline at end of file diff --git a/library/common/src/test/AndroidManifest.xml b/library/common/src/test/AndroidManifest.xml new file mode 100644 index 0000000000..46c19f53c9 --- /dev/null +++ b/library/common/src/test/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/library/core/src/test/java/com/google/android/exoplayer2/CTest.java b/library/common/src/test/java/com/google/android/exoplayer2/CTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/CTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/CTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java b/library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/FormatTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/audio/Ac3UtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/MetadataTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/DataSpecTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/CodecSpecificDataUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/util/UtilTest.java diff --git a/library/core/build.gradle b/library/core/build.gradle index 99f4b2ad03..0c28a39811 100644 --- a/library/core/build.gradle +++ b/library/core/build.gradle @@ -16,7 +16,7 @@ apply from: '../../constants.gradle' android { compileSdkVersion project.ext.compileSdkVersion - + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -45,11 +45,11 @@ android { } dependencies { + api project(modulePrefix + 'library-common') + api project(modulePrefix + 'library-extractor') implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion - compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion - compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion androidTestImplementation 'com.google.guava:guava:' + guavaVersion androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt index ff59046049..2ffddca229 100644 --- a/library/core/proguard-rules.txt +++ b/library/core/proguard-rules.txt @@ -38,12 +38,6 @@ (android.os.Handler, com.google.android.exoplayer2.audio.AudioRendererEventListener, com.google.android.exoplayer2.audio.AudioProcessor[]); } -# Constructors accessed via reflection in DefaultExtractorsFactory --dontnote com.google.android.exoplayer2.ext.flac.FlacExtractor --keepclassmembers class com.google.android.exoplayer2.ext.flac.FlacExtractor { - (); -} - # Constructors accessed via reflection in DefaultDataSource -dontnote com.google.android.exoplayer2.ext.rtmp.RtmpDataSource -keepclassmembers class com.google.android.exoplayer2.ext.rtmp.RtmpDataSource { diff --git a/library/core/src/main/AndroidManifest.xml b/library/core/src/main/AndroidManifest.xml index 1a6971fdcc..b17180f975 100644 --- a/library/core/src/main/AndroidManifest.xml +++ b/library/core/src/main/AndroidManifest.xml @@ -14,7 +14,4 @@ limitations under the License. --> - - - + diff --git a/library/extractor/README.md b/library/extractor/README.md new file mode 100644 index 0000000000..28e0ccdc0a --- /dev/null +++ b/library/extractor/README.md @@ -0,0 +1,11 @@ +# ExoPlayer extractor library module # + +Provides media container extractors. + +## Links ## + +* [Javadoc][]: Classes matching `com.google.android.exoplayer2.extractor.*` + belong to this module. + +[Javadoc]: https://exoplayer.dev/doc/reference/index.html + diff --git a/library/extractor/build.gradle b/library/extractor/build.gradle new file mode 100644 index 0000000000..8858b3eeec --- /dev/null +++ b/library/extractor/build.gradle @@ -0,0 +1,57 @@ +// Copyright (C) 2020 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 from: '../../constants.gradle' +apply plugin: 'com.android.library' + +android { + compileSdkVersion project.ext.compileSdkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + minSdkVersion project.ext.minSdkVersion + targetSdkVersion project.ext.targetSdkVersion + } + + buildTypes { + debug { + testCoverageEnabled = true + } + } + + testOptions.unitTests.includeAndroidResources = true +} + +dependencies { + implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion + compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion + compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkVersion + implementation project(modulePrefix + 'library-common') + testImplementation project(modulePrefix + 'testutils') + testImplementation 'org.robolectric:robolectric:' + robolectricVersion +} + +ext { + javadocTitle = 'Extractor module' +} +apply from: '../../javadoc_library.gradle' + +ext { + releaseArtifact = 'exoplayer-extractor' + releaseDescription = 'The ExoPlayer library extractor module.' +} +apply from: '../../publish.gradle' diff --git a/library/extractor/proguard-rules.txt b/library/extractor/proguard-rules.txt new file mode 100644 index 0000000000..5f97a491cb --- /dev/null +++ b/library/extractor/proguard-rules.txt @@ -0,0 +1,12 @@ +# Proguard rules specific to the extractor module. + +# Constructors accessed via reflection in DefaultExtractorsFactory +-dontnote com.google.android.exoplayer2.ext.flac.FlacExtractor +-keepclassmembers class com.google.android.exoplayer2.ext.flac.FlacExtractor { + (); +} + +# Don't warn about checkerframework and Kotlin annotations +-dontwarn org.checkerframework.** +-dontwarn kotlin.annotations.jvm.** +-dontwarn javax.annotation.** diff --git a/library/extractor/src/main/AndroidManifest.xml b/library/extractor/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..8748afd2cf --- /dev/null +++ b/library/extractor/src/main/AndroidManifest.xml @@ -0,0 +1,17 @@ + + + + diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/BinarySearchSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/CeaUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMap.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyExtractorOutput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacFrameReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacSeekTableSeekMap.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/Id3Peeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/SeekPoint.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisBitArray.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/AmrExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/amr/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacBinarySearchSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/FlacExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flac/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/flv/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlProcessor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mkv/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/MlltSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/Seeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp3/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntry.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/rawcc/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Extractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac4Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DefaultTsPayloadReaderFactory.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/DvbSubtitleReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PesReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsBinarySearchSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsDurationReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SectionReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/SpliceInfoSectionReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsBinarySearchSeeker.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsDurationReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsPayloadReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/TsUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/UserDataReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java similarity index 92% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java index 4d93bd5ac5..78f4551db4 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020 The Android Open Source Project + * Copyright (C) 2019 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. diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/WavSeekMap.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/extractor/wav/package-info.java diff --git a/library/extractor/src/main/proguard-rules.txt b/library/extractor/src/main/proguard-rules.txt new file mode 120000 index 0000000000..499fb08b36 --- /dev/null +++ b/library/extractor/src/main/proguard-rules.txt @@ -0,0 +1 @@ +../../proguard-rules.txt \ No newline at end of file diff --git a/library/extractor/src/test/AndroidManifest.xml b/library/extractor/src/test/AndroidManifest.xml new file mode 100644 index 0000000000..79e0e48973 --- /dev/null +++ b/library/extractor/src/test/AndroidManifest.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/library/core/src/test/assets/amr/sample_nb.amr b/library/extractor/src/test/assets/amr/sample_nb.amr similarity index 100% rename from library/core/src/test/assets/amr/sample_nb.amr rename to library/extractor/src/test/assets/amr/sample_nb.amr diff --git a/library/core/src/test/assets/amr/sample_nb.amr.0.dump b/library/extractor/src/test/assets/amr/sample_nb.amr.0.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb.amr.0.dump rename to library/extractor/src/test/assets/amr/sample_nb.amr.0.dump diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr.0.dump b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr.0.dump rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr.0.dump diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr.1.dump b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr.1.dump rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr.1.dump diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr.2.dump b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr.2.dump rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr.2.dump diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr.3.dump b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr.3.dump rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr.3.dump diff --git a/library/core/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump b/library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump rename to library/extractor/src/test/assets/amr/sample_nb_cbr.amr.unklen.dump diff --git a/library/core/src/test/assets/amr/sample_wb.amr b/library/extractor/src/test/assets/amr/sample_wb.amr similarity index 100% rename from library/core/src/test/assets/amr/sample_wb.amr rename to library/extractor/src/test/assets/amr/sample_wb.amr diff --git a/library/core/src/test/assets/amr/sample_wb.amr.0.dump b/library/extractor/src/test/assets/amr/sample_wb.amr.0.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb.amr.0.dump rename to library/extractor/src/test/assets/amr/sample_wb.amr.0.dump diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr.0.dump b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr.0.dump rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr.0.dump diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr.1.dump b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr.1.dump rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr.1.dump diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr.2.dump b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr.2.dump rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr.2.dump diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr.3.dump b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr.3.dump rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr.3.dump diff --git a/library/core/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump b/library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump similarity index 100% rename from library/core/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump rename to library/extractor/src/test/assets/amr/sample_wb_cbr.amr.unklen.dump diff --git a/library/core/src/test/assets/binary/ogg/vorbis_header_pages b/library/extractor/src/test/assets/binary/ogg/vorbis_header_pages similarity index 100% rename from library/core/src/test/assets/binary/ogg/vorbis_header_pages rename to library/extractor/src/test/assets/binary/ogg/vorbis_header_pages diff --git a/library/core/src/test/assets/binary/vorbis/comment_header b/library/extractor/src/test/assets/binary/vorbis/comment_header similarity index 100% rename from library/core/src/test/assets/binary/vorbis/comment_header rename to library/extractor/src/test/assets/binary/vorbis/comment_header diff --git a/library/core/src/test/assets/binary/vorbis/id_header b/library/extractor/src/test/assets/binary/vorbis/id_header similarity index 100% rename from library/core/src/test/assets/binary/vorbis/id_header rename to library/extractor/src/test/assets/binary/vorbis/id_header diff --git a/library/core/src/test/assets/binary/vorbis/setup_header b/library/extractor/src/test/assets/binary/vorbis/setup_header similarity index 100% rename from library/core/src/test/assets/binary/vorbis/setup_header rename to library/extractor/src/test/assets/binary/vorbis/setup_header diff --git a/library/core/src/test/assets/flac/bear.flac b/library/extractor/src/test/assets/flac/bear.flac similarity index 100% rename from library/core/src/test/assets/flac/bear.flac rename to library/extractor/src/test/assets/flac/bear.flac diff --git a/library/core/src/test/assets/flac/bear.flac.0.dump b/library/extractor/src/test/assets/flac/bear.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear.flac.0.dump rename to library/extractor/src/test/assets/flac/bear.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear.flac.1.dump b/library/extractor/src/test/assets/flac/bear.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear.flac.1.dump rename to library/extractor/src/test/assets/flac/bear.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear.flac.2.dump b/library/extractor/src/test/assets/flac/bear.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear.flac.2.dump rename to library/extractor/src/test/assets/flac/bear.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear.flac.3.dump b/library/extractor/src/test/assets/flac/bear.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear.flac.3.dump rename to library/extractor/src/test/assets/flac/bear.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac b/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac rename to library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac diff --git a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump b/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump b/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump b/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump b/library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_no_min_max_frame_size.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_no_num_samples.flac b/library/extractor/src/test/assets/flac/bear_no_num_samples.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_no_num_samples.flac rename to library/extractor/src/test/assets/flac/bear_no_num_samples.flac diff --git a/library/core/src/test/assets/flac/bear_no_num_samples.flac.0.dump b/library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_num_samples.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_no_num_samples.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac b/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac rename to library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac diff --git a/library/core/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump b/library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_no_seek_table_no_num_samples.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.0.dump b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.1.dump b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.2.dump b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.3.dump b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump b/library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump rename to library/extractor/src/test/assets/flac/bear_one_metadata_block.flac.unklen.dump diff --git a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac b/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac rename to library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac diff --git a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump b/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump b/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump b/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump b/library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_uncommon_sample_rate.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac b/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_disabled.flac rename to library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac diff --git a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump b/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump b/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump b/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump b/library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_disabled.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac b/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_enabled.flac rename to library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac diff --git a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump b/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump b/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump b/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump b/library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_with_id3_enabled.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_with_picture.flac b/library/extractor/src/test/assets/flac/bear_with_picture.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_with_picture.flac rename to library/extractor/src/test/assets/flac/bear_with_picture.flac diff --git a/library/core/src/test/assets/flac/bear_with_picture.flac.0.dump b/library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_picture.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_with_picture.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_with_picture.flac.1.dump b/library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_picture.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_with_picture.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_with_picture.flac.2.dump b/library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_picture.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_with_picture.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_with_picture.flac.3.dump b/library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_picture.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_with_picture.flac.3.dump diff --git a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac b/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac similarity index 100% rename from library/core/src/test/assets/flac/bear_with_vorbis_comments.flac rename to library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac diff --git a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump b/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump rename to library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.0.dump diff --git a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump b/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump rename to library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.1.dump diff --git a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump b/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump rename to library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.2.dump diff --git a/library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump b/library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump similarity index 100% rename from library/core/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump rename to library/extractor/src/test/assets/flac/bear_with_vorbis_comments.flac.3.dump diff --git a/library/core/src/test/assets/flv/sample.flv b/library/extractor/src/test/assets/flv/sample.flv similarity index 100% rename from library/core/src/test/assets/flv/sample.flv rename to library/extractor/src/test/assets/flv/sample.flv diff --git a/library/core/src/test/assets/flv/sample.flv.0.dump b/library/extractor/src/test/assets/flv/sample.flv.0.dump similarity index 100% rename from library/core/src/test/assets/flv/sample.flv.0.dump rename to library/extractor/src/test/assets/flv/sample.flv.0.dump diff --git a/library/core/src/test/assets/id3/apic.id3 b/library/extractor/src/test/assets/id3/apic.id3 similarity index 100% rename from library/core/src/test/assets/id3/apic.id3 rename to library/extractor/src/test/assets/id3/apic.id3 diff --git a/library/core/src/test/assets/id3/comm_apic.id3 b/library/extractor/src/test/assets/id3/comm_apic.id3 similarity index 100% rename from library/core/src/test/assets/id3/comm_apic.id3 rename to library/extractor/src/test/assets/id3/comm_apic.id3 diff --git a/library/core/src/test/assets/mkv/full_blocks.mkv b/library/extractor/src/test/assets/mkv/full_blocks.mkv similarity index 100% rename from library/core/src/test/assets/mkv/full_blocks.mkv rename to library/extractor/src/test/assets/mkv/full_blocks.mkv diff --git a/library/core/src/test/assets/mkv/full_blocks.mkv.0.dump b/library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump similarity index 100% rename from library/core/src/test/assets/mkv/full_blocks.mkv.0.dump rename to library/extractor/src/test/assets/mkv/full_blocks.mkv.0.dump diff --git a/library/core/src/test/assets/mkv/full_blocks.mkv.1.dump b/library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump similarity index 100% rename from library/core/src/test/assets/mkv/full_blocks.mkv.1.dump rename to library/extractor/src/test/assets/mkv/full_blocks.mkv.1.dump diff --git a/library/core/src/test/assets/mkv/full_blocks.mkv.2.dump b/library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump similarity index 100% rename from library/core/src/test/assets/mkv/full_blocks.mkv.2.dump rename to library/extractor/src/test/assets/mkv/full_blocks.mkv.2.dump diff --git a/library/core/src/test/assets/mkv/full_blocks.mkv.3.dump b/library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump similarity index 100% rename from library/core/src/test/assets/mkv/full_blocks.mkv.3.dump rename to library/extractor/src/test/assets/mkv/full_blocks.mkv.3.dump diff --git a/library/core/src/test/assets/mkv/sample.mkv b/library/extractor/src/test/assets/mkv/sample.mkv similarity index 100% rename from library/core/src/test/assets/mkv/sample.mkv rename to library/extractor/src/test/assets/mkv/sample.mkv diff --git a/library/core/src/test/assets/mkv/sample.mkv.0.dump b/library/extractor/src/test/assets/mkv/sample.mkv.0.dump similarity index 100% rename from library/core/src/test/assets/mkv/sample.mkv.0.dump rename to library/extractor/src/test/assets/mkv/sample.mkv.0.dump diff --git a/library/core/src/test/assets/mkv/sample.mkv.1.dump b/library/extractor/src/test/assets/mkv/sample.mkv.1.dump similarity index 100% rename from library/core/src/test/assets/mkv/sample.mkv.1.dump rename to library/extractor/src/test/assets/mkv/sample.mkv.1.dump diff --git a/library/core/src/test/assets/mkv/sample.mkv.2.dump b/library/extractor/src/test/assets/mkv/sample.mkv.2.dump similarity index 100% rename from library/core/src/test/assets/mkv/sample.mkv.2.dump rename to library/extractor/src/test/assets/mkv/sample.mkv.2.dump diff --git a/library/core/src/test/assets/mkv/sample.mkv.3.dump b/library/extractor/src/test/assets/mkv/sample.mkv.3.dump similarity index 100% rename from library/core/src/test/assets/mkv/sample.mkv.3.dump rename to library/extractor/src/test/assets/mkv/sample.mkv.3.dump diff --git a/library/core/src/test/assets/mkv/subsample_encrypted_altref.webm b/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm similarity index 100% rename from library/core/src/test/assets/mkv/subsample_encrypted_altref.webm rename to library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm diff --git a/library/core/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump b/library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump similarity index 100% rename from library/core/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump rename to library/extractor/src/test/assets/mkv/subsample_encrypted_altref.webm.0.dump diff --git a/library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm b/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm similarity index 100% rename from library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm rename to library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm diff --git a/library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump b/library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump similarity index 100% rename from library/core/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump rename to library/extractor/src/test/assets/mkv/subsample_encrypted_noaltref.webm.0.dump diff --git a/library/core/src/test/assets/mp3/bear.mp3 b/library/extractor/src/test/assets/mp3/bear.mp3 similarity index 100% rename from library/core/src/test/assets/mp3/bear.mp3 rename to library/extractor/src/test/assets/mp3/bear.mp3 diff --git a/library/core/src/test/assets/mp3/bear.mp3.0.dump b/library/extractor/src/test/assets/mp3/bear.mp3.0.dump similarity index 100% rename from library/core/src/test/assets/mp3/bear.mp3.0.dump rename to library/extractor/src/test/assets/mp3/bear.mp3.0.dump diff --git a/library/core/src/test/assets/mp3/bear.mp3.1.dump b/library/extractor/src/test/assets/mp3/bear.mp3.1.dump similarity index 100% rename from library/core/src/test/assets/mp3/bear.mp3.1.dump rename to library/extractor/src/test/assets/mp3/bear.mp3.1.dump diff --git a/library/core/src/test/assets/mp3/bear.mp3.2.dump b/library/extractor/src/test/assets/mp3/bear.mp3.2.dump similarity index 100% rename from library/core/src/test/assets/mp3/bear.mp3.2.dump rename to library/extractor/src/test/assets/mp3/bear.mp3.2.dump diff --git a/library/core/src/test/assets/mp3/bear.mp3.3.dump b/library/extractor/src/test/assets/mp3/bear.mp3.3.dump similarity index 100% rename from library/core/src/test/assets/mp3/bear.mp3.3.dump rename to library/extractor/src/test/assets/mp3/bear.mp3.3.dump diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3 b/library/extractor/src/test/assets/mp3/play-trimmed.mp3 similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3 rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3 diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump b/library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3.0.dump rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3.0.dump diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump b/library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3.1.dump rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3.1.dump diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump b/library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3.2.dump rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3.2.dump diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump b/library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3.3.dump rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3.3.dump diff --git a/library/core/src/test/assets/mp3/play-trimmed.mp3.unklen.dump b/library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump similarity index 100% rename from library/core/src/test/assets/mp3/play-trimmed.mp3.unklen.dump rename to library/extractor/src/test/assets/mp3/play-trimmed.mp3.unklen.dump diff --git a/library/core/src/test/assets/mp4/sample.mp4 b/library/extractor/src/test/assets/mp4/sample.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample.mp4 rename to library/extractor/src/test/assets/mp4/sample.mp4 diff --git a/library/core/src/test/assets/mp4/sample.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4 b/library/extractor/src/test/assets/mp4/sample_ac4.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4.mp4 rename to library/extractor/src/test/assets/mp4/sample_ac4.mp4 diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_ac4.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_ac4.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_ac4.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_ac4.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4 b/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4 rename to library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4 diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_fragmented.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_protected.mp4 b/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_protected.mp4 rename to library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4 diff --git a/library/core/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_ac4_protected.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_android_slow_motion.mp4 b/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_android_slow_motion.mp4 rename to library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4 diff --git a/library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_android_slow_motion.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented.mp4 b/library/extractor/src/test/assets/mp4/sample_fragmented.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented.mp4 rename to library/extractor/src/test/assets/mp4/sample_fragmented.mp4 diff --git a/library/core/src/test/assets/mp4/sample_fragmented.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4 b/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4 rename to library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4 diff --git a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented_seekable.mp4.3.dump diff --git a/library/core/src/test/assets/mp4/sample_fragmented_sei.mp4 b/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_sei.mp4 rename to library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4 diff --git a/library/core/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_fragmented_sei.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4 b/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4 similarity index 100% rename from library/core/src/test/assets/mp4/sample_mdat_too_long.mp4 rename to library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4 diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump b/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump rename to library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.0.dump diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump b/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump rename to library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.1.dump diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump b/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump rename to library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.2.dump diff --git a/library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump b/library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump similarity index 100% rename from library/core/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump rename to library/extractor/src/test/assets/mp4/sample_mdat_too_long.mp4.3.dump diff --git a/library/core/src/test/assets/ogg/bear.opus b/library/extractor/src/test/assets/ogg/bear.opus similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus rename to library/extractor/src/test/assets/ogg/bear.opus diff --git a/library/core/src/test/assets/ogg/bear.opus.0.dump b/library/extractor/src/test/assets/ogg/bear.opus.0.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus.0.dump rename to library/extractor/src/test/assets/ogg/bear.opus.0.dump diff --git a/library/core/src/test/assets/ogg/bear.opus.1.dump b/library/extractor/src/test/assets/ogg/bear.opus.1.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus.1.dump rename to library/extractor/src/test/assets/ogg/bear.opus.1.dump diff --git a/library/core/src/test/assets/ogg/bear.opus.2.dump b/library/extractor/src/test/assets/ogg/bear.opus.2.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus.2.dump rename to library/extractor/src/test/assets/ogg/bear.opus.2.dump diff --git a/library/core/src/test/assets/ogg/bear.opus.3.dump b/library/extractor/src/test/assets/ogg/bear.opus.3.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus.3.dump rename to library/extractor/src/test/assets/ogg/bear.opus.3.dump diff --git a/library/core/src/test/assets/ogg/bear.opus.unklen.dump b/library/extractor/src/test/assets/ogg/bear.opus.unklen.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear.opus.unklen.dump rename to library/extractor/src/test/assets/ogg/bear.opus.unklen.dump diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg b/library/extractor/src/test/assets/ogg/bear_flac.ogg similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg rename to library/extractor/src/test/assets/ogg/bear_flac.ogg diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.0.dump b/library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg.0.dump rename to library/extractor/src/test/assets/ogg/bear_flac.ogg.0.dump diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.1.dump b/library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg.1.dump rename to library/extractor/src/test/assets/ogg/bear_flac.ogg.1.dump diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.2.dump b/library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg.2.dump rename to library/extractor/src/test/assets/ogg/bear_flac.ogg.2.dump diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.3.dump b/library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg.3.dump rename to library/extractor/src/test/assets/ogg/bear_flac.ogg.3.dump diff --git a/library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump b/library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac.ogg.unklen.dump rename to library/extractor/src/test/assets/ogg/bear_flac.ogg.unklen.dump diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.0.dump diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.1.dump diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.2.dump diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.3.dump diff --git a/library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump b/library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump rename to library/extractor/src/test/assets/ogg/bear_flac_noseektable.ogg.unklen.dump diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg.0.dump b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg.0.dump rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg.0.dump diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg.1.dump b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg.1.dump rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg.1.dump diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg.2.dump b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg.2.dump rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg.2.dump diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg.3.dump b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg.3.dump rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg.3.dump diff --git a/library/core/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump b/library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump similarity index 100% rename from library/core/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump rename to library/extractor/src/test/assets/ogg/bear_vorbis.ogg.unklen.dump diff --git a/library/core/src/test/assets/ogg/continued_packet_at_start b/library/extractor/src/test/assets/ogg/continued_packet_at_start similarity index 100% rename from library/core/src/test/assets/ogg/continued_packet_at_start rename to library/extractor/src/test/assets/ogg/continued_packet_at_start diff --git a/library/core/src/test/assets/ogg/continued_packet_over_four_pages b/library/extractor/src/test/assets/ogg/continued_packet_over_four_pages similarity index 100% rename from library/core/src/test/assets/ogg/continued_packet_over_four_pages rename to library/extractor/src/test/assets/ogg/continued_packet_over_four_pages diff --git a/library/core/src/test/assets/ogg/continued_packet_over_two_pages b/library/extractor/src/test/assets/ogg/continued_packet_over_two_pages similarity index 100% rename from library/core/src/test/assets/ogg/continued_packet_over_two_pages rename to library/extractor/src/test/assets/ogg/continued_packet_over_two_pages diff --git a/library/core/src/test/assets/ogg/eof_header b/library/extractor/src/test/assets/ogg/eof_header similarity index 100% rename from library/core/src/test/assets/ogg/eof_header rename to library/extractor/src/test/assets/ogg/eof_header diff --git a/library/core/src/test/assets/ogg/flac_header b/library/extractor/src/test/assets/ogg/flac_header similarity index 100% rename from library/core/src/test/assets/ogg/flac_header rename to library/extractor/src/test/assets/ogg/flac_header diff --git a/library/core/src/test/assets/ogg/four_packets_with_empty_page b/library/extractor/src/test/assets/ogg/four_packets_with_empty_page similarity index 100% rename from library/core/src/test/assets/ogg/four_packets_with_empty_page rename to library/extractor/src/test/assets/ogg/four_packets_with_empty_page diff --git a/library/core/src/test/assets/ogg/invalid_header b/library/extractor/src/test/assets/ogg/invalid_header similarity index 100% rename from library/core/src/test/assets/ogg/invalid_header rename to library/extractor/src/test/assets/ogg/invalid_header diff --git a/library/core/src/test/assets/ogg/invalid_ogg_header b/library/extractor/src/test/assets/ogg/invalid_ogg_header similarity index 100% rename from library/core/src/test/assets/ogg/invalid_ogg_header rename to library/extractor/src/test/assets/ogg/invalid_ogg_header diff --git a/library/core/src/test/assets/ogg/opus_header b/library/extractor/src/test/assets/ogg/opus_header similarity index 100% rename from library/core/src/test/assets/ogg/opus_header rename to library/extractor/src/test/assets/ogg/opus_header diff --git a/library/core/src/test/assets/ogg/packet_with_zero_size_terminator b/library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator similarity index 100% rename from library/core/src/test/assets/ogg/packet_with_zero_size_terminator rename to library/extractor/src/test/assets/ogg/packet_with_zero_size_terminator diff --git a/library/core/src/test/assets/ogg/page_header b/library/extractor/src/test/assets/ogg/page_header similarity index 100% rename from library/core/src/test/assets/ogg/page_header rename to library/extractor/src/test/assets/ogg/page_header diff --git a/library/core/src/test/assets/ogg/random_1000_pages b/library/extractor/src/test/assets/ogg/random_1000_pages similarity index 100% rename from library/core/src/test/assets/ogg/random_1000_pages rename to library/extractor/src/test/assets/ogg/random_1000_pages diff --git a/library/core/src/test/assets/ogg/three_headers b/library/extractor/src/test/assets/ogg/three_headers similarity index 100% rename from library/core/src/test/assets/ogg/three_headers rename to library/extractor/src/test/assets/ogg/three_headers diff --git a/library/core/src/test/assets/ogg/vorbis_header b/library/extractor/src/test/assets/ogg/vorbis_header similarity index 100% rename from library/core/src/test/assets/ogg/vorbis_header rename to library/extractor/src/test/assets/ogg/vorbis_header diff --git a/library/core/src/test/assets/ogg/zero_sized_packets_at_end_of_stream b/library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream similarity index 100% rename from library/core/src/test/assets/ogg/zero_sized_packets_at_end_of_stream rename to library/extractor/src/test/assets/ogg/zero_sized_packets_at_end_of_stream diff --git a/library/core/src/test/assets/rawcc/sample.rawcc b/library/extractor/src/test/assets/rawcc/sample.rawcc similarity index 100% rename from library/core/src/test/assets/rawcc/sample.rawcc rename to library/extractor/src/test/assets/rawcc/sample.rawcc diff --git a/library/core/src/test/assets/rawcc/sample.rawcc.0.dump b/library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump similarity index 100% rename from library/core/src/test/assets/rawcc/sample.rawcc.0.dump rename to library/extractor/src/test/assets/rawcc/sample.rawcc.0.dump diff --git a/library/core/src/test/assets/ts/bbb_2500ms.ts b/library/extractor/src/test/assets/ts/bbb_2500ms.ts similarity index 100% rename from library/core/src/test/assets/ts/bbb_2500ms.ts rename to library/extractor/src/test/assets/ts/bbb_2500ms.ts diff --git a/library/core/src/test/assets/ts/elephants_dream.mpg b/library/extractor/src/test/assets/ts/elephants_dream.mpg similarity index 100% rename from library/core/src/test/assets/ts/elephants_dream.mpg rename to library/extractor/src/test/assets/ts/elephants_dream.mpg diff --git a/library/core/src/test/assets/ts/sample.ac3 b/library/extractor/src/test/assets/ts/sample.ac3 similarity index 100% rename from library/core/src/test/assets/ts/sample.ac3 rename to library/extractor/src/test/assets/ts/sample.ac3 diff --git a/library/core/src/test/assets/ts/sample.ac3.0.dump b/library/extractor/src/test/assets/ts/sample.ac3.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ac3.0.dump rename to library/extractor/src/test/assets/ts/sample.ac3.0.dump diff --git a/library/core/src/test/assets/ts/sample.ac4 b/library/extractor/src/test/assets/ts/sample.ac4 similarity index 100% rename from library/core/src/test/assets/ts/sample.ac4 rename to library/extractor/src/test/assets/ts/sample.ac4 diff --git a/library/core/src/test/assets/ts/sample.ac4.0.dump b/library/extractor/src/test/assets/ts/sample.ac4.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ac4.0.dump rename to library/extractor/src/test/assets/ts/sample.ac4.0.dump diff --git a/library/core/src/test/assets/ts/sample.adts b/library/extractor/src/test/assets/ts/sample.adts similarity index 100% rename from library/core/src/test/assets/ts/sample.adts rename to library/extractor/src/test/assets/ts/sample.adts diff --git a/library/core/src/test/assets/ts/sample.adts.0.dump b/library/extractor/src/test/assets/ts/sample.adts.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.adts.0.dump rename to library/extractor/src/test/assets/ts/sample.adts.0.dump diff --git a/library/core/src/test/assets/ts/sample.eac3 b/library/extractor/src/test/assets/ts/sample.eac3 similarity index 100% rename from library/core/src/test/assets/ts/sample.eac3 rename to library/extractor/src/test/assets/ts/sample.eac3 diff --git a/library/core/src/test/assets/ts/sample.eac3.0.dump b/library/extractor/src/test/assets/ts/sample.eac3.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.eac3.0.dump rename to library/extractor/src/test/assets/ts/sample.eac3.0.dump diff --git a/library/core/src/test/assets/ts/sample.ps b/library/extractor/src/test/assets/ts/sample.ps similarity index 100% rename from library/core/src/test/assets/ts/sample.ps rename to library/extractor/src/test/assets/ts/sample.ps diff --git a/library/core/src/test/assets/ts/sample.ps.0.dump b/library/extractor/src/test/assets/ts/sample.ps.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ps.0.dump rename to library/extractor/src/test/assets/ts/sample.ps.0.dump diff --git a/library/core/src/test/assets/ts/sample.ps.1.dump b/library/extractor/src/test/assets/ts/sample.ps.1.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ps.1.dump rename to library/extractor/src/test/assets/ts/sample.ps.1.dump diff --git a/library/core/src/test/assets/ts/sample.ps.2.dump b/library/extractor/src/test/assets/ts/sample.ps.2.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ps.2.dump rename to library/extractor/src/test/assets/ts/sample.ps.2.dump diff --git a/library/core/src/test/assets/ts/sample.ps.3.dump b/library/extractor/src/test/assets/ts/sample.ps.3.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ps.3.dump rename to library/extractor/src/test/assets/ts/sample.ps.3.dump diff --git a/library/core/src/test/assets/ts/sample.ps.unklen.dump b/library/extractor/src/test/assets/ts/sample.ps.unklen.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ps.unklen.dump rename to library/extractor/src/test/assets/ts/sample.ps.unklen.dump diff --git a/library/core/src/test/assets/ts/sample.ts b/library/extractor/src/test/assets/ts/sample.ts similarity index 100% rename from library/core/src/test/assets/ts/sample.ts rename to library/extractor/src/test/assets/ts/sample.ts diff --git a/library/core/src/test/assets/ts/sample.ts.0.dump b/library/extractor/src/test/assets/ts/sample.ts.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ts.0.dump rename to library/extractor/src/test/assets/ts/sample.ts.0.dump diff --git a/library/core/src/test/assets/ts/sample.ts.1.dump b/library/extractor/src/test/assets/ts/sample.ts.1.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ts.1.dump rename to library/extractor/src/test/assets/ts/sample.ts.1.dump diff --git a/library/core/src/test/assets/ts/sample.ts.2.dump b/library/extractor/src/test/assets/ts/sample.ts.2.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ts.2.dump rename to library/extractor/src/test/assets/ts/sample.ts.2.dump diff --git a/library/core/src/test/assets/ts/sample.ts.3.dump b/library/extractor/src/test/assets/ts/sample.ts.3.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ts.3.dump rename to library/extractor/src/test/assets/ts/sample.ts.3.dump diff --git a/library/core/src/test/assets/ts/sample.ts.unklen.dump b/library/extractor/src/test/assets/ts/sample.ts.unklen.dump similarity index 100% rename from library/core/src/test/assets/ts/sample.ts.unklen.dump rename to library/extractor/src/test/assets/ts/sample.ts.unklen.dump diff --git a/library/core/src/test/assets/ts/sample_cbs.adts b/library/extractor/src/test/assets/ts/sample_cbs.adts similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts rename to library/extractor/src/test/assets/ts/sample_cbs.adts diff --git a/library/core/src/test/assets/ts/sample_cbs.adts.0.dump b/library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts.0.dump rename to library/extractor/src/test/assets/ts/sample_cbs.adts.0.dump diff --git a/library/core/src/test/assets/ts/sample_cbs.adts.1.dump b/library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts.1.dump rename to library/extractor/src/test/assets/ts/sample_cbs.adts.1.dump diff --git a/library/core/src/test/assets/ts/sample_cbs.adts.2.dump b/library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts.2.dump rename to library/extractor/src/test/assets/ts/sample_cbs.adts.2.dump diff --git a/library/core/src/test/assets/ts/sample_cbs.adts.3.dump b/library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts.3.dump rename to library/extractor/src/test/assets/ts/sample_cbs.adts.3.dump diff --git a/library/core/src/test/assets/ts/sample_cbs.adts.unklen.dump b/library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs.adts.unklen.dump rename to library/extractor/src/test/assets/ts/sample_cbs.adts.unklen.dump diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.0.dump b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts.0.dump rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.0.dump diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.1.dump b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts.1.dump rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.1.dump diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.2.dump b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts.2.dump rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.2.dump diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.3.dump b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts.3.dump rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.3.dump diff --git a/library/core/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump b/library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump similarity index 100% rename from library/core/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump rename to library/extractor/src/test/assets/ts/sample_cbs_truncated.adts.unklen.dump diff --git a/library/core/src/test/assets/ts/sample_with_sdt.ts b/library/extractor/src/test/assets/ts/sample_with_sdt.ts similarity index 100% rename from library/core/src/test/assets/ts/sample_with_sdt.ts rename to library/extractor/src/test/assets/ts/sample_with_sdt.ts diff --git a/library/core/src/test/assets/wav/sample.wav b/library/extractor/src/test/assets/wav/sample.wav similarity index 100% rename from library/core/src/test/assets/wav/sample.wav rename to library/extractor/src/test/assets/wav/sample.wav diff --git a/library/core/src/test/assets/wav/sample.wav.0.dump b/library/extractor/src/test/assets/wav/sample.wav.0.dump similarity index 100% rename from library/core/src/test/assets/wav/sample.wav.0.dump rename to library/extractor/src/test/assets/wav/sample.wav.0.dump diff --git a/library/core/src/test/assets/wav/sample.wav.1.dump b/library/extractor/src/test/assets/wav/sample.wav.1.dump similarity index 100% rename from library/core/src/test/assets/wav/sample.wav.1.dump rename to library/extractor/src/test/assets/wav/sample.wav.1.dump diff --git a/library/core/src/test/assets/wav/sample.wav.2.dump b/library/extractor/src/test/assets/wav/sample.wav.2.dump similarity index 100% rename from library/core/src/test/assets/wav/sample.wav.2.dump rename to library/extractor/src/test/assets/wav/sample.wav.2.dump diff --git a/library/core/src/test/assets/wav/sample.wav.3.dump b/library/extractor/src/test/assets/wav/sample.wav.3.dump similarity index 100% rename from library/core/src/test/assets/wav/sample.wav.3.dump rename to library/extractor/src/test/assets/wav/sample.wav.3.dump diff --git a/library/core/src/test/assets/wav/sample_ima_adpcm.wav b/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav similarity index 100% rename from library/core/src/test/assets/wav/sample_ima_adpcm.wav rename to library/extractor/src/test/assets/wav/sample_ima_adpcm.wav diff --git a/library/core/src/test/assets/wav/sample_ima_adpcm.wav.0.dump b/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump similarity index 100% rename from library/core/src/test/assets/wav/sample_ima_adpcm.wav.0.dump rename to library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.0.dump diff --git a/library/core/src/test/assets/wav/sample_ima_adpcm.wav.1.dump b/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump similarity index 100% rename from library/core/src/test/assets/wav/sample_ima_adpcm.wav.1.dump rename to library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.1.dump diff --git a/library/core/src/test/assets/wav/sample_ima_adpcm.wav.2.dump b/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump similarity index 100% rename from library/core/src/test/assets/wav/sample_ima_adpcm.wav.2.dump rename to library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.2.dump diff --git a/library/core/src/test/assets/wav/sample_ima_adpcm.wav.3.dump b/library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump similarity index 100% rename from library/core/src/test/assets/wav/sample_ima_adpcm.wav.3.dump rename to library/extractor/src/test/assets/wav/sample_ima_adpcm.wav.3.dump diff --git a/library/core/src/test/assets/webm/vorbis_codec_private b/library/extractor/src/test/assets/webm/vorbis_codec_private similarity index 100% rename from library/core/src/test/assets/webm/vorbis_codec_private rename to library/extractor/src/test/assets/webm/vorbis_codec_private diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ConstantBitrateSeekMapTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactoryTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ExtractorUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacFrameReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisBitArrayTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/VorbisUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorSeekTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorSeekTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flac/FlacExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MdtaMetadataEntryTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac4ExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorSeekTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsDurationReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorSeekTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsDurationReaderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorSeekTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java