mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Refact (minor)
This commit is contained in:
parent
fcc81913fc
commit
6a22810504
@ -523,6 +523,5 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
{
|
||||
stream.Write(_dataBuffer, 0, _dataBuffer.Length);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
|
||||
ms.Position = 0;
|
||||
const int packetLength = 188;
|
||||
var isM2TransportStream = TransportStreamParser.IsM3TransportStream(ms);
|
||||
var isM2TransportStream = TransportStreamParser.IsM2TransportStream(ms);
|
||||
var packetBuffer = new byte[packetLength];
|
||||
var m2TsTimeCodeBuffer = new byte[4];
|
||||
long position = 0;
|
||||
|
@ -25,7 +25,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
private List<Packet> SubtitlePackets { get; set; }
|
||||
private SortedDictionary<int, List<DvbSubPes>> SubtitlesLookup { get; set; }
|
||||
private SortedDictionary<int, List<TransportStreamSubtitle>> DvbSubtitlesLookup { get; set; } // images
|
||||
private bool IsM2TransportStream { get; set; }
|
||||
private bool _isM2TransportStream;
|
||||
|
||||
public void Parse(string fileName, LoadTransportStreamCallback callback)
|
||||
{
|
||||
@ -42,7 +42,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
/// <param name="callback">Optional callback event to follow progress</param>
|
||||
public void Parse(Stream ms, LoadTransportStreamCallback callback)
|
||||
{
|
||||
IsM2TransportStream = false;
|
||||
_isM2TransportStream = false;
|
||||
NumberOfNullPackets = 0;
|
||||
TotalNumberOfPackets = 0;
|
||||
TotalNumberOfPrivateStream1 = 0;
|
||||
@ -51,7 +51,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
SubtitlePackets = new List<Packet>();
|
||||
ms.Position = 0;
|
||||
const int packetLength = 188;
|
||||
IsM2TransportStream = IsM3TransportStream(ms);
|
||||
_isM2TransportStream = IsM2TransportStream(ms);
|
||||
var packetBuffer = new byte[packetLength];
|
||||
var m2TsTimeCodeBuffer = new byte[4];
|
||||
long position = 0;
|
||||
@ -74,7 +74,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
ms.Seek(position, SeekOrigin.Begin);
|
||||
while (position < transportStreamLength)
|
||||
{
|
||||
if (IsM2TransportStream)
|
||||
if (_isM2TransportStream)
|
||||
{
|
||||
ms.Read(m2TsTimeCodeBuffer, 0, m2TsTimeCodeBuffer.Length);
|
||||
position += m2TsTimeCodeBuffer.Length;
|
||||
@ -144,7 +144,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
else
|
||||
{
|
||||
// sync byte not found - search for it (will be very slow!)
|
||||
if (IsM2TransportStream)
|
||||
if (_isM2TransportStream)
|
||||
{
|
||||
position -= m2TsTimeCodeBuffer.Length;
|
||||
}
|
||||
@ -193,7 +193,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
}
|
||||
|
||||
DvbSubtitlesLookup = new SortedDictionary<int, List<TransportStreamSubtitle>>();
|
||||
if (IsM2TransportStream) // m2ts blu-ray images from PES packets
|
||||
if (_isM2TransportStream) // m2ts blu-ray images from PES packets
|
||||
{
|
||||
foreach (int pid in SubtitlesLookup.Keys)
|
||||
{
|
||||
@ -397,7 +397,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
}
|
||||
}
|
||||
|
||||
if (list.Any(p => p.IsDvbSubPicture) || IsM2TransportStream)
|
||||
if (list.Any(p => p.IsDvbSubPicture) || _isM2TransportStream)
|
||||
{
|
||||
if (SubtitlesLookup.ContainsKey(packetId))
|
||||
{
|
||||
@ -531,7 +531,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
|
||||
list.Add(pes);
|
||||
}
|
||||
|
||||
public static bool IsM3TransportStream(Stream ms)
|
||||
public static bool IsM2TransportStream(Stream ms)
|
||||
{
|
||||
if (ms.Length > 192 + 192 + 5)
|
||||
{
|
||||
|
@ -221,7 +221,7 @@ namespace Nikse.SubtitleEdit.Core
|
||||
{
|
||||
using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
|
||||
{
|
||||
return TransportStreamParser.IsM3TransportStream(fs);
|
||||
return TransportStreamParser.IsM2TransportStream(fs);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2780,25 +2780,16 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
if (format == null || ext == ".cdg" && file.Length < 50_000_000)
|
||||
if (format == null && ext == ".cdg" && file.Length < 50_000_000)
|
||||
{
|
||||
try
|
||||
using (var importCdg = new ImportCdg(fileName))
|
||||
{
|
||||
using (var importCdg = new ImportCdg(fileName))
|
||||
if (importCdg.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
if (importCdg.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
|
||||
|
||||
|
||||
// load audio
|
||||
}
|
||||
// load audio
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
format = null;
|
||||
}
|
||||
}
|
||||
|
||||
// retry vobsub (file with wrong extension)
|
||||
@ -19243,7 +19234,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (endTotalMilliseconds > next.StartTime.TotalMilliseconds - Configuration.Settings.General.MinimumMillisecondsBetweenLines)
|
||||
{
|
||||
endTotalMilliseconds = next.StartTime.TotalMilliseconds - Configuration.Settings.General.MinimumMillisecondsBetweenLines;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// create and insert
|
||||
@ -26833,7 +26824,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraph();
|
||||
}
|
||||
}
|
||||
|
||||
@ -26853,7 +26844,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
}
|
||||
}
|
||||
|
||||
RefreshSelectedParagraph();
|
||||
RefreshSelectedParagraph();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,6 +3,7 @@ using Nikse.SubtitleEdit.Core;
|
||||
using Nikse.SubtitleEdit.Core.BluRaySup;
|
||||
using Nikse.SubtitleEdit.Core.ContainerFormats;
|
||||
using Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream;
|
||||
using Nikse.SubtitleEdit.Core.Interfaces;
|
||||
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
||||
using Nikse.SubtitleEdit.Core.VobSub;
|
||||
using Nikse.SubtitleEdit.Logic;
|
||||
@ -24,7 +25,6 @@ using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml;
|
||||
using Nikse.SubtitleEdit.Core.Interfaces;
|
||||
|
||||
namespace Nikse.SubtitleEdit.Forms.Ocr
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user