mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Removed some unused stuff
This commit is contained in:
parent
a2ebec09f6
commit
deb7e9c2f1
@ -121,8 +121,7 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
var dataUnitLen = _dataBuffer[i++];
|
||||
if (dataUnitId == (int)Teletext.DataUnitT.DataUnitEbuTeletextNonSubtitle || dataUnitId == (int)Teletext.DataUnitT.DataUnitEbuTeletextSubtitle)
|
||||
{
|
||||
// teletext payload has always size 44 bytes
|
||||
if (dataUnitLen == 44)
|
||||
if (dataUnitLen == 44) // teletext payload has always size 44 bytes
|
||||
{
|
||||
// reverse endianness (via lookup table), ETS 300 706, chapter 7.1
|
||||
for (var j = 0; j < dataUnitLen; j++)
|
||||
@ -143,17 +142,17 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
|
||||
public Dictionary<int, Paragraph> GetTeletext(int packetId, TeletextRunSettings teletextRunSettings, int pageNumber, int pageNumberBcd, ulong? firstMs)
|
||||
{
|
||||
var lastTimestamp = PresentationTimestamp.HasValue ? (PresentationTimestamp.Value / 90) : 0;
|
||||
var lastTimestamp = PresentationTimestamp.HasValue ? PresentationTimestamp.Value / 90 : 40;
|
||||
if (firstMs.HasValue && lastTimestamp >= firstMs)
|
||||
{
|
||||
lastTimestamp = lastTimestamp - firstMs.Value;
|
||||
lastTimestamp -= firstMs.Value;
|
||||
}
|
||||
if (lastTimestamp < 40)
|
||||
{
|
||||
lastTimestamp = 40; // Teletext.cs will subtract 40 ms (1 frame @25 fps) and this value must not be below 0
|
||||
}
|
||||
Teletext.Fout.Clear();
|
||||
Teletext.Config.Page = ((pageNumber / 100) << 8) | ((pageNumber / 10 % 10) << 4) | (pageNumber % 10);
|
||||
Teletext.Config.Page = Teletext.DecToBec(pageNumber);
|
||||
Teletext.Config.Tid = packetId;
|
||||
var teletextPages = new Dictionary<int, Paragraph>();
|
||||
var i = 1;
|
||||
|
@ -56,7 +56,6 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
public class TeletextStates
|
||||
{
|
||||
public bool ProgrammeInfoProcessed { get; set; }
|
||||
public bool PtsInitialized { get; set; }
|
||||
}
|
||||
|
||||
public class TeletextPacketPayload
|
||||
@ -107,14 +106,6 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
// subtitle type pages bitmap, 2048 bits = 2048 possible pages in teletext (excl. subpages)
|
||||
public static byte[] CcMap = new byte[256];
|
||||
|
||||
// entities, used in color mode, to replace unsafe HTML tag chars
|
||||
private static readonly Dictionary<char, string> Entities = new Dictionary<char, string>
|
||||
{
|
||||
//{ '<', "<" },
|
||||
//{ '>', ">" },
|
||||
//{ '&', "&" }
|
||||
};
|
||||
|
||||
public static readonly StringBuilder Fout = new StringBuilder();
|
||||
|
||||
public static TeletextStates States = new TeletextStates();
|
||||
@ -385,21 +376,6 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
}
|
||||
}
|
||||
|
||||
if (v >= 0x20)
|
||||
{
|
||||
// translate some chars into entities, if in colour mode
|
||||
if (Config.Colors)
|
||||
{
|
||||
if (Entities.ContainsKey(Convert.ToChar(v)))
|
||||
{
|
||||
Fout.Append(Entities[Convert.ToChar(v)]);
|
||||
// v < 0x20 won't be printed in next block
|
||||
v = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (v >= 0x20)
|
||||
{
|
||||
Fout.Append(Ucs2ToUtf8(v));
|
||||
@ -529,7 +505,6 @@ namespace Nikse.SubtitleEdit.Core.TransportStream
|
||||
}
|
||||
|
||||
// Page transmission is terminated, however now we are waiting for our new page
|
||||
//if (teletextRunSettings.PageNumberBcd != pageNumber)
|
||||
if (targetPageNumberBcd != pageNumber)
|
||||
{
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user