LottieTest

.gitignore

@@ -234,4 +234,8 @@ msbuild.binlog
 LottieGenOutput-*/
 
 # Visual Studio debugging configuration file.
-launchSettings.json
+launchSettings.json
+
+# Tests
+**/FramesAll
+**/!Results

Lottie-Windows.sln

@@ -171,6 +171,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-WinUI3", "Lo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LottieSamples", "LottieSamples\LottieSamples.csproj", "{6AB50ED0-6273-4919-9ADE-50195664EF15}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieTest", "LottieTest\LottieTest.csproj", "{C9DDFDED-8E1D-4161-BD5A-D7186F94798A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieGen.dll", "dlls\LottieGen\LottieGen.dll.csproj", "{43C57BC9-B5D0-48CE-9048-314E66D26462}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  BETA|Any CPU = BETA|Any CPU
@@ -613,6 +617,66 @@ Global
  {6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.ActiveCfg = Release|x86
  {6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Build.0 = Release|x86
  {6AB50ED0-6273-4919-9ADE-50195664EF15}.Release|x86.Deploy.0 = Release|x86
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|Any CPU.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|Any CPU.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM64.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|ARM64.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x64.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x64.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x86.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.BETA|x86.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|Any CPU.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM64.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|ARM64.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x64.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x64.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x86.ActiveCfg = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Debug|x86.Build.0 = Debug|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|Any CPU.ActiveCfg = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|Any CPU.Build.0 = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM.ActiveCfg = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM.Build.0 = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM64.ActiveCfg = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|ARM64.Build.0 = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x64.ActiveCfg = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x64.Build.0 = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x86.ActiveCfg = Release|x64
+ {C9DDFDED-8E1D-4161-BD5A-D7186F94798A}.Release|x86.Build.0 = Release|x64
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|Any CPU.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|Any CPU.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM64.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|ARM64.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x64.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x64.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x86.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.BETA|x86.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|ARM64.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x64.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Debug|x86.Build.0 = Debug|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|Any CPU.Build.0 = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM.ActiveCfg = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM.Build.0 = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|ARM64.Build.0 = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x64.ActiveCfg = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x64.Build.0 = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x86.ActiveCfg = Release|Any CPU
+ {43C57BC9-B5D0-48CE-9048-314E66D26462}.Release|x86.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -651,6 +715,7 @@ Global
  {FC89273A-B2DA-4625-8A73-EF02A658D65E} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
  {7654A857-9A99-4185-9F8E-DD0CE662AF23} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
  {DC7F7A39-B7A7-40B4-937A-601460CAE38C} = {AB232F35-AAF7-4AE2-B1D2-45DD9BC2F7D7}
+ {43C57BC9-B5D0-48CE-9048-314E66D26462} = {C75BD686-21A6-4EB3-8D4B-D5A01C019C52}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {51B9BB4C-5196-41CF-950C-12B04AD8A61C}
@@ -664,6 +729,7 @@ Global
  source\LottieMetadata\LottieMetadata.projitems*{25ceb8b8-90e0-4d23-9978-0cd83889d4ac}*SharedItemsImports = 5
  source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{30059ca7-0745-4eec-8d11-b14850a70c98}*SharedItemsImports = 13
  source\YamlData\YamlData.projitems*{39c6b7f3-5e75-4019-82ab-00fd8a0a06e2}*SharedItemsImports = 13
+ source\LottieGen\LottieGen.projitems*{43c57bc9-b5d0-48ce-9048-314e66d26462}*SharedItemsImports = 5
  source\LottieReader\LottieReader.projitems*{4e7d8957-3f5f-46e1-99a8-2012b806c9b0}*SharedItemsImports = 13
  source\Animatables\Animatables.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
  source\CompMetadata\CompMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4

LottieTest/LottieTest.csproj

@@ -0,0 +1,45 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+ <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+ <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <Nullable>enable</Nullable>
+ <CsWinRTIncludes>Microsoft</CsWinRTIncludes>
+ <Platforms>x64</Platforms>
+ <SignAssembly>False</SignAssembly>
+ <!-- This doesn't work for some reason: <WindowsPackageType>None</WindowsPackageType> -->
+ </PropertyGroup>
+
+ <ItemGroup>
+ <Compile Remove="Tests\**" />
+ <Content Remove="Tests\**" />
+ <EmbeddedResource Remove="Tests\**" />
+ <None Remove="Tests\**" />
+ <Page Remove="Tests\**" />
+ <PRIResource Remove="Tests\**" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
+ <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
+ <PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.7" />
+ <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+ </PackageReference>
+ <PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.6.3" />
+ <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.197" />
+ <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\dlls\LottieGen\LottieGen.dll.csproj" />
+ <ProjectReference Include="..\dlls\LottieReader\LottieReader.dll.csproj" />
+ <ProjectReference Include="..\dlls\UIDataCodeGen\UIDataCodeGen.dll.csproj" />
+ <ProjectReference Include="..\Lottie-Windows\Lottie-Windows-WinUI3\Lottie-Windows-WinUI3.csproj" />
+ </ItemGroup>
+
+</Project>

LottieTest/NativeMethods.txt

@@ -0,0 +1,9 @@
+GetMessage
+TranslateMessage
+DispatchMessage
+MSG
+RECT
+SIZE
+POINT
+ID3D11Texture2D
+IDirect3DDxgiInterfaceAccess

LottieTest/Tests/BlurOverlap/Lottie.json

@@ -0,0 +1 @@
+{"v":"5.9.0","fr":30,"ip":0,"op":150,"w":500,"h":500,"nm":"Main","ddd":0,"assets":[{"id":"comp_0","nm":"Shape Layer 2 Comp 1","fr":30,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[491,393,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-42,-125],[-166,-109],[-194,9],[-91,3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.610795855522,0.419607818127,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]},{"id":"comp_1","nm":"Shape Layer 3 Comp 1","fr":30,"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Shape Layer 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[258,402,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":29,"nm":"Gaussian Blur","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"Blurriness","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"Blur Dimensions","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Repeat Edge Pixels","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-42,-125],[-166,-109],[-194,9],[-91,3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.108758166432,0.866666674614,0.394088506699,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":150,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Purple","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[250,250,0],"to":[-14.833,-12.333,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":58,"s":[161,176,0],"to":[0,0,0],"ti":[-14.833,-12.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":126,"s":[250,250,0],"to":[0,0,0],"ti":[0,0,0]},{"t":149,"s":[250,250,0]}],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":29,"nm":"Gaussian Blur","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"Blurriness","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":10,"ix":1}},{"ty":7,"nm":"Blur Dimensions","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Repeat Edge Pixels","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"w":500,"h":500,"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"Green","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[250,250,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":36,"s":[250,250,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":98,"s":[317,238,0],"to":[0,0,0],"ti":[0,0,0]},{"t":149,"s":[250,250,0]}],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":29,"nm":"Gaussian Blur","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"Blurriness","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":40,"ix":1}},{"ty":7,"nm":"Blur Dimensions","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Repeat Edge Pixels","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"w":500,"h":500,"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Shape Layer 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[381,215.5,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"ef":[{"ty":29,"nm":"Gaussian Blur","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"Blurriness","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":0,"ix":1}},{"ty":7,"nm":"Blur Dimensions","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"Repeat Edge Pixels","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"shapes":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-42,-125],[-166,-109],[-194,9],[-91,3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,0.309803903103,0.488442987204,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false}],"ip":0,"op":150,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":1,"nm":"White Solid 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[250,250,0],"ix":2,"l":2},"a":{"a":0,"k":[250,250,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"sw":500,"sh":500,"sc":"#ffffff","ip":0,"op":150,"st":0,"bm":0}],"markers":[]}

LottieTest/Tests/BlurOverlap/Test.json

@@ -0,0 +1,5 @@
+{
+ "duration": 5,
+ "frames-per-second": 30,
+ "number-of-frames": 150
+}

LottieTest/Tests/BlurOverlap/Test.json.bak

@@ -0,0 +1,5 @@
+{
+ "duration": "5",
+ "frames-per-second": "30",
+ "number-of-frames": "150"
+}