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

Update Dolby Vision format handling

Browse Source 
* Add the missing DV profile 10 handling
* Set DV codec string instead of compatible format codec string in MP4 extractor
This commit is contained in:
ybai001 2025-01-08 10:40:03 +08:00
parent 39c35b779b
commit d16d80ca49
3 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java
View File

@ -317,15 +317,24 @@ public final class MediaCodecInfo {
int profile = codecProfileAndLevel.first; int profile = codecProfileAndLevel.first;
int level = codecProfileAndLevel.second; int level = codecProfileAndLevel.second;
if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) { if (MimeTypes.VIDEO_DOLBY_VISION.equals(format.sampleMimeType)) {
// If this codec is H264 or H265, we only support the Dolby Vision base layer and need to map // If this codec is H.264, H.265 or AV1, we only support the Dolby Vision base layer and need
// the Dolby Vision profile to the corresponding base layer profile. Also assume all levels of // to map the Dolby Vision profile to the corresponding base layer profile. Also assume all
// this base layer profile are supported. // levels of this base layer profile are supported.
if (MimeTypes.VIDEO_H264.equals(mimeType)) { switch (mimeType) {
profile = CodecProfileLevel.AVCProfileHigh; case MimeTypes.VIDEO_H264:
level = 0; profile = CodecProfileLevel.AVCProfileHigh;
} else if (MimeTypes.VIDEO_H265.equals(mimeType)) { level = 0;
profile = CodecProfileLevel.HEVCProfileMain10; break;
level = 0; case MimeTypes.VIDEO_H265:
profile = CodecProfileLevel.HEVCProfileMain10;
level = 0;
break;
case MimeTypes.VIDEO_AV1:
profile = CodecProfileLevel.AV1ProfileMain10;
level = 0;
break;
default:
break;
} }
} }

12
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java
View File

@ -1144,11 +1144,11 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
String sampleMimeType = checkNotNull(format.sampleMimeType); String sampleMimeType = checkNotNull(format.sampleMimeType);
if (MimeTypes.VIDEO_DOLBY_VISION.equals(sampleMimeType)) { if (MimeTypes.VIDEO_DOLBY_VISION.equals(sampleMimeType)) {
// Dolby vision can be a wrapper around H264 or H265. We assume it's wrapping H265 by default // Dolby vision can be a wrapper around H.264, H.265 or AV1. We assume it's wrapping H.265 by
// because it's the common case, and because some devices may fail to allocate the codec when // default because it's the common case, and because some devices may fail to allocate the
// the larger buffer size required for H264 is requested. We size buffers for H264 only if the // codec when the larger buffer size required for H.264/AV1 is requested. We size buffers
// format contains sufficient information for us to determine unambiguously that it's a H264 // for H.264/AV1 only if the format contains sufficient information for us to determine
// profile. // unambiguously that it's a H.264/AV1 based profile.
sampleMimeType = MimeTypes.VIDEO_H265; sampleMimeType = MimeTypes.VIDEO_H265;
@Nullable @Nullable
Pair<Integer, Integer> codecProfileAndLevel = MediaCodecUtil.getCodecProfileAndLevel(format); Pair<Integer, Integer> codecProfileAndLevel = MediaCodecUtil.getCodecProfileAndLevel(format);
@ -1158,6 +1158,8 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer
|| profile == CodecProfileLevel.DolbyVisionProfileDvavPer || profile == CodecProfileLevel.DolbyVisionProfileDvavPer
|| profile == CodecProfileLevel.DolbyVisionProfileDvavPen) { || profile == CodecProfileLevel.DolbyVisionProfileDvavPen) {
sampleMimeType = MimeTypes.VIDEO_H264; sampleMimeType = MimeTypes.VIDEO_H264;
} else if (profile == CodecProfileLevel.DolbyVisionProfileDvav110) {
sampleMimeType = MimeTypes.VIDEO_AV1;
} }
} }
} }

11
libraries/extractor/src/main/java/androidx/media3/extractor/DolbyVisionConfig.java
View File

@ -38,16 +38,17 @@ public final class DolbyVisionConfig {
int dvProfile = (profileData >> 1); int dvProfile = (profileData >> 1);
int dvLevel = ((profileData & 0x1) << 5) | ((data.readUnsignedByte() >> 3) & 0x1F); int dvLevel = ((profileData & 0x1) << 5) | ((data.readUnsignedByte() >> 3) & 0x1F);
String codecsPrefix; String codecsPrefix;
if (dvProfile == 4 || dvProfile == 5 || dvProfile == 7) { if (dvProfile == 4 || dvProfile == 5 || dvProfile == 7 || dvProfile == 8) {
codecsPrefix = "dvhe"; codecsPrefix = "dvhe";
} else if (dvProfile == 8) {
codecsPrefix = "hev1";
} else if (dvProfile == 9) { } else if (dvProfile == 9) {
codecsPrefix = "avc3"; codecsPrefix = "dvav";
} else if (dvProfile == 10) {
codecsPrefix = "dav1";
} else { } else {
return null; return null;
} }
String codecs = codecsPrefix + ".0" + dvProfile + (dvLevel < 10 ? ".0" : ".") + dvLevel; String codecs = codecsPrefix + (dvProfile < 10 ? ".0" : ".") + dvProfile
+ (dvLevel < 10 ? ".0" : ".") + dvLevel;
return new DolbyVisionConfig(dvProfile, dvLevel, codecs); return new DolbyVisionConfig(dvProfile, dvLevel, codecs);
} }