loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1389 from DolbyLaboratories:dlb/dovi-profile10/dev

Browse Source 
PiperOrigin-RevId: 637827802
This commit is contained in:
Copybara-Service 2024-05-28 02:39:42 -07:00
commit 67b799c714
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELEASENOTES.md
View File

@ -80,6 +80,9 @@
processor to throw an exception processor to throw an exception
([#1352](https://github.com/androidx/media/issues/1352)). ([#1352](https://github.com/androidx/media/issues/1352)).
* Video: * 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: * Text:
* Fix issue where subtitles starting before a seek position are skipped. * Fix issue where subtitles starting before a seek position are skipped.
This issue was only introduced in Media3 1.4.0-alpha01. This issue was only introduced in Media3 1.4.0-alpha01.

6
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtil.java
View File

@ -350,8 +350,8 @@ public final class MediaCodecUtil {
return MimeTypes.AUDIO_E_AC3; return MimeTypes.AUDIO_E_AC3;
} }
if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) { 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 // H.264/AVC, H.265/HEVC or AV1 decoders can decode the base layer of some DV profiles.
// be done for profile CodecProfileLevel.DolbyVisionProfileDvheStn and profile // This can't be done for profile CodecProfileLevel.DolbyVisionProfileDvheStn and profile
// CodecProfileLevel.DolbyVisionProfileDvheDtb because the first one is not backward // CodecProfileLevel.DolbyVisionProfileDvheDtb because the first one is not backward
// compatible and the second one is deprecated and is not always backward compatible. // compatible and the second one is deprecated and is not always backward compatible.
@Nullable Pair<Integer, Integer> codecProfileAndLevel = getCodecProfileAndLevel(format); @Nullable Pair<Integer, Integer> codecProfileAndLevel = getCodecProfileAndLevel(format);
@ -362,6 +362,8 @@ public final class MediaCodecUtil {
return MimeTypes.VIDEO_H265; return MimeTypes.VIDEO_H265;
} else if (profile == CodecProfileLevel.DolbyVisionProfileDvavSe) { } else if (profile == CodecProfileLevel.DolbyVisionProfileDvavSe) {
return MimeTypes.VIDEO_H264; return MimeTypes.VIDEO_H264;
} else if (profile == CodecProfileLevel.DolbyVisionProfileDvav110) {
return MimeTypes.VIDEO_AV1;
} }
} }
} }