Skip to content

Commit 4011511

Browse files
linnealovespielinnealovespie
committed
update nuget package 1.4
1 parent 9c83864 commit 4011511

File tree

7 files changed

+26
-20
lines changed

7 files changed

+26
-20
lines changed

‎Samples/StyleTransfer/AppViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public AppViewModel()
4949
_saveEnabled = true;
5050
NotifyUser(true);
5151

52-
m_notifier = new StyleTransferEffectNotifier();
52+
m_notifier = new StyleTransferEffectCpp.StyleTransferEffectNotifier();
5353
m_notifier.FrameRateUpdated += async (_, e) =>
5454
{
5555
await DispatcherHelper.RunAsync(() =>

‎Samples/StyleTransfer/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity
1010
Name="7fafd263-abdf-4f88-87a1-ffb0922489d1"
1111
Publisher="CN=t-limay"
12-
Version="1.0.10.0" />
12+
Version="1.0.11.0" />
1313

1414
<mp:PhoneIdentity PhoneProductId="7fafd263-abdf-4f88-87a1-ffb0922489d1" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
1515

‎Samples/StyleTransfer/StyleTransfer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@
212212
</ItemGroup>
213213
<ItemGroup>
214214
<PackageReference Include="Microsoft.AI.MachineLearning">
215-
<Version>1.3.1-dev-20200711-0122-00cc8041c</Version>
215+
<Version>1.4.0</Version>
216216
</PackageReference>
217217
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
218218
<Version>6.2.10</Version>

‎Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffect.cpp‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,10 @@ namespace winrt::StyleTransferEffectCpp::implementation
4141
OutputDebugString(L"Close\n");
4242
if (Binding != nullptr) Binding.Clear();
4343
if (Session != nullptr) Session.Close();
44-
for (int i = 0; i < swapChainEntryCount; i++) {
45-
bindings[i]->binding.Clear();
46-
}
44+
/*for (int i = 0; i < swapChainEntryCount; i++) {
45+
if (bindings[i]->binding != nullptr)
46+
bindings[i]->binding.Clear();
47+
}*/
4748
}
4849

4950
void StyleTransferEffect::SubmitEval(int swapchaindex, VideoFrame input, VideoFrame output) {
@@ -54,6 +55,7 @@ namespace winrt::StyleTransferEffectCpp::implementation
5455
if (currentBinding->activetask == nullptr
5556
|| currentBinding->activetask.Status() != Windows::Foundation::AsyncStatus::Started)
5657
{
58+
auto now = std::chrono::high_resolution_clock::now();
5759
OutputDebugString(L"PF Start new Eval ");
5860
std::wostringstream ss;
5961
ss << swapchaindex;
@@ -70,22 +72,27 @@ namespace winrt::StyleTransferEffectCpp::implementation
7072
}
7173

7274
currentBinding->activetask = Session.EvaluateAsync(currentBinding->binding, ss.str().c_str());
73-
currentBinding->activetask.Completed([&, currentBinding](auto&& asyncInfo, winrt::Windows::Foundation::AsyncStatus const args) {
75+
currentBinding->activetask.Completed([&, currentBinding, now](auto&& asyncInfo, winrt::Windows::Foundation::AsyncStatus const args) {
7476
OutputDebugString(L"PF Eval completed |");
7577
VideoFrame evalOutput = asyncInfo.GetResults().Outputs().Lookup(OutputImageDescription).try_as<VideoFrame>();
7678
int bindingIdx;
79+
bool finishedFrameUpdated;
7780
{
7881
std::lock_guard<mutex> guard{ Processing };
7982
auto binding = std::find_if(bindings.begin(), bindings.end(), [currentBinding](const auto& b) {return b.get() == currentBinding; });
8083
bindingIdx = std::distance(bindings.begin(), binding);
81-
finishedIdx = bindingIdx >= finishedIdx ? bindingIdx : finishedIdx;
84+
finishedFrameUpdated = bindingIdx >= finishedIdx;
85+
finishedIdx = finishedFrameUpdated ? bindingIdx : finishedIdx;
86+
8287
}
83-
if (bindingIdx >= finishedIdx)
88+
if (finishedFrameUpdated)
8489
{
8590
OutputDebugString(L"PF Copy | ");
8691
evalOutput.CopyToAsync(currentBinding->outputCache);
8792
}
8893

94+
auto timePassed = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now() - now);
95+
Notifier.SetFrameRate(1000.f / timePassed.count()); // Convert to FPS: milli to seconds, invert
8996
OutputDebugString(L"PF End ");
9097
});
9198
}

‎Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffect.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ namespace winrt::StyleTransferEffectCpp::implementation
5858
int swapChainIndex = 0;
5959
static const int swapChainEntryCount = 5;
6060
std::vector < std::unique_ptr<SwapChainEntry>> bindings;
61-
//SwapChainEntry bindings[swapChainEntryCount];
6261
int finishedIdx = 0;
6362
};
6463
}

‎Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffectCpp.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props')" />
4-
<Import Project="..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.props" Condition="Exists('..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.props')" />
3+
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" />
4+
<Import Project="..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.props" Condition="Exists('..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.props')" />
55
<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')" />
66
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props')" />
77
<PropertyGroup Label="Globals">
@@ -155,8 +155,8 @@
155155
<ImportGroup Label="ExtensionTargets">
156156
<Import Project="packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" />
157157
<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')" />
158-
<Import Project="..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.targets" Condition="Exists('..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.targets')" />
159-
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" />
158+
<Import Project="..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.targets" Condition="Exists('..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.targets')" />
159+
<Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
160160
</ImportGroup>
161161
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
162162
<PropertyGroup>
@@ -166,9 +166,9 @@
166166
<Error Condition="!Exists('packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets'))" />
167167
<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'))" />
168168
<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'))" />
169-
<Error Condition="!Exists('..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.props'))" />
170-
<Error Condition="!Exists('..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AI.MachineLearning.1.3.1-dev-20200711-0122-00cc8041c\build\native\Microsoft.AI.MachineLearning.targets'))" />
171-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props'))" />
172-
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets'))" />
169+
<Error Condition="!Exists('..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.props'))" />
170+
<Error Condition="!Exists('..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AI.MachineLearning.1.4.0\build\native\Microsoft.AI.MachineLearning.targets'))" />
171+
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
172+
<Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200729.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
173173
</Target>
174174
</Project>

‎Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AI.MachineLearning" version="1.3.1-dev-20200711-0122-00cc8041c" targetFramework="native" />
4-
<package id="Microsoft.Windows.CppWinRT" version="2.0.200703.9" targetFramework="native" />
3+
<package id="Microsoft.AI.MachineLearning" version="1.4.0" targetFramework="native" />
4+
<package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)