Skip to content

Commit

Permalink
Merge pull request #1389 from DolbyLaboratories:dlb/dovi-profile10/dev
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 637827802
  • Loading branch information
copybara-github committed May 28, 2024
2 parents 8feaf82 + 205bbef commit 67b799c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@
processor to throw an exception
([#1352](https://github.com/androidx/media/issues/1352)).
* Video:
* Fix decoder fallback logic for Dolby Vision to use a compatible AV1
decoder if needed
([#1389](https://github.com/androidx/media/pull/1389)).
* Text:
* Fix issue where subtitles starting before a seek position are skipped.
This issue was only introduced in Media3 1.4.0-alpha01.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ public static String getAlternativeCodecMimeType(Format format) {
return MimeTypes.AUDIO_E_AC3;
}
if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) {
// H.264/AVC or H.265/HEVC decoders can decode the base layer of some DV profiles. This can't
// be done for profile CodecProfileLevel.DolbyVisionProfileDvheStn and profile
// H.264/AVC, H.265/HEVC or AV1 decoders can decode the base layer of some DV profiles.
// This can't be done for profile CodecProfileLevel.DolbyVisionProfileDvheStn and profile
// CodecProfileLevel.DolbyVisionProfileDvheDtb because the first one is not backward
// compatible and the second one is deprecated and is not always backward compatible.
@Nullable Pair<Integer, Integer> codecProfileAndLevel = getCodecProfileAndLevel(format);
Expand All @@ -362,6 +362,8 @@ public static String getAlternativeCodecMimeType(Format format) {
return MimeTypes.VIDEO_H265;
} else if (profile == CodecProfileLevel.DolbyVisionProfileDvavSe) {
return MimeTypes.VIDEO_H264;
} else if (profile == CodecProfileLevel.DolbyVisionProfileDvav110) {
return MimeTypes.VIDEO_AV1;
}
}
}
Expand Down

0 comments on commit 67b799c

Please sign in to comment.