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

Fix waveform delay sync issue in mkv - thx Joel :)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-09-19 09:23:31 +02:00
parent 291d3cd69a
commit f33ffe12ad
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libse/ContainerFormats/Matroska/MatroskaFile.cs
View File

@ -111,6 +111,19 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.Matroska
return 0;
}
public long GetAudioTrackDelayMilliseconds(int audioTrackNumber)
{
var tracks = GetTracks(false);
var videoTrack = tracks.FirstOrDefault(p => p.IsVideo && p.IsDefault) ?? tracks.FirstOrDefault(p => p.IsVideo);
long videoDelay = 0;
if (videoTrack != null)
{
videoDelay = GetTrackStartTime(videoTrack.TrackNumber);
}
return GetTrackStartTime(audioTrackNumber) - videoDelay;
}
private long FindTrackStartInCluster(Element cluster, int targetTrackNumber)
{
long clusterTimeCode = 0L;

5
src/Forms/AddWaveform.cs
View File

@ -396,11 +396,12 @@ namespace Nikse.SubtitleEdit.Forms
matroska = new MatroskaFile(labelVideoFileName.Text);
if (matroska.IsValid)
{
_delayInMilliseconds = (int)matroska.GetTrackStartTime(mkvAudioTrackNumbers[_audioTrackNumber]);
_delayInMilliseconds = (int)matroska.GetAudioTrackDelayMilliseconds(mkvAudioTrackNumbers[_audioTrackNumber]);
}
}
catch
catch (Exception exception)
{
SeLogger.Error(exception, $"Error getting delay from mkv: {labelVideoFileName.Text}");
_delayInMilliseconds = 0;
}
finally

5
src/Forms/AddWaveformBatch.cs
View File

@ -316,13 +316,14 @@ namespace Nikse.SubtitleEdit.Forms
}
if (mkvAudioTrackNumbers.Count > 0)
{
_delayInMilliseconds = (int)matroska.GetTrackStartTime(mkvAudioTrackNumbers[0]);
_delayInMilliseconds = (int)matroska.GetAudioTrackDelayMilliseconds(mkvAudioTrackNumbers[0]);
}
}
}
}
catch
catch (Exception exception)
{
SeLogger.Error(exception, $"Error getting delay from mkv: {fileName}");
_delayInMilliseconds = 0;
}
}