Skip to content

Defer Dolby Vision mimeType assignment #2938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ybai001 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Defer Dolby Vision mimeType assignment #2938

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d56c07
Merge pull request #26 from androidx/main
ybai001 Dec 10, 2025
b1c3953
Defer Dolby Vision mimeType assignment
ybai001 Dec 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions libraries/extractor/src/main/java/androidx/media3/extractor/mp4/BoxParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1468,6 +1468,7 @@ private static void parseVideoSampleEntry(
@C.ColorTransfer int colorTransfer = Format.NO_VALUE;
// The format of HDR static info is defined in CTA-861-G:2017, Table 45.
@Nullable ByteBuffer hdrStaticInfo = null;
@Nullable DolbyVisionConfig dolbyVisionConfig = null;

while (childPosition - position < size) {
parent.setPosition(childPosition);
Expand Down Expand Up @@ -1607,10 +1608,9 @@ private static void parseVideoSampleEntry(
false, "initializationData must already be set from hvcC or avcC atom");
}
parent.setPosition(childStartPosition + Mp4Box.HEADER_SIZE);
@Nullable DolbyVisionConfig dolbyVisionConfig = DolbyVisionConfig.parse(parent);
if (dolbyVisionConfig != null) {
codecs = dolbyVisionConfig.codecs;
mimeType = MimeTypes.VIDEO_DOLBY_VISION;
@Nullable DolbyVisionConfig parsedDvConfig = DolbyVisionConfig.parse(parent);
if (parsedDvConfig != null) {
dolbyVisionConfig = parsedDvConfig;
}
} else if (childAtomType == Mp4Box.TYPE_vpcC) {
ExtractorUtil.checkContainerInput(mimeType == null, /* message= */ null);
Expand Down Expand Up @@ -1780,6 +1780,11 @@ private static void parseVideoSampleEntry(
childPosition += childAtomSize;
}

if (dolbyVisionConfig != null) {
mimeType = MimeTypes.VIDEO_DOLBY_VISION;
codecs = dolbyVisionConfig.codecs;
}

// If the media type was not recognized, ignore the track.
if (mimeType == null) {
return;
Expand Down