VIX-2683 Initial work to support the new FSEQ v2.0 file format. This …

…implements the zstd compression blocks with middle of the road compression. There is a some logic for sparse blocks, but it is not fully implemented. There is still debugging code to write values to the console that needs to be removed after further testing.
VixenLights · May 15, 2019 · 4096751 · 4096751
1 parent dd71c95
commit 4096751
Show file tree

Hide file tree

Showing 33 changed files with 878 additions and 22 deletions.
diff --git a/Common/Libraries/Libraries.csproj b/Common/Libraries/Libraries.csproj
@@ -208,6 +208,9 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression" />
@@ -260,6 +263,9 @@
       <HintPath>..\..\packages\DockPanelSuite.ThemeVS2015.3.0.6\lib\net40\WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
+    <Reference Include="Zstandard.Net, Version=1.1.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Zstandard.Net.1.1.5\lib\net45\Zstandard.Net.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NShape\Core\NShape.csproj">
@@ -292,7 +298,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Mono.Security.5.4.0.201\build\net45\Mono.Security.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Mono.Security.5.4.0.201\build\net45\Mono.Security.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Zstandard.Net.1.1.5\build\Zstandard.Net.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Zstandard.Net.1.1.5\build\Zstandard.Net.targets'))" />
   </Target>
+  <Import Project="..\..\packages\Zstandard.Net.1.1.5\build\Zstandard.Net.targets" Condition="Exists('..\..\packages\Zstandard.Net.1.1.5\build\Zstandard.Net.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Common/Libraries/packages.config b/Common/Libraries/packages.config
@@ -26,6 +26,8 @@
   <package id="Svg" version="2.4.0" targetFramework="net462" />
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net462" />
   <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.4.0" targetFramework="net462" />
+  <package id="Zstandard.Net" version="1.1.5" targetFramework="net462" />
   <package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net462" />
   <package id="System.Reflection" version="4.3.0" targetFramework="net462" />
   <package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="net462" />

diff --git a/Modules/Editor/TimedSequenceEditor/ExportDialog.Designer.cs b/Modules/Editor/TimedSequenceEditor/ExportDialog.Designer.cs
diff --git a/Vixen.System/Export/Export.cs b/Vixen.System/Export/Export.cs
@@ -59,7 +59,7 @@ public Export()
             foreach (Type theType in types.ToArray())
             {
                 exportWriter = (IExportWriter)Activator.CreateInstance(theType);
-                _writers[exportWriter.FileType] = exportWriter;
+                _writers[exportWriter.FileTypeDescr] = exportWriter;
                 _exportFileTypes[exportWriter.FileTypeDescr] = exportWriter.FileType;
             }
 
@@ -324,7 +324,7 @@ public async Task DoExport(ISequence sequence, string outFormat, IProgress<Expor
 
             if ((sequence != null) && (_exportFileTypes.TryGetValue(outFormat,out fileType)))
             {
-                if (_writers.TryGetValue(fileType, out _output))
+                if (_writers.TryGetValue(outFormat, out _output))
                 {
 					_generator = new SequenceIntervalGenerator(UpdateInterval, sequence);
                     //WriteControllerInfo(sequence);