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

Refact (minor)

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-09-25 16:37:49 +02:00
parent dbdec7fb21
commit 33e884a667
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libse/ContainerFormats/TransportStream/Packet.cs
View File

@ -38,7 +38,8 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
public int AdaptationFieldControl { get; set; }
/// <summary>
/// Incremented only when a payload is present (AdaptationFieldExist = 10 or 11). Starts at 0.
/// Incremented only when a payload is present (AdaptationFieldExist = 10 or 11).
/// Starts at 0, after 15 the CC re-starts from 0.
/// </summary>
public int ContinuityCounter { get; set; }

11
libse/ContainerFormats/TransportStream/TransportStreamParser.cs
View File

@ -18,7 +18,6 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
public int NumberOfNullPackets { get; private set; }
public long TotalNumberOfPackets { get; private set; }
public long TotalNumberOfPrivateStream1 { get; private set; }
public long TotalNumberOfPrivateStream1Continuation0 { get; private set; }
public List<int> SubtitlePacketIds { get; private set; }
public SortedDictionary<int, SortedDictionary<int, List<Paragraph>>> TeletextSubtitlesLookup { get; set; } // teletext
@ -46,7 +45,6 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
NumberOfNullPackets = 0;
TotalNumberOfPackets = 0;
TotalNumberOfPrivateStream1 = 0;
TotalNumberOfPrivateStream1Continuation0 = 0;
SubtitlePacketIds = new List<int>();
SubtitlePackets = new List<Packet>();
ms.Position = 0;
@ -127,11 +125,6 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
SubtitlePackets.RemoveAll(p => p.PacketId == packet.PacketId);
}
SubtitlePackets.Add(packet);
if (packet.ContinuityCounter == 0)
{
TotalNumberOfPrivateStream1Continuation0++;
}
}
TotalNumberOfPackets++;
position += packetLength;
@ -397,7 +390,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
}
}
if (list.Any(p => p.IsDvbSubPicture) || _isM2TransportStream)
if (_isM2TransportStream || list.Any(p => p.IsDvbSubPicture))
{
if (SubtitlesLookup.ContainsKey(packetId))
{
@ -485,7 +478,7 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
return null;
}
private List<DvbSubPes> ParseAndRemoveEmpty(List<DvbSubPes> list)
private static List<DvbSubPes> ParseAndRemoveEmpty(List<DvbSubPes> list)
{
var newList = new List<DvbSubPes>();
foreach (var pes in list)