Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Improve time code reading from CHK files - thx ginodecock :)

Browse Source 
Work on #4181
This commit is contained in:
Nikolaj Olsson 2020-05-13 18:35:13 +02:00
parent efbf2494f1
commit 8a7f8cd1a5
1 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libse/SubtitleFormats/Chk.cs
View File

@ -49,6 +49,21 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
index += 128;
}
if (subtitle.Paragraphs.Count > 1)
{
if (string.IsNullOrWhiteSpace(subtitle.Paragraphs[0].Text))
{
subtitle.Paragraphs.RemoveAt(0);
}
if (string.IsNullOrWhiteSpace(subtitle.Paragraphs[subtitle.Paragraphs.Count - 1].Text))
{
subtitle.Paragraphs.RemoveAt(subtitle.Paragraphs.Count - 1);
}
}
subtitle.Renumber();
}
private Queue<Paragraph> _timeCodeQueue = new Queue<Paragraph>();
@ -104,6 +119,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
//}
return p;
}
if (buffer[index] == 0x0a && _timeCodeQueue.Count > 0)
{
// ?
@ -114,19 +130,38 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
else // time codes
{
_timeCodeQueue = new Queue<Paragraph>();
var newTimeCodes = new List<Paragraph>();
for (int i = 0; i < 15; i++)
{
int start = index + 2 + (i * 8);
int totalFrameNumber = (buffer[start + 3] << 16) + (buffer[start + 5] << 8) + buffer[start + 4];
int durationInFrames = buffer[start + 6];
var p = new Paragraph(string.Empty, FramesToMilliseconds(totalFrameNumber), FramesToMilliseconds(totalFrameNumber + durationInFrames));
_timeCodeQueue.Enqueue(p);
newTimeCodes.Add(p);
}
if (_timeCodeQueue.Count != 15 || IsSequential(newTimeCodes))
{
_timeCodeQueue = new Queue<Paragraph>(newTimeCodes);
}
}
return null;
}
private static bool IsSequential(List<Paragraph> newTimeCodes)
{
var lastMs = 0.0;
foreach (var p in newTimeCodes)
{
if (p.StartTime.TotalMilliseconds < lastMs)
{
return false;
}
lastMs = p.StartTime.TotalMilliseconds;
}
return true;
}
private string GetText(byte[] buffer, int start, int end)
{
string text = string.Empty;
@ -273,6 +308,5 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
return text;
}
}
}