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

修复某些mpd时间计算错误及错误合并问题

This commit is contained in:
nilaoda 2022-08-21 20:42:03 +08:00
parent ad2c37486c
commit ef43b70409
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/N_m3u8DL-RE.Parser/Extractor/DASHExtractor2.cs
View File

@ -104,6 +104,9 @@ namespace N_m3u8DL_RE.Parser.Extractor
//本Period时长 //本Period时长
var periodDuration = period.Attribute("duration")?.Value; var periodDuration = period.Attribute("duration")?.Value;
//本Period ID
var periodId = period.Attribute("id")?.Value;
//最终分片会使用的baseurl //最终分片会使用的baseurl
var segBaseUrl = this.BaseUrl; var segBaseUrl = this.BaseUrl;
@ -136,6 +139,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
} }
var bandwidth = representation.Attribute("bandwidth"); var bandwidth = representation.Attribute("bandwidth");
StreamSpec streamSpec = new(); StreamSpec streamSpec = new();
streamSpec.PeriodId = periodId;
streamSpec.Playlist = new Playlist(); streamSpec.Playlist = new Playlist();
streamSpec.Playlist.MediaParts.Add(new MediaPart()); streamSpec.Playlist.MediaParts.Add(new MediaPart());
streamSpec.GroupId = representation.Attribute("id")?.Value; streamSpec.GroupId = representation.Attribute("id")?.Value;
@ -229,7 +233,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
var segmentList = representation.Elements().Where(e => e.Name.LocalName == "SegmentList").FirstOrDefault(); var segmentList = representation.Elements().Where(e => e.Name.LocalName == "SegmentList").FirstOrDefault();
if (segmentList != null) if (segmentList != null)
{ {
var duration = segmentList.Attribute("duration")?.Value; var durationStr = segmentList.Attribute("duration")?.Value;
//处理init url //处理init url
var initialization = segmentList.Elements().Where(e => e.Name.LocalName == "Initialization").FirstOrDefault(); var initialization = segmentList.Elements().Where(e => e.Name.LocalName == "Initialization").FirstOrDefault();
if (initialization != null) if (initialization != null)
@ -247,13 +251,16 @@ namespace N_m3u8DL_RE.Parser.Extractor
} }
//处理分片 //处理分片
var segmentURLs = segmentList.Elements().Where(e => e.Name.LocalName == "SegmentURL"); var segmentURLs = segmentList.Elements().Where(e => e.Name.LocalName == "SegmentURL");
var timescaleStr = segmentList.Attribute("timescale")?.Value ?? "1";
for (int segmentIndex = 0; segmentIndex < segmentURLs.Count(); segmentIndex++) for (int segmentIndex = 0; segmentIndex < segmentURLs.Count(); segmentIndex++)
{ {
var segmentURL = segmentURLs.ElementAt(segmentIndex); var segmentURL = segmentURLs.ElementAt(segmentIndex);
var mediaUrl = ParserUtil.CombineURL(segBaseUrl, segmentURL.Attribute("media")?.Value!); var mediaUrl = ParserUtil.CombineURL(segBaseUrl, segmentURL.Attribute("media")?.Value!);
var mediaRange = segmentURL.Attribute("mediaRange")?.Value; var mediaRange = segmentURL.Attribute("mediaRange")?.Value;
var timesacle = Convert.ToInt32(timescaleStr);
var duration = Convert.ToInt64(durationStr);
MediaSegment mediaSegment = new(); MediaSegment mediaSegment = new();
mediaSegment.Duration = Convert.ToDouble(duration); mediaSegment.Duration = duration / (double)timesacle;
mediaSegment.Url = mediaUrl; mediaSegment.Url = mediaUrl;
mediaSegment.Index = segmentIndex; mediaSegment.Index = segmentIndex;
if (mediaRange != null) if (mediaRange != null)
@ -401,7 +408,7 @@ namespace N_m3u8DL_RE.Parser.Extractor
} }
//处理同一ID分散在不同Period的情况 //处理同一ID分散在不同Period的情况
var _index = streamList.FindIndex(_f => _f.GroupId == streamSpec.GroupId && _f.Resolution == streamSpec.Resolution && _f.MediaType == streamSpec.MediaType); var _index = streamList.FindIndex(_f => _f.PeriodId != streamSpec.PeriodId && _f.GroupId == streamSpec.GroupId && _f.Resolution == streamSpec.Resolution && _f.MediaType == streamSpec.MediaType);
if (_index > -1) if (_index > -1)
{ {
if (isLive) if (isLive)