diff --git a/docs/doc/reference/allclasses-index.html b/docs/doc/reference/allclasses-index.html index 1c58512cde..dc23e0c500 100644 --- a/docs/doc/reference/allclasses-index.html +++ b/docs/doc/reference/allclasses-index.html @@ -5055,7 +5055,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -PictureFrame +PictureFrame
A picture parsed from a FLAC file.
@@ -7144,7 +7144,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -VorbisComment +VorbisComment
A vorbis comment.
diff --git a/docs/doc/reference/allclasses.html b/docs/doc/reference/allclasses.html index 5d8782d8f4..e7634c5515 100644 --- a/docs/doc/reference/allclasses.html +++ b/docs/doc/reference/allclasses.html @@ -830,7 +830,7 @@
  • Period
  • PesReader
  • PgsDecoder
    • -
  • PictureFrame
    • +
  • PictureFrame
  • PlatformScheduler
  • PlatformScheduler.PlatformSchedulerService
  • PlaybackException
    • @@ -1174,7 +1174,7 @@
  • VideoRendererEventListener.EventDispatcher
  • VideoSize
  • VorbisBitArray
    • -
  • VorbisComment
    • +
  • VorbisComment
  • VorbisUtil
  • VorbisUtil.CommentHeader
  • VorbisUtil.Mode
    • diff --git a/docs/doc/reference/allpackages-index.html b/docs/doc/reference/allpackages-index.html index aa307180e2..1ffaa38c33 100644 --- a/docs/doc/reference/allpackages-index.html +++ b/docs/doc/reference/allpackages-index.html @@ -248,7 +248,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));   -com.google.android.exoplayer2.metadata.flac +com.google.android.exoplayer2.metadata.xiph   diff --git a/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html b/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html index db7ab94849..0bcb345c18 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html +++ b/docs/doc/reference/com/google/android/exoplayer2/extractor/FlacStreamMetadata.html @@ -307,7 +307,7 @@ extends ArrayList<String> vorbisComments, - ArrayList<PictureFrame> pictureFrames) + ArrayList<PictureFrame> pictureFrames)   @@ -330,7 +330,7 @@ extends FlacStreamMetadata -copyWithPictureFrames​(List<PictureFrame> pictureFrames) +copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    Returns a copy of this with the given picture frames added to the metadata.
    @@ -601,7 +601,7 @@ public final ArrayList<String> vorbisComments, - ArrayList<PictureFrame> pictureFrames) + ArrayList<PictureFrame> pictureFrames) @@ -733,7 +733,7 @@ public 

  • copyWithPictureFrames

    -
    public FlacStreamMetadata copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    +
    public FlacStreamMetadata copyWithPictureFrames​(List<PictureFrame> pictureFrames)
    Returns a copy of this with the given picture frames added to the metadata.
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html index c4938c36c7..76c8d68bd9 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/Metadata.Entry.html @@ -126,7 +126,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    All Known Implementing Classes:
    -
    ApicFrame, AppInfoTable, BinaryFrame, ChapterFrame, ChapterTocFrame, CommentFrame, EventMessage, FakeMetadataEntry, GeobFrame, HlsTrackMetadataEntry, IcyHeaders, IcyInfo, Id3Frame, InternalFrame, MdtaMetadataEntry, MlltFrame, MotionPhotoMetadata, PictureFrame, PrivateCommand, PrivFrame, SlowMotionData, SmtaMetadataEntry, SpliceCommand, SpliceInsertCommand, SpliceNullCommand, SpliceScheduleCommand, TextInformationFrame, TimeSignalCommand, UrlLinkFrame, VorbisComment
    +
    ApicFrame, AppInfoTable, BinaryFrame, ChapterFrame, ChapterTocFrame, CommentFrame, EventMessage, FakeMetadataEntry, GeobFrame, HlsTrackMetadataEntry, IcyHeaders, IcyInfo, Id3Frame, InternalFrame, MdtaMetadataEntry, MlltFrame, MotionPhotoMetadata, PictureFrame, PrivateCommand, PrivFrame, SlowMotionData, SmtaMetadataEntry, SpliceCommand, SpliceInsertCommand, SpliceNullCommand, SpliceScheduleCommand, TextInformationFrame, TimeSignalCommand, UrlLinkFrame, VorbisComment
    Enclosing class:
    diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html index b275775151..06b7acb29e 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/PictureFrame.html @@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -
    Package com.google.android.exoplayer2.metadata.flac
    +
    Package com.google.android.exoplayer2.metadata.xiph

    Class PictureFrame

    @@ -121,7 +121,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • java.lang.Object
    • -
    • com.google.android.exoplayer2.metadata.flac.PictureFrame
      • +
    • com.google.android.exoplayer2.metadata.xiph.PictureFrame
    • @@ -182,7 +182,7 @@ implements -static Parcelable.Creator<PictureFrame> +static Parcelable.Creator<PictureFrame> CREATOR   @@ -438,7 +438,7 @@ implements

  • CREATOR

    -
    public static final Parcelable.Creator<PictureFrame> CREATOR
    +
    public static final Parcelable.Creator<PictureFrame> CREATOR
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html index 86d3cb8d33..102d8f0370 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/VorbisComment.html @@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -
    Package com.google.android.exoplayer2.metadata.flac
    +
    Package com.google.android.exoplayer2.metadata.xiph

    Class VorbisComment

    @@ -121,7 +121,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  • java.lang.Object
    • -
    • com.google.android.exoplayer2.metadata.flac.VorbisComment
      • +
    • com.google.android.exoplayer2.metadata.xiph.VorbisComment
    • @@ -175,7 +175,7 @@ implements Description -static Parcelable.Creator<VorbisComment> +static Parcelable.Creator<VorbisComment> CREATOR   @@ -330,7 +330,7 @@ implements

  • CREATOR

    -
    public static final Parcelable.Creator<VorbisComment> CREATOR
    +
    public static final Parcelable.Creator<VorbisComment> CREATOR
    • diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html index 3917332abe..fecc564caa 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-summary.html @@ -19,15 +19,15 @@ + var pathtoroot = "../../../../../../"; + var useModuleDirectories = false; + loadScripts(document, 'script'); @@ -91,7 +91,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
    -

    Package com.google.android.exoplayer2.metadata.flac

    +

    Package com.google.android.exoplayer2.metadata.xiph

      @@ -104,13 +104,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height")); -PictureFrame +PictureFrame
      A picture parsed from a FLAC file.
      -VorbisComment +VorbisComment
      A vorbis comment.
      diff --git a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html index 8587f7f8aa..6addf2d814 100644 --- a/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html +++ b/docs/doc/reference/com/google/android/exoplayer2/metadata/flac/package-tree.html @@ -19,15 +19,15 @@ + var pathtoroot = "../../../../../../"; + var useModuleDirectories = false; + loadScripts(document, 'script'); @@ -91,7 +91,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
      -

      Hierarchy For Package com.google.android.exoplayer2.metadata.flac

      +

      Hierarchy For Package com.google.android.exoplayer2.metadata.xiph

      Package Hierarchies:
    • com.google.android.exoplayer2.extractor.VorbisBitArray
      • -
    • com.google.android.exoplayer2.metadata.flac.VorbisComment (implements com.google.android.exoplayer2.metadata.Metadata.Entry)
      • +
    • com.google.android.exoplayer2.metadata.flac.VorbisComment (implements com.google.android.exoplayer2.metadata.Metadata.Entry)
    • com.google.android.exoplayer2.extractor.VorbisUtil
    • com.google.android.exoplayer2.extractor.VorbisUtil.CommentHeader
    • com.google.android.exoplayer2.extractor.VorbisUtil.Mode
      • diff --git a/extensions/flac/proguard-rules.txt b/extensions/flac/proguard-rules.txt index 436ac9b0c7..1703fa6a7d 100644 --- a/extensions/flac/proguard-rules.txt +++ b/extensions/flac/proguard-rules.txt @@ -12,6 +12,6 @@ -keep class com.google.android.exoplayer2.extractor.FlacStreamMetadata { *; } --keep class com.google.android.exoplayer2.metadata.flac.PictureFrame { +-keep class com.google.android.exoplayer2.metadata.xiph.PictureFrame { *; } diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java index fdb36a2771..4c453821d2 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacMetadataReader.java @@ -20,11 +20,11 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.VorbisUtil.CommentHeader; import com.google.android.exoplayer2.extractor.flac.FlacConstants; import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.flac.PictureFrame; +import com.google.android.exoplayer2.metadata.xiph.PictureFrame; import com.google.android.exoplayer2.metadata.id3.Id3Decoder; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.ParsableByteArray; -import com.google.common.base.Charsets; + import java.io.IOException; import java.util.Arrays; import java.util.Collections; @@ -168,7 +168,10 @@ public final class FlacMetadataReader { metadataHolder.flacStreamMetadata = flacStreamMetadata.copyWithVorbisComments(vorbisComments); } else if (type == FlacConstants.METADATA_TYPE_PICTURE) { - PictureFrame pictureFrame = readPictureMetadataBlock(input, length); + ParsableByteArray pic_scratch = new ParsableByteArray(length); + input.readFully(pic_scratch.getData(), 0, length); + pic_scratch.skipBytes(FlacConstants.METADATA_BLOCK_HEADER_SIZE); + PictureFrame pictureFrame = VorbisUtil.buildPictureFrame(pic_scratch); metadataHolder.flacStreamMetadata = flacStreamMetadata.copyWithPictureFrames(Collections.singletonList(pictureFrame)); } else { @@ -268,28 +271,5 @@ public final class FlacMetadataReader { return Arrays.asList(commentHeader.comments); } - private static PictureFrame readPictureMetadataBlock(ExtractorInput input, int length) - throws IOException { - ParsableByteArray scratch = new ParsableByteArray(length); - input.readFully(scratch.getData(), 0, length); - scratch.skipBytes(FlacConstants.METADATA_BLOCK_HEADER_SIZE); - - int pictureType = scratch.readInt(); - int mimeTypeLength = scratch.readInt(); - String mimeType = scratch.readString(mimeTypeLength, Charsets.US_ASCII); - int descriptionLength = scratch.readInt(); - String description = scratch.readString(descriptionLength); - int width = scratch.readInt(); - int height = scratch.readInt(); - int depth = scratch.readInt(); - int colors = scratch.readInt(); - int pictureDataLength = scratch.readInt(); - byte[] pictureData = new byte[pictureDataLength]; - scratch.readBytes(pictureData, 0, pictureDataLength); - - return new PictureFrame( - pictureType, mimeType, description, width, height, depth, colors, pictureData); - } - private FlacMetadataReader() {} } diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java index 7a6b09b9ac..7a507c6107 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/FlacStreamMetadata.java @@ -19,7 +19,7 @@ import androidx.annotation.Nullable; import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.flac.PictureFrame; +import com.google.android.exoplayer2.metadata.xiph.PictureFrame; import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.ParsableBitArray; import com.google.android.exoplayer2.util.Util; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java index 7e48281246..549e6dcfe4 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java @@ -15,16 +15,19 @@ */ package com.google.android.exoplayer2.extractor; +import android.util.Base64; + import androidx.annotation.Nullable; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.flac.PictureFrame; -import com.google.android.exoplayer2.metadata.flac.VorbisComment; +import com.google.android.exoplayer2.metadata.xiph.PictureFrame; +import com.google.android.exoplayer2.metadata.xiph.VorbisComment; import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.ParsableByteArray; import com.google.android.exoplayer2.util.Util; +import com.google.common.base.Charsets; import java.util.ArrayList; import java.util.Arrays; @@ -260,11 +263,30 @@ public final class VorbisUtil { return new CommentHeader(vendor, comments, length); } + /** + * Builds a metadata instance from Vorbis comments. + * + * METADATA_BLOCK_PICTURE comments will be transformed into picture frames. + * All others will be transformed into vorbis comments. + * + * @param vorbisComments The raw input of comments, as a key-value pair KEY=VAL. + * @return A metadata instance containing the processed tags. + */ @Nullable public static Metadata buildMetadata(List vorbisComments) { return buildMetadata(vorbisComments, Collections.emptyList()); } + /** + * Builds a metadata instance from Vorbis comments. + * + * METADATA_BLOCK_PICTURE comments will be transformed into picture frames. + * All others will be transformed into vorbis comments. + * + * @param vorbisComments The raw input of comments, as a key-value pair KEY=VAL. + * @param pictureFrames Any picture frames that were parsed beforehand. + * @return A metadata instance containing the processed tags. + */ @Nullable public static Metadata buildMetadata(List vorbisComments, List pictureFrames) { if (vorbisComments.isEmpty() && pictureFrames.isEmpty()) { @@ -279,8 +301,19 @@ public final class VorbisUtil { if (keyAndValue.length != 2) { Log.w(TAG, "Failed to parse Vorbis comment: " + vorbisComment); } else { - VorbisComment entry = new VorbisComment(keyAndValue[0], keyAndValue[1]); - metadataEntries.add(entry); + if (keyAndValue[0].equals("METADATA_BLOCK_PICTURE")) { + // This tag is a special cover art tag. Decode it from Base64 and make it a + // PictureFrame. + try { + byte[] decoded = Base64.decode(keyAndValue[1], Base64.DEFAULT); + metadataEntries.add(buildPictureFrame(new ParsableByteArray(decoded))); + } catch (Exception e) { + Log.w(TAG, "Failed to parse vorbis picture"); + } + } else { + VorbisComment entry = new VorbisComment(keyAndValue[0], keyAndValue[1]); + metadataEntries.add(entry); + } } } metadataEntries.addAll(pictureFrames); @@ -288,6 +321,30 @@ public final class VorbisUtil { return metadataEntries.isEmpty() ? null : new Metadata(metadataEntries); } + /** + * Transforms a picture metadata block into a picture frame. + * + * @param input The bytes of the picture. + * @return A picture frame from the input data. + */ + static PictureFrame buildPictureFrame(ParsableByteArray input) { + int pictureType = input.readInt(); + int mimeTypeLength = input.readInt(); + String mimeType = input.readString(mimeTypeLength, Charsets.US_ASCII); + int descriptionLength = input.readInt(); + String description = input.readString(descriptionLength); + int width = input.readInt(); + int height = input.readInt(); + int depth = input.readInt(); + int colors = input.readInt(); + int pictureDataLength = input.readInt(); + byte[] pictureData = new byte[pictureDataLength]; + input.readBytes(pictureData, 0, pictureDataLength); + + return new PictureFrame( + pictureType, mimeType, description, width, height, depth, colors, pictureData); + } + /** * Verifies whether the next bytes in {@code header} are a Vorbis header of the given {@code * headerType}. diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/XiphUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/XiphUtil.java new file mode 100644 index 0000000000..e05e7e514d --- /dev/null +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/XiphUtil.java @@ -0,0 +1,4 @@ +package com.google.android.exoplayer2.extractor; + +public class XiphUtil { +} diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/PictureFrame.java similarity index 98% rename from library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/PictureFrame.java index 8d62be52c6..ee1f15268b 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/PictureFrame.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/PictureFrame.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.metadata.flac; +package com.google.android.exoplayer2.metadata.xiph; import static com.google.android.exoplayer2.util.Util.castNonNull; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/VorbisComment.java similarity index 98% rename from library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/VorbisComment.java index 05daeecaec..0f174c2ead 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/VorbisComment.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/VorbisComment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.metadata.flac; +package com.google.android.exoplayer2.metadata.xiph; import static com.google.android.exoplayer2.util.Util.castNonNull; diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/package-info.java similarity index 92% rename from library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/package-info.java index 343ab232e0..cd33564dae 100644 --- a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/flac/package-info.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/xiph/package-info.java @@ -14,6 +14,6 @@ * limitations under the License. */ @NonNullApi -package com.google.android.exoplayer2.metadata.flac; +package com.google.android.exoplayer2.metadata.xiph; import com.google.android.exoplayer2.util.NonNullApi; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java index 7076181d62..ce2f7e9c1b 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacMetadataReaderTest.java @@ -24,8 +24,8 @@ import com.google.android.exoplayer2.ParserException; import com.google.android.exoplayer2.extractor.FlacMetadataReader.FlacStreamMetadataHolder; import com.google.android.exoplayer2.extractor.flac.FlacConstants; import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.flac.PictureFrame; -import com.google.android.exoplayer2.metadata.flac.VorbisComment; +import com.google.android.exoplayer2.metadata.xiph.PictureFrame; +import com.google.android.exoplayer2.metadata.xiph.VorbisComment; import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.util.ParsableByteArray; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java index 49d49ac981..fbb5f8b8b2 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/extractor/FlacStreamMetadataTest.java @@ -21,7 +21,7 @@ import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.google.android.exoplayer2.extractor.flac.FlacConstants; import com.google.android.exoplayer2.metadata.Metadata; -import com.google.android.exoplayer2.metadata.flac.VorbisComment; +import com.google.android.exoplayer2.metadata.xiph.VorbisComment; import com.google.android.exoplayer2.testutil.TestUtil; import java.io.IOException; import java.util.ArrayList; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/PictureFrameTest.java similarity index 99% rename from library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/PictureFrameTest.java index 1a7b7b7be0..683af9df3f 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/PictureFrameTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/PictureFrameTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.metadata.flac; +package com.google.android.exoplayer2.metadata.xiph; import static com.google.common.truth.Truth.assertThat; diff --git a/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/VorbisCommentTest.java similarity index 98% rename from library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/VorbisCommentTest.java index 4c0f0592de..ceeefcef99 100644 --- a/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/flac/VorbisCommentTest.java +++ b/library/extractor/src/test/java/com/google/android/exoplayer2/metadata/xiph/VorbisCommentTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer2.metadata.flac; +package com.google.android.exoplayer2.metadata.xiph; import static com.google.common.truth.Truth.assertThat; diff --git a/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/PlaybackOutput.java b/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/PlaybackOutput.java index 000f9e627e..7bbc74f781 100644 --- a/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/PlaybackOutput.java +++ b/robolectricutils/src/main/java/com/google/android/exoplayer2/robolectric/PlaybackOutput.java @@ -22,8 +22,8 @@ import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.dvbsi.AppInfoTable; import com.google.android.exoplayer2.metadata.emsg.EventMessage; -import com.google.android.exoplayer2.metadata.flac.PictureFrame; -import com.google.android.exoplayer2.metadata.flac.VorbisComment; +import com.google.android.exoplayer2.metadata.xiph.PictureFrame; +import com.google.android.exoplayer2.metadata.xiph.VorbisComment; import com.google.android.exoplayer2.metadata.icy.IcyHeaders; import com.google.android.exoplayer2.metadata.icy.IcyInfo; import com.google.android.exoplayer2.metadata.id3.Id3Frame;