sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-25 14:47:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup VorbisUtil

Browse source 
Slightly cleanup VorbisUtil.
This commit is contained in:
OxygenCobalt 2022-01-09 18:52:54 -07:00
parent 90b3056820
commit 29d978fdd4
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
View file

@ -302,8 +302,9 @@ public final class VorbisUtil {
Log.w(TAG, "Failed to parse Vorbis comment: " + vorbisComment); Log.w(TAG, "Failed to parse Vorbis comment: " + vorbisComment);
} else { } else {
if (keyAndValue[0].equals("METADATA_BLOCK_PICTURE")) { if (keyAndValue[0].equals("METADATA_BLOCK_PICTURE")) {
// This tag is a special cover art tag. Decode it from Base64 and make it a // This tag is a special cover art tag, outlined by
// PictureFrame. // https://wiki.xiph.org/index.php/VorbisComment#Cover_art.
// Decode it from Base64 and transform it into a PictureFrame.
try { try {
byte[] decoded = Base64.decode(keyAndValue[1], Base64.DEFAULT); byte[] decoded = Base64.decode(keyAndValue[1], Base64.DEFAULT);
metadataEntries.add(buildPictureFrame(new ParsableByteArray(decoded))); metadataEntries.add(buildPictureFrame(new ParsableByteArray(decoded)));
@ -324,22 +325,22 @@ public final class VorbisUtil {
/** /**
* Transforms a picture metadata block into a picture frame. * Transforms a picture metadata block into a picture frame.
* *
* @param input The bytes of the picture. * @param scratch The bytes of the picture.
* @return A picture frame from the input data. * @return A picture frame from the scratch data.
*/ */
static PictureFrame buildPictureFrame(ParsableByteArray input) { static PictureFrame buildPictureFrame(ParsableByteArray scratch) {
int pictureType = input.readInt(); int pictureType = scratch.readInt();
int mimeTypeLength = input.readInt(); int mimeTypeLength = scratch.readInt();
String mimeType = input.readString(mimeTypeLength, Charsets.US_ASCII); String mimeType = scratch.readString(mimeTypeLength, Charsets.US_ASCII);
int descriptionLength = input.readInt(); int descriptionLength = scratch.readInt();
String description = input.readString(descriptionLength); String description = scratch.readString(descriptionLength);
int width = input.readInt(); int width = scratch.readInt();
int height = input.readInt(); int height = scratch.readInt();
int depth = input.readInt(); int depth = scratch.readInt();
int colors = input.readInt(); int colors = scratch.readInt();
int pictureDataLength = input.readInt(); int pictureDataLength = scratch.readInt();
byte[] pictureData = new byte[pictureDataLength]; byte[] pictureData = new byte[pictureDataLength];
input.readBytes(pictureData, 0, pictureDataLength); scratch.readBytes(pictureData, 0, pictureDataLength);
return new PictureFrame( return new PictureFrame(
pictureType, mimeType, description, width, height, depth, colors, pictureData); pictureType, mimeType, description, width, height, depth, colors, pictureData);