loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source 
Group up some other minor changes with the vorbis comment utils.
This commit is contained in:
OxygenCobalt 2022-01-17 09:15:13 -07:00
parent b9191615ee
commit 7a88829ea6
No known key found for this signature in database
GPG Key ID: 37DBE3621FE9AD47
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
View File

@ -331,7 +331,7 @@ public final class VorbisUtil {
* @param scratch The bytes of the picture. * @param scratch The bytes of the picture.
* @return A picture frame from the scratch data. * @return A picture frame from the scratch data.
*/ */
public static PictureFrame buildPictureFrame(ParsableByteArray scratch) { /* package */ static PictureFrame buildPictureFrame(ParsableByteArray scratch) {
int pictureType = scratch.readInt(); int pictureType = scratch.readInt();
int mimeTypeLength = scratch.readInt(); int mimeTypeLength = scratch.readInt();
String mimeType = scratch.readString(mimeTypeLength, Charsets.US_ASCII); String mimeType = scratch.readString(mimeTypeLength, Charsets.US_ASCII);

1
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
View File

@ -87,7 +87,6 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
checkNotNull(setupData.format); // Has been set when the header was read checkNotNull(setupData.format); // Has been set when the header was read
int startPosition = packet.getPosition(); int startPosition = packet.getPosition();
if (!validateCommentHeaderSignature(packet)) { if (!validateCommentHeaderSignature(packet)) {
packet.setPosition(startPosition); packet.setPosition(startPosition);
return false; return false;

2
library/extractor/src/main/java/com/google/android/exoplayer2/metadata/vorbis/PictureFrame.java
View File

@ -24,7 +24,7 @@ import com.google.android.exoplayer2.MediaMetadata;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import java.util.Arrays; import java.util.Arrays;
/** A picture parsed from a FLAC file. */ /** A picture parsed from a Vorbis Comment or a FLAC metadata block. */
public class PictureFrame implements Metadata.Entry { public class PictureFrame implements Metadata.Entry {
/** The type of the picture. */ /** The type of the picture. */