From 614dbd1cfc6cceff2fd9de7772bd088771c113ef Mon Sep 17 00:00:00 2001 From: Haixia Shi Date: Tue, 14 Mar 2023 17:02:22 -0700 Subject: [PATCH] Fix VP9 color space parsing in MP4 atom parser This adds vpcC atom parsing based on the open-source FFmpeg implementation (https://github.com/FFmpeg/FFmpeg/blob/master/libavformat/vpcc.c#L213) This fix is needed to have correct color space parsing in vpcC atom because Instagram serves HDR VP9 encodings in MP4 containers. --- .../android/exoplayer2/extractor/mp4/AtomParsers.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 3a9cedf98a..cd2f8e5b20 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,6 +1173,17 @@ 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); + boolean fullRangeFlag = (parent.readUnsignedByte() & 1) != 0; + int colorPrimaries = parent.readUnsignedByte(); + int transferCharacteristics = parent.readUnsignedByte(); + colorSpace = ColorInfo.isoColorPrimariesToColorSpace(colorPrimaries); + colorRange = fullRangeFlag ? C.COLOR_RANGE_FULL : C.COLOR_RANGE_LIMITED; + colorTransfer = + ColorInfo.isoTransferCharacteristicsToColorTransfer(transferCharacteristics); } else if (childAtomType == Atom.TYPE_av1C) { ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null); mimeType = MimeTypes.VIDEO_AV1;