Merge remote-tracking branch 'remotes/origin/ptsFrameDumper'

skyscraper8.Tests/AstraBarkerTransponderTests.cs

@@ -30,8 +30,7 @@ namespace skyscraper8.Tests
 		public void TestAstraSdt()
 		{
 			Stream stream = GetBarkerTransponder();
-			if (stream == null)
+			Skip.If(stream == null, "Barker Transponder stream not available.");
-				return;
 
 			SdtContestant contestant = new SdtContestant(0x002d);
 
@@ -62,8 +61,7 @@ namespace skyscraper8.Tests
 		public void TestAstraLcn()
 		{
 			Stream stream = GetBarkerTransponder();
-			if (stream == null)
+			Skip.If(stream == null, "Barker Transponder stream not available.");
-				return;
 
 			SgtCandidate contestant = new SgtCandidate(0x0777);
 			SgtCandidate contestant2 = new SgtCandidate(0x0776);

skyscraper8.Tests/GsType1SanityTest.cs

@@ -0,0 +1,31 @@
+using System.Reflection;
+using skyscraper5.Mpeg2;
+using skyscraper8.Tests.Properties;
+
+namespace skyscraper8.Tests;
+
+public class GsType1SanityTest
+{
+    [Fact]
+    public void CheckBfbsCrc()
+    {
+        byte[] blob = Resources.Frame00001343_TSGS1_MIS000_SYNC001;
+        MemoryStream ms = new MemoryStream(blob, false);
+        bool result = DvbCrc32.ValidateCrc(ms, 0, (int)ms.Length);
+        Assert.True(result);
+        
+        blob = Resources.Frame00000008_TSGS1_MIS000_SYNC001;
+        ms = new MemoryStream(blob, false);
+        result = DvbCrc32.ValidateCrc(ms, 0, (int)ms.Length);
+        Assert.True(result);
+    }
+
+    [Fact]
+    public void CheckBfbsCrcSpan()
+    {
+        byte[] blob = Resources.Frame00000012_TSGS1_MIS000_SYNC001;
+        ReadOnlySpan<byte> span = new ReadOnlySpan<byte>(blob);
+        bool result = DvbCrc32.ValidateCrc(span);
+        Assert.True(result);
+    }
+}

skyscraper8.Tests/Properties/Resources.Designer.cs

@@ -1,10 +1,9 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
+//     This code was generated by a tool.
-//     Laufzeitversion:4.0.30319.42000
 //
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     Changes to this file may cause incorrect behavior and will be lost if
-//     der Code erneut generiert wird.
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,46 +11,32 @@ namespace skyscraper8.Tests.Properties {
     using System;
     
     
-    /// <summary>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    [System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    /// </summary>
+    [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
         
-        private static global::System.Resources.ResourceManager resourceMan;
+        private static System.Resources.ResourceManager resourceMan;
         
-        private static global::System.Globalization.CultureInfo resourceCulture;
+        private static System.Globalization.CultureInfo resourceCulture;
         
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
         
-        /// <summary>
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        ///   Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        internal static System.Resources.ResourceManager ResourceManager {
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if (object.ReferenceEquals(resourceMan, null)) {
+                if (object.Equals(null, resourceMan)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("skyscraper8.Tests.Properties.Resources", typeof(Resources).Assembly);
+                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("skyscraper8.Tests.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
         
-        /// <summary>
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        ///   Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
+        internal static System.Globalization.CultureInfo Culture {
-        ///   Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -60,9 +45,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] ModemCapabilitiesEncodingTest {
             get {
                 object obj = ResourceManager.GetObject("ModemCapabilitiesEncodingTest", resourceCulture);
@@ -70,9 +52,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] MultipartRegistrationResponseTest {
             get {
                 object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest", resourceCulture);
@@ -80,19 +59,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
-        internal static byte[] MultipartRegistrationResponseTest2 {
-            get {
-                object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest2", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] PushMacManagementMessage_Version4_Type45 {
             get {
                 object obj = ResourceManager.GetObject("PushMacManagementMessage_Version4_Type45", resourceCulture);
@@ -100,9 +66,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] ranging_response_test {
             get {
                 object obj = ResourceManager.GetObject("ranging_response_test", resourceCulture);
@@ -110,9 +73,13 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
+        internal static byte[] MultipartRegistrationResponseTest2 {
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
+            get {
-        /// </summary>
+                object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest2", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         internal static byte[] test_1packet_01 {
             get {
                 object obj = ResourceManager.GetObject("test-1packet-01", resourceCulture);
@@ -120,9 +87,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] test_2packets_02_03 {
             get {
                 object obj = ResourceManager.GetObject("test-2packets-02-03", resourceCulture);
@@ -130,9 +94,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] test_3packets_04_05_06 {
             get {
                 object obj = ResourceManager.GetObject("test-3packets-04-05-06", resourceCulture);
@@ -140,9 +101,6 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] TransmitChannelConfigurationObject {
             get {
                 object obj = ResourceManager.GetObject("TransmitChannelConfigurationObject", resourceCulture);
@@ -150,14 +108,32 @@ namespace skyscraper8.Tests.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Byte[].
-        /// </summary>
         internal static byte[] UpstreamChannelDescriptorTest {
             get {
                 object obj = ResourceManager.GetObject("UpstreamChannelDescriptorTest", resourceCulture);
                 return ((byte[])(obj));
             }
         }
+        
+        internal static byte[] Frame00001343_TSGS1_MIS000_SYNC001 {
+            get {
+                object obj = ResourceManager.GetObject("Frame00001343_TSGS1_MIS000_SYNC001", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        internal static byte[] Frame00000008_TSGS1_MIS000_SYNC001 {
+            get {
+                object obj = ResourceManager.GetObject("Frame00000008_TSGS1_MIS000_SYNC001", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
+        internal static byte[] Frame00000012_TSGS1_MIS000_SYNC001 {
+            get {
+                object obj = ResourceManager.GetObject("Frame00000012_TSGS1_MIS000_SYNC001", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }

skyscraper8.Tests/Properties/Resources.resx

@@ -148,4 +148,13 @@
   <data name="UpstreamChannelDescriptorTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\UpstreamChannelDescriptorTest.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="Frame00001343_TSGS1_MIS000_SYNC001" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Frame00001343_TSGS1_MIS000_SYNC001.bbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Frame00000008_TSGS1_MIS000_SYNC001" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Frame00000008_TSGS1_MIS000_SYNC001.bbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="Frame00000012_TSGS1_MIS000_SYNC001" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Frame00000012_TSGS1_MIS000_SYNC001.bbf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>

skyscraper8.Tests/SanityTests.cs

@@ -19,6 +19,8 @@ namespace skyscraper8.Tests
 			bool msbSet = (readUInt8 & 0x80) != 0;
 			Assert.True(msbSet);
 
+			readUInt8 &= 0b01111111;
+
 			int result = ms.ReadUInt8();
 			result <<= 8;
 			result += readUInt8;

skyscraper8.Tests/TsDuckTestPatterns.cs

@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using skyscraper8.Skyscraper.Scraper.Storage;
 
 namespace skyscraper8.Tests
 {
@@ -22,7 +23,10 @@ namespace skyscraper8.Tests
 			foreach (byte[] buffer in buffers)
 			{
 				TsContext mpeg2 = new TsContext();
-				SkyscraperContext skyscraper = new SkyscraperContext(mpeg2, null, null);
+				DataStorage ds = new InMemoryScraperStorageFactory().CreateDataStorage();
+				ObjectStorage os = new NullObjectStorage();
+				
+				SkyscraperContext skyscraper = new SkyscraperContext(mpeg2, ds, os);
 				MemoryStream ms = new MemoryStream(buffer, false);
 				
 				skyscraper.InitalizeFilterChain();

skyscraper8.Tests/UselessCodeCoverageTests.cs

@@ -0,0 +1,13 @@
+using skyscraper5.Mpeg2;
+
+namespace skyscraper8.Tests;
+
+public class UselessCodeCoverageTests
+{
+    [Fact]
+    void PsiSectionTest()
+    {
+        PsiSection section = new PsiSection();
+        section.Append(new byte[] { 3 });
+    }
+}

skyscraper8.sln.DotSettings.user

@@ -1,6 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AArray_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F6e_003Fd247db11_003FArray_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileInfo_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe1ab690537c44e02a014076312b886b7b2e200_003F5a_003Fcf76af61_003FFileInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AInterop_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003Fea_003F7d70064b_003FInterop_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F6b_003Fa410ee2c_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AMemoryStream_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F0d_003F068af3a6_003FMemoryStream_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ANullable_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F0d_003F6549c49b_003FNullable_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
@@ -9,4 +10,13 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003Feb_003F3c476997_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe1ab690537c44e02a014076312b886b7b2e200_003F4f_003F7bfc5050_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATuple_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F57d616db882b441b8c50720b4477e03db2e200_003F9f_003F0d16f921_003FTuple_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/Environment/Highlighting/HighlightingSourceSnapshotLocation/@EntryValue">/home/schiemas/.cache/JetBrains/Rider2025.1/resharper-host/temp/Rider/vAny/CoverageData/_skyscraper8.1808907683/Snapshot/snapshot.utdcvr</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=1108d3f2_002D5e6f_002D416b_002Da8ee_002D3c9502a978e2/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="CheckBfbsCrc #2" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+  &lt;Solution /&gt;
+&lt;/SessionState&gt;</s:String>
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=8cbe9c8f_002Dfc55_002D47f1_002D9df1_002Dcb4c7fbbc56b/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" Name="CheckBfbsCrc" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
+  &lt;TestAncestor&gt;
+    &lt;TestId&gt;xUnit::84EE9FCD-2C7F-DF84-C1BA-99D018CE9412::net8.0::skyscraper8.Tests.GsType1SanityTest.CheckBfbsCrc&lt;/TestId&gt;
+  &lt;/TestAncestor&gt;
+&lt;/SessionState&gt;</s:String>
 	<s:String x:Key="/Default/Profiling/Configurations/=1/@EntryIndexedValue">&lt;data&gt;&lt;HostParameters type="LocalHostParameters" /&gt;&lt;Argument type="StandaloneArgument"&gt;&lt;Arguments IsNull="False"&gt;&lt;/Arguments&gt;&lt;FileName IsNull="False"&gt;&lt;/FileName&gt;&lt;WorkingDirectory IsNull="False"&gt;&lt;/WorkingDirectory&gt;&lt;Scope&gt;&lt;ProcessFilters /&gt;&lt;/Scope&gt;&lt;/Argument&gt;&lt;Info type="TimelineInfo" /&gt;&lt;CoreOptions type="CoreOptions"&gt;&lt;CoreTempPath IsNull="False"&gt;&lt;/CoreTempPath&gt;&lt;RemoteEndPoint IsNull="False"&gt;&lt;/RemoteEndPoint&gt;&lt;AdditionalEnvironmentVariables /&gt;&lt;/CoreOptions&gt;&lt;HostOptions type="HostOptions"&gt;&lt;HostTempPath IsNull="False"&gt;&lt;/HostTempPath&gt;&lt;/HostOptions&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>

skyscraper8/GS/POC/Pts2Bbf2.cs

@@ -0,0 +1,62 @@
+using log4net;
+using skyscraper5.Mpeg2;
+using skyscraper5.Skyscraper;
+using skyscraper5.Skyscraper.IO;
+using skyscraper5.Skyscraper.Scraper;
+using skyscraper5.Skyscraper.Scraper.Storage.InMemory;
+using skyscraper8.Skyscraper.Scraper.Storage;
+
+namespace skyscraper8.GSE;
+
+public class Pts2Bbf2 : IBbframeDeencapsulator
+{
+    private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
+    private readonly FileInfo _fi;
+    private readonly DirectoryInfo outputDir;
+
+    public Pts2Bbf2(FileInfo fi)
+    {
+        _fi = fi;
+        string outputPath = Path.Combine(_fi.Directory.FullName, Path.GetFileNameWithoutExtension(_fi.Name) + "_frames");
+        outputDir = new DirectoryInfo(outputPath);
+        outputDir.EnsureExists();
+    }
+
+    public void Run()
+    {
+        TsContext mpeg2 = new TsContext();
+        Stid135BbFrameReader bbFrameReader = new Stid135BbFrameReader(null, null, this);
+        mpeg2.RegisterPacketProcessor(0x010e, bbFrameReader);
+        
+        SkyscraperContext context = new SkyscraperContext(mpeg2, new InMemoryScraperStorage(), new NullObjectStorage());
+        context.InitalizeFilterChain();
+
+        FileStream fileStream = _fi.OpenRead();
+        context.IngestFromStream(fileStream);
+    }
+
+    private int frameNo;
+    public void PushPacket(byte[] bbframe)
+    {
+        if (bbframe[0] != 0xb8)
+        {
+            return;
+        }
+        
+        BBHeader bbHeader = new BBHeader(bbframe, 1);
+        if (!bbHeader.Valid)
+            return;
+
+        string fname = String.Format("Frame{0:D8}_TSGS{1}_MIS{2:D3}_SYNC{3:D3}.ts", ++frameNo,bbHeader.TsGs,bbHeader.SisMis ? bbHeader.Matype2 : 0,bbHeader.SyncByte);
+        
+        string outfname = Path.Combine(outputDir.FullName, fname);
+        ReadOnlySpan<byte> readOnlySpan = new ReadOnlySpan<byte>(bbframe, 11, bbframe.Length - 11);
+        byte[] buffer = readOnlySpan.ToArray();
+        File.WriteAllBytes(outfname, buffer);
+
+        if (IpPacketFinder.TestForHttpContents(buffer))
+        {
+            logger.InfoFormat("Found unencrypted HTTP traffic in {0}", fname);
+        }
+    }
+}

skyscraper8/Mpeg2/Crc32.cs

@@ -4,7 +4,7 @@ using static System.Collections.Specialized.BitVector32;
 
 namespace skyscraper5.Mpeg2
 {
-    internal class DvbCrc32
+    public class DvbCrc32
     {
         private DvbCrc32()
         {
@@ -112,6 +112,20 @@ namespace skyscraper5.Mpeg2
             return crc == 0;
         }
 
+        public static bool ValidateCrc(ReadOnlySpan<byte> data)
+        {
+	        uint crc = 0xffffffff;
+
+	        for (int i = 0; i < data.Length; i++)
+	        {
+		        uint b = (crc >> 24) & 0xff;
+		        int c = (data[i]) & 0xff;
+		        crc = (crc << 8) ^ table[b ^ c];
+	        }
+	        
+	        return crc == 0;
+        }
+
         public static uint CreateCrc(MemoryStream ms, int offset, int end)
         {
 	        long restorePosition = ms.Position;

skyscraper8/Program.cs

@@ -337,6 +337,14 @@ namespace skyscraper5
                     }
                 }
 
+                if (args[0].ToLowerInvariant().Equals("pts2bbf2"))
+                {
+                    FileInfo fi = new FileInfo(args[1]);
+                    Pts2Bbf2 pts2Bbf2 = new Pts2Bbf2(fi);
+                    pts2Bbf2.Run();
+                    return;
+                }
+
                 if (args[0].ToLowerInvariant().Equals("stid135test"))
                 {
                     FileInfo fi = new FileInfo(args[1]);

skyscraper8/Skyscraper/IpPacketFinder.cs

@@ -86,5 +86,17 @@ namespace skyscraper5.Skyscraper
 
 	        return result;
         }
+
+        public static bool TestForHttpContents(byte[] buffer)
+        {
+	        for (int i = 0; i < buffer.Length - 5; i++)
+		        if (buffer[i] == 0x48)
+			        if (buffer[i + 1] == 0x54)
+				        if (buffer[i + 2] == 0x54)
+					        if (buffer[i + 3] == 0x50)
+						        if (buffer[i + 4] == 0x2f)
+							        return true;
+	        return false;
+        }
     }
 }

skyscraper8/Skyscraper/Scraper/Storage/NullObjectStorage.cs

@@ -13,7 +13,7 @@ using skyscraper8.Skyscraper.Drawing;
 
 namespace skyscraper8.Skyscraper.Scraper.Storage
 {
-	internal class NullObjectStorage : ObjectStorage
+	public class NullObjectStorage : ObjectStorage
 	{
 		public bool ObjectCarouselFileArrival(VfsFile vfsFile, int transportStreamId, int networkId)
 		{