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

增加色域识别

This commit is contained in:
nilaoda 2022-08-26 22:37:20 +08:00
parent c2d7fb9900
commit f064d75e5d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/N_m3u8DL-RE.Common/Entity/StreamSpec.cs
View File

@ -25,6 +25,8 @@ namespace N_m3u8DL_RE.Common.Entity
public string? Channels { get; set; } public string? Channels { get; set; }
public string? Extension { get; set; } public string? Extension { get; set; }
//补充信息-色域
public string? VideoRange { get; set; }
//外部轨道GroupId (后续寻找对应轨道信息) //外部轨道GroupId (后续寻找对应轨道信息)
public string? AudioId { get; set; } public string? AudioId { get; set; }
@ -58,7 +60,7 @@ namespace N_m3u8DL_RE.Common.Entity
else else
{ {
prefixStr = $"[aqua]Vid[/] {encStr}"; prefixStr = $"[aqua]Vid[/] {encStr}";
var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs}"; var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange}";
returnStr = d.EscapeMarkup(); returnStr = d.EscapeMarkup();
} }
@ -101,7 +103,7 @@ namespace N_m3u8DL_RE.Common.Entity
else else
{ {
prefixStr = $"[aqua]Vid[/] {encStr}"; prefixStr = $"[aqua]Vid[/] {encStr}";
var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {segmentsCountStr}"; var d = $"{Resolution} | {Bandwidth / 1000} Kbps | {GroupId} | {FrameRate} | {Codecs} | {VideoRange} | {segmentsCountStr}";
returnStr = d.EscapeMarkup(); returnStr = d.EscapeMarkup();
} }

10
src/N_m3u8DL-RE.Parser/Extractor/HLSExtractor.cs
View File

@ -125,6 +125,16 @@ namespace N_m3u8DL_RE.Parser.Extractor
if (!string.IsNullOrEmpty(subtitleId)) if (!string.IsNullOrEmpty(subtitleId))
streamSpec.SubtitleId = subtitleId; streamSpec.SubtitleId = subtitleId;
var videoRange = ParserUtil.GetAttribute(line, "VIDEO-RANGE");
if (!string.IsNullOrEmpty(videoRange))
streamSpec.VideoRange = videoRange;
//清除多余的编码信息 dvh1.05.06,ec-3 => dvh1.05.06
if (!string.IsNullOrEmpty(streamSpec.Codecs) && !string.IsNullOrEmpty(streamSpec.AudioId))
{
streamSpec.Codecs = streamSpec.Codecs.Split(',')[0];
}
expectPlaylist = true; expectPlaylist = true;
} }
else if (line.StartsWith(HLSTags.ext_x_media)) else if (line.StartsWith(HLSTags.ext_x_media))