From 4fec4b8f6a06e0833bc5fffe0e62f44baf490c5b Mon Sep 17 00:00:00 2001 From: bachinger Date: Wed, 22 Sep 2021 17:51:04 +0100 Subject: [PATCH] Move format specific metadata packages to lib-extractor PiperOrigin-RevId: 398262695 --- .../google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java | 0 .../android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java | 0 .../google/android/exoplayer2/metadata/dvbsi/package-info.java | 0 .../com/google/android/exoplayer2/metadata/emsg/EventMessage.java | 0 .../android/exoplayer2/metadata/emsg/EventMessageDecoder.java | 0 .../android/exoplayer2/metadata/emsg/EventMessageEncoder.java | 0 .../com/google/android/exoplayer2/metadata/emsg/package-info.java | 0 .../com/google/android/exoplayer2/metadata/flac/PictureFrame.java | 0 .../google/android/exoplayer2/metadata/flac/VorbisComment.java | 0 .../com/google/android/exoplayer2/metadata/flac/package-info.java | 0 .../com/google/android/exoplayer2/metadata/icy/IcyDecoder.java | 0 .../com/google/android/exoplayer2/metadata/icy/IcyHeaders.java | 0 .../java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java | 0 .../com/google/android/exoplayer2/metadata/icy/package-info.java | 0 .../com/google/android/exoplayer2/metadata/id3/ApicFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/BinaryFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/ChapterFrame.java | 0 .../google/android/exoplayer2/metadata/id3/ChapterTocFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/CommentFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/GeobFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/Id3Decoder.java | 0 .../java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java | 0 .../com/google/android/exoplayer2/metadata/id3/InternalFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/MlltFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/PrivFrame.java | 0 .../android/exoplayer2/metadata/id3/TextInformationFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java | 0 .../com/google/android/exoplayer2/metadata/id3/package-info.java | 0 .../google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java | 0 .../android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java | 0 .../google/android/exoplayer2/metadata/mp4/SlowMotionData.java | 0 .../google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java | 0 .../com/google/android/exoplayer2/metadata/mp4/package-info.java | 0 .../google/android/exoplayer2/metadata/scte35/PrivateCommand.java | 0 .../google/android/exoplayer2/metadata/scte35/SpliceCommand.java | 0 .../android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java | 0 .../android/exoplayer2/metadata/scte35/SpliceInsertCommand.java | 0 .../android/exoplayer2/metadata/scte35/SpliceNullCommand.java | 0 .../android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java | 0 .../android/exoplayer2/metadata/scte35/TimeSignalCommand.java | 0 .../google/android/exoplayer2/metadata/scte35/package-info.java | 0 .../exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java | 0 .../android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java | 0 .../android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java | 0 .../google/android/exoplayer2/metadata/emsg/EventMessageTest.java | 0 .../google/android/exoplayer2/metadata/flac/PictureFrameTest.java | 0 .../android/exoplayer2/metadata/flac/VorbisCommentTest.java | 0 .../google/android/exoplayer2/metadata/icy/IcyDecoderTest.java | 0 .../google/android/exoplayer2/metadata/icy/IcyHeadersTest.java | 0 .../com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java | 0 .../com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java | 0 .../google/android/exoplayer2/metadata/id3/ChapterFrameTest.java | 0 .../android/exoplayer2/metadata/id3/ChapterTocFrameTest.java | 0 .../google/android/exoplayer2/metadata/id3/Id3DecoderTest.java | 0 .../com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java | 0 .../android/exoplayer2/metadata/id3/TextInformationFrameTest.java | 0 .../android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java | 0 .../android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java | 0 .../android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java | 0 .../android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java | 0 60 files changed, 0 insertions(+), 0 deletions(-) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java (100%) rename library/{common => extractor}/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java (100%) rename library/{core => extractor}/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java (100%) rename library/{core => extractor}/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java (100%) rename library/{core => extractor}/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java (100%) rename library/{core => extractor}/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java (100%) rename library/{core => extractor}/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java (100%) rename library/{common => extractor}/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java (100%) rename library/{core => extractor}/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java (100%) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTable.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/dvbsi/package-info.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessage.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoder.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoder.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/emsg/package-info.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java rename to library/extractor/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/icy/IcyDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyHeaders.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/IcyInfo.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/icy/package-info.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/CommentFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/InternalFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/MlltFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/UrlLinkFrame.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/id3/package-info.java rename to library/extractor/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/mp4/MdtaMetadataEntry.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntry.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadata.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SlowMotionData.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntry.java diff --git a/library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java similarity index 100% rename from library/common/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/mp4/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceNullCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/scte35/package-info.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/dvbsi/AppInfoTableDecoderTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageEncoderTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyHeadersTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/icy/IcyInfoTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ApicFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/MlltFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrameTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MdtaMetadataEntryTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/MotionPhotoMetadataTest.java diff --git a/library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java similarity index 100% rename from library/common/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/mp4/SmtaMetadataEntryTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java