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

优化VTT时间轴偏移的自动处理逻辑

This commit is contained in:
nilaoda 2022-07-18 17:42:56 +08:00
parent ddd3931f57
commit e6371f2b56
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/N_m3u8DL-RE.Common/Entity/WebVttSub.cs
View File

@ -111,18 +111,33 @@ namespace N_m3u8DL_RE.Common.Entity
FixTimestamp(webSub, this.MpegtsTimestamp);
foreach (var item in webSub.Cues)
{
if (!this.Cues.Contains(item)) this.Cues.Add(item);
if (!this.Cues.Contains(item))
{
//如果相差只有1ms，且payload相同，则拼接
var last = this.Cues.LastOrDefault();
if (last != null && this.Cues.Count > 0 && (item.StartTime - last.EndTime).TotalMilliseconds <= 1 && item.Payload == last.Payload)
{
last.EndTime = item.EndTime;
}
else
{
this.Cues.Add(item);
}
}
}
return this;
}
public static void FixTimestamp(WebVttSub sub, long baseTimestamp)
private void FixTimestamp(WebVttSub sub, long baseTimestamp)
{
if (baseTimestamp == 0 || sub.MpegtsTimestamp == 0)
if (sub.MpegtsTimestamp == 0)
{
return;
}
//确实存在时间轴错误的情况，才修复
if ((this.Cues.Count > 0 && sub.Cues.Count > 0 && sub.Cues.First().StartTime < this.Cues.Last().EndTime) || this.Cues.Count == 0)
{
//The MPEG2 transport stream clocks (PCR, PTS, DTS) all have units of 1/90000 second
var seconds = (sub.MpegtsTimestamp - baseTimestamp) / 90000;
for (int i = 0; i < sub.Cues.Count; i++)
@ -131,6 +146,7 @@ namespace N_m3u8DL_RE.Common.Entity
sub.Cues[i].EndTime += TimeSpan.FromSeconds(seconds);
}
}
}
private static TimeSpan ConvertToTS(string str)
{

5
src/N_m3u8DL-RE/DownloadManager/SimpleDownloadManager.cs
View File

@ -132,6 +132,11 @@ namespace N_m3u8DL_RE.DownloadManager
{
var vttContent = File.ReadAllText(FileDic[seg]!.ActualFilePath);
var vtt = WebVttSub.Parse(vttContent);
//手动计算MPEGTS
if (finalVtt.MpegtsTimestamp == 0 && vtt.MpegtsTimestamp == 0)
{
vtt.MpegtsTimestamp = 90 * (long)(seg.Duration * 1000) * seg.Index;
}
if (first)
{
finalVtt = vtt;