Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 04:33:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7956 from Flitskikker/feature/btc-fix-20240221

Browse Source 
A few more "Beautify time codes" fixes
This commit is contained in:
Nikolaj Olsson 2024-02-21 20:33:05 +01:00 committed by GitHub
commit c5b24c9453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/libse/Forms/TimeCodesBeautifier.cs
View File

@ -81,8 +81,18 @@ namespace Nikse.SubtitleEdit.Core.Forms
}
else
{
// If not, then we have a free out cue
FixOutCue(p);
// If not, check if we have chainable subtitles
result = FixChainableSubtitles(paragraph, nextParagraph);
if (result)
{
// Yes, this means the next subtitle's in cue is now also processed. Skipping in next iteration
skipNextInCue = true;
}
else
{
// If not, then we have a free out cue
FixOutCue(p);
}
}
// Report progress
@ -514,6 +524,20 @@ namespace Nikse.SubtitleEdit.Core.Forms
var bestRightInCueFrameInfo = FindBestCueFrame(newRightInCueFrame, true);
var bestRightInCueFrame = bestRightInCueFrameInfo.cueFrame;
// Check if the left out cue was pushed backward due to a green zone
if (bestLeftOutCueFrameInfo.result == FindBestCueResult.SnappedToLeftGreenZone)
{
// Yes, then we'll want to use the original position instead: it might be pushed outside of the chaining threshold, but chaining should take precedence.
bestLeftOutCueFrame = newLeftOutCueFrame;
}
// Check if the right in cue was pushed forward due to a green zone
if (bestRightInCueFrameInfo.result == FindBestCueResult.SnappedToRightGreenZone)
{
// Yes, then we'll want to use the original position instead: it might be pushed outside of the chaining threshold, but chaining should take precedence.
bestRightInCueFrame = newRightInCueFrame;
}
// Check cases
var isLeftOutCueOnShotChange = IsCueOnShotChange(bestLeftOutCueFrame, false);
var isRightInCueOnShotChange = IsCueOnShotChange(bestRightInCueFrame, true);
@ -886,7 +910,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
var previousParagraph = _subtitle.Paragraphs.ElementAtOrDefault(index - 1);
if (previousParagraph != null)
{
var distance = previousParagraph.StartTime.TotalMilliseconds - paragraph.EndTime.TotalMilliseconds;
var distance = paragraph.StartTime.TotalMilliseconds - previousParagraph.EndTime.TotalMilliseconds;
// If an overlap threshold is set, don't fix if threshold exceeded
if (distance < 0 && Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)
@ -910,7 +934,7 @@ namespace Nikse.SubtitleEdit.Core.Forms
var nextParagraph = _subtitle.Paragraphs.ElementAtOrDefault(index + 1);
if (nextParagraph != null)
{
var distance = paragraph.StartTime.TotalMilliseconds - nextParagraph.EndTime.TotalMilliseconds;
var distance = nextParagraph.StartTime.TotalMilliseconds - paragraph.EndTime.TotalMilliseconds;
// If an overlap threshold is set, don't fix if threshold exceeded
if (distance < 0 && Configuration.Settings.BeautifyTimeCodes.OverlapThreshold > 0 && Math.Abs(distance) >= Configuration.Settings.BeautifyTimeCodes.OverlapThreshold)