From e7b1c021a56eda79d4edf8c363f59a9ae485036d Mon Sep 17 00:00:00 2001 From: Haixia Shi Date: Wed, 15 Mar 2023 07:07:26 -0700 Subject: [PATCH] Replace ffmpeg specific link with generic VP9/MP4 atom syntax spec. --- .../android/exoplayer2/extractor/mp4/AtomParsers.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/extractor/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 index cd2f8e5b20..f1ed8260cb 100644 --- a/library/extractor/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 @@ -1173,10 +1173,10 @@ import org.checkerframework.checker.nullness.compatqual.NullableType; } else if (childAtomType == Atom.TYPE_vpcC) { ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null); mimeType = (atomType == Atom.TYPE_vp08) ? MimeTypes.VIDEO_VP8 : MimeTypes.VIDEO_VP9; - parent.setPosition(childStartPosition + Atom.HEADER_SIZE); - // vpcC atom parsing based on FFmpeg implementation - // see https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/vpcc.c - parent.skipBytes(6); + // See vpcC atom syntax: https://www.webmproject.org/vp9/mp4/#syntax_1 + // Skip FullBox header, and profile and level fields + parent.setPosition(childStartPosition + Atom.FULL_HEADER_SIZE); + parent.skipBytes(2); boolean fullRangeFlag = (parent.readUnsignedByte() & 1) != 0; int colorPrimaries = parent.readUnsignedByte(); int transferCharacteristics = parent.readUnsignedByte();