Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

Optimize seek silence slightly

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-03-15 23:21:24 +01:00
parent 87b95d9c83
commit 61c3f8ecb6
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Controls/AudioVisualizer.cs
View File

@ -444,7 +444,7 @@ namespace Nikse.SubtitleEdit.Controls
for (int index = 0; index < _ranges.Length; index++)
{
var range = _ranges[index];
if (range.End >= position && (range.Start < _nextSelection.Start || (range.Start == _nextSelection.Start && range.End > _nextSelection.End)))
if (range.End >= position && (range.Start < _nextSelection.Start || range.Start == _nextSelection.Start && range.End > _nextSelection.End))
{
_nextSelection = range;
}
@ -1718,7 +1718,7 @@ namespace Nikse.SubtitleEdit.Controls
else if (endSeconds > EndPositionSeconds)
{
double newStartPos = _startPositionSeconds + (endSeconds - EndPositionSeconds); // move later, so whole selected paragraph is visible
if (newStartPos < seconds) // but only if visibile screen is wide enough
if (newStartPos < seconds) // but only if visible screen is wide enough
{
_startPositionSeconds = newStartPos;
}
@ -1932,39 +1932,37 @@ namespace Nikse.SubtitleEdit.Controls
int begin = SecondsToSampleIndex(_currentVideoPositionSeconds - 1);
int length = SecondsToSampleIndex(durationInSeconds);
var threshold = thresholdPercent / 100.0 * _wavePeaks.HighestPeak;
int hitCount = 0;
for (int i = begin; i > 0; i--)
{
if (i > 0 && i < _wavePeaks.Peaks.Count && _wavePeaks.Peaks[i].Abs <= threshold)
{
hitCount++;
if (hitCount > length)
{
double seconds = SampleIndexToSeconds(i + length / 2);
if (seconds >= 0)
{
StartPositionSeconds = seconds;
if (_startPositionSeconds > 1)
{
StartPositionSeconds -= 1;
}
else
{
StartPositionSeconds = 0;
}
OnSingleClick?.Invoke(this, new ParagraphEventArgs(seconds, null));
Invalidate();
}
return seconds;
}
}
else
{
hitCount = 0;
}
if (hitCount > length)
{
double seconds = SampleIndexToSeconds(i + length / 2);
if (seconds >= 0)
{
StartPositionSeconds = seconds;
if (_startPositionSeconds > 1)
{
StartPositionSeconds -= 1;
}
else
{
StartPositionSeconds = 0;
}
OnSingleClick?.Invoke(this, new ParagraphEventArgs(seconds, null));
Invalidate();
}
return seconds;
}
}
return -1;
}
@ -1985,16 +1983,15 @@ namespace Nikse.SubtitleEdit.Controls
if (i > 0 && i < _wavePeaks.Peaks.Count && _wavePeaks.Peaks[i].Abs <= threshold)
{
hitCount++;
if (hitCount > length)
{
return Math.Max(0, SampleIndexToSeconds(i + length) - 0.01);
}
}
else
{
hitCount = 0;
}
if (hitCount > length)
{
return Math.Max(0, SampleIndexToSeconds(i + length) - 0.01);
}
}
return -1;
}