working style transfer, need to clean up

linnealovespie · linnealovespie · commit 40d6dce21002 · 2020-07-01T18:00:50.000-04:00
diff --git a/Samples/StyleTransfer/AppViewModel.cs b/Samples/StyleTransfer/AppViewModel.cs
@@ -14,7 +14,7 @@
 using Windows.Media.Effects;
 using Windows.Media;
 using Windows.Foundation.Collections;
-using Windows.AI.MachineLearning;
+using Microsoft.AI.MachineLearning;
 using Windows.Storage;
 using System.Runtime.CompilerServices;
 using Windows.Graphics.Imaging;
diff --git a/Samples/StyleTransfer/RuntimeComponent2/Class.cpp b/Samples/StyleTransfer/RuntimeComponent2/Class.cpp
@@ -5,6 +5,7 @@
 
 namespace winrt::RuntimeComponent2::implementation
 {
+	Class::Class() : outputTransformed(VideoFrame(Windows::Graphics::Imaging::BitmapPixelFormat::Bgra8, 720, 720)) {}
 
 	IVectorView<VideoEncodingProperties> Class::SupportedEncodingProperties() {
 		VideoEncodingProperties encodingProperties = VideoEncodingProperties();
@@ -60,16 +61,19 @@ namespace winrt::RuntimeComponent2::implementation
 		throw hresult_not_implemented();
 	}
 
+
 	void Class::ProcessFrame(ProcessVideoFrameContext context) {
 		LearningModelSession _session = Session();
 		LearningModelBinding _binding = Binding();
 		VideoFrame inputFrame = context.InputFrame();
 		VideoFrame outputFrame = context.OutputFrame();
 
+
 		_binding.Bind(InputImageDescription(), inputFrame);
-		_binding.Bind(OutputImageDescription(), outputFrame);
+		_binding.Bind(OutputImageDescription(), outputTransformed);
 
-		auto results = _session.Evaluate(_binding, L"test");
+		_session.Evaluate(_binding, L"test");
+		outputTransformed.CopyToAsync(context.OutputFrame());
 	}
 
 	void Class::SetEncodingProperties(VideoEncodingProperties props, IDirect3DDevice device) {
diff --git a/Samples/StyleTransfer/RuntimeComponent2/Class.h b/Samples/StyleTransfer/RuntimeComponent2/Class.h
@@ -14,7 +14,8 @@ namespace winrt::RuntimeComponent2::implementation
 {
 	struct Class : ClassT<Class>
 	{
-		Class() = default;
+		Class();
+		VideoFrame outputTransformed;
 
 		IVectorView<VideoEncodingProperties> SupportedEncodingProperties();
 		bool TimeIndependent();
diff --git a/Samples/StyleTransfer/RuntimeComponent2/RuntimeComponent2.vcxproj b/Samples/StyleTransfer/RuntimeComponent2/RuntimeComponent2.vcxproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.props')" />
   <Import Project="packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.props" Condition="Exists('packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.props')" />
   <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
@@ -149,6 +150,7 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
     <Import Project="packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.targets" Condition="Exists('packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -158,5 +160,7 @@
     <Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.200615.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
     <Error Condition="!Exists('packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.props'))" />
     <Error Condition="!Exists('packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.AI.MachineLearning.1.3.0\build\native\Microsoft.AI.MachineLearning.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.200630.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
   </Target>
 </Project>
diff --git a/Samples/StyleTransfer/RuntimeComponent2/packages.config b/Samples/StyleTransfer/RuntimeComponent2/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.AI.MachineLearning" version="1.3.0" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.200615.7" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200630.5" targetFramework="native" />
 </packages>
diff --git a/Samples/StyleTransfer/StyleTransfer.csproj b/Samples/StyleTransfer/StyleTransfer.csproj
@@ -216,6 +216,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.AI.MachineLearning">
+      <Version>1.3.0</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.10</Version>
     </PackageReference>
diff --git a/Samples/StyleTransfer/StyleTransferEffectComponent/StyleTransferEffectComponent.csproj b/Samples/StyleTransfer/StyleTransferEffectComponent/StyleTransferEffectComponent.csproj
@@ -125,6 +125,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.AI.MachineLearning">
+      <Version>1.3.0</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.10</Version>
     </PackageReference>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,8 @@ namespace winrt::RuntimeComponent2::implementation`
`14`	`14`	`{`
`15`	`15`	`struct Class : ClassT<Class>`
`16`	`16`	`{`
`17`		`- Class() = default;`
	`17`	`+ Class();`
	`18`	`+ VideoFrame outputTransformed;`
`18`	`19`
`19`	`20`	`IVectorView<VideoEncodingProperties> SupportedEncodingProperties();`
`20`	`21`	`bool TimeIndependent();`