Mirror-Tools
/
N_m3u8DL-RE
mirror of https://github.com/nilaoda/N_m3u8DL-RE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #407 from nilaoda/feat/dolby_ism 

支持杜比视界ISM解析
This commit is contained in:
nilaoda 2024-06-22 23:57:08 +08:00 committed by GitHub
parent 54a9eda497 c1776cbc15
commit 5f131f13af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -363,3 +363,6 @@ MigrationBackup/
# Fody - auto-generated XML schema
FodyWeavers.xsd
# macOS shit
.DS_Store

27
src/N_m3u8DL-RE.Parser/Mp4/MSSMoovProcessor.cs
View File

@ -62,7 +62,7 @@ namespace N_m3u8DL_RE.Parser.Mp4
private static byte SELF_CONTAINED = 0x1;
private static List<string> SupportedFourCC = new List<string>()
{
"HVC1","HEV1","AACL","AACH","EC-3","H264","AVC1","DAVC","AVC1","TTML"
"HVC1","HEV1","AACL","AACH","EC-3","H264","AVC1","DAVC","AVC1","TTML","DVHE","DVH1"
};
public MSSMoovProcessor(StreamSpec streamSpec)
@ -546,6 +546,27 @@ namespace N_m3u8DL_RE.Parser.Mp4
return Box("hvc1", stream.ToArray()); //HEVC Simple Entry
}
}
// 杜比视界也按照hevc处理
else if (FourCC == "DVHE" || FourCC == "DVH1")
{
var arr = CodecPrivateData.Split(new[] { StartCode }, StringSplitOptions.RemoveEmptyEntries);
var vps = HexUtil.HexToBytes(arr.Where(x => (HexUtil.HexToBytes(x[0..2])[0] >> 1) == 0x20).First());
var sps = HexUtil.HexToBytes(arr.Where(x => (HexUtil.HexToBytes(x[0..2])[0] >> 1) == 0x21).First());
var pps = HexUtil.HexToBytes(arr.Where(x => (HexUtil.HexToBytes(x[0..2])[0] >> 1) == 0x22).First());
//make hvcC
var hvcC = GetHvcC(sps, pps, vps, "dvh1");
writer.Write(hvcC);
if (IsProtection)
{
var sinfBox = GenSinf("dvh1");
writer.Write(sinfBox);
return Box("encv", stream.ToArray()); //Encrypted Video
}
else
{
return Box("dvh1", stream.ToArray()); //HEVC Simple Entry
}
}
else
{
throw new NotSupportedException();
@ -591,7 +612,7 @@ namespace N_m3u8DL_RE.Parser.Mp4
return Box("avcC", stream.ToArray()); //AVC Decoder Configuration Record
}
private byte[] GetHvcC(byte[] sps, byte[] pps, byte[] vps)
private byte[] GetHvcC(byte[] sps, byte[] pps, byte[] vps, string code = "hvc1")
{
var oriSps = new List<byte>(sps);
//https://www.itu.int/rec/dologin.asp?lang=f&id=T-REC-H.265-201504-S!!PDF-E&type=items
@ -652,7 +673,7 @@ namespace N_m3u8DL_RE.Parser.Mp4
}*/
//生成编码信息
var codecs = $"hvc1" +
var codecs = code +
$".{HEVC_GENERAL_PROFILE_SPACE_STRINGS[generalProfileSpace]}{generalProfileIdc}" +
$".{Convert.ToString(generalProfileCompatibilityFlags, 16)}" +
$".{(generalTierFlag == 1 ? 'H' : 'L')}{generalLevelIdc}" +

2
src/N_m3u8DL-RE/CommandLine/CommandInvoker.cs
View File

@ -18,7 +18,7 @@ namespace N_m3u8DL_RE.CommandLine
{
internal partial class CommandInvoker
{
public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20231113";
public const string VERSION_INFO = "N_m3u8DL-RE (Beta version) 20240622";
[GeneratedRegex("((best|worst)\\d*|all)")]
private static partial Regex ForStrRegex();