Skip to content

Commit e2d963d

Browse files
author
Linnea May
committed
rename styletransfereffectcomponent
1 parent 64ac95d commit e2d963d

21 files changed

+37
-505
lines changed

Samples/StyleTransfer/AppViewModel.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
using Windows.UI.Core;
2828
using GalaSoft.MvvmLight.Threading;
2929
using System.Threading;
30-
using StyleTransferEffectCpp;
30+
using StyleTransferEffectComponent;
3131
using System.Runtime.InteropServices.WindowsRuntime;
3232
using Windows.Devices.Enumeration;
3333

@@ -41,7 +41,7 @@ class AppViewModel : INotifyPropertyChanged
4141
private DisplayRequest _displayrequest = new DisplayRequest();
4242
DeviceInformationCollection _devices;
4343
private readonly object _processLock = new object();
44-
StyleTransferEffectCpp.StyleTransferEffectNotifier _notifier;
44+
StyleTransferEffectComponent.StyleTransferEffectNotifier _notifier;
4545

4646
// Style transfer effect properties
4747
private LearningModel _learningModel = null;
@@ -51,7 +51,7 @@ class AppViewModel : INotifyPropertyChanged
5151
private string _inputImageDescription;
5252
private string _outputImageDescription;
5353
// Activatable Class ID of the video effect.
54-
private const string StyleTransferEffectId = "StyleTransferEffectCpp.StyleTransferEffect";
54+
private const string StyleTransferEffectId = "StyleTransferEffectComponent.StyleTransferEffect";
5555

5656
// Image style transfer properties
5757
uint _inWidth, _inHeight, _outWidth, _outHeight;
@@ -75,7 +75,7 @@ public AppViewModel()
7575
_outputSoftwareBitmapSource = new SoftwareBitmapSource();
7676
_saveEnabled = true;
7777

78-
_notifier = new StyleTransferEffectCpp.StyleTransferEffectNotifier();
78+
_notifier = new StyleTransferEffectComponent.StyleTransferEffectNotifier();
7979
_notifier.FrameRateUpdated += async (_, e) =>
8080
{
8181
await DispatcherHelper.RunAsync(() =>

Samples/StyleTransfer/StyleTransfer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@
238238
<None Include="StyleTransfer_TemporaryKey.pfx" />
239239
</ItemGroup>
240240
<ItemGroup>
241-
<Reference Include="StyleTransferEffectCpp, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
241+
<Reference Include="StyleTransferEffectComponent, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
242242
<SpecificVersion>False</SpecificVersion>
243-
<HintPath>VideoEffect\StyleTransferEffectCpp\x64\Debug\StyleTransferEffectCpp\StyleTransferEffectCpp.winmd</HintPath>
243+
<HintPath>VideoEffect\StyleTransferEffectComponent\x64\Debug\StyleTransferEffectComponent\StyleTransferEffectComponent.winmd</HintPath>
244244
</Reference>
245245
</ItemGroup>
246246
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/PropertySheet.props renamed to Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/PropertySheet.props

File renamed without changes.

Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffect.cpp renamed to Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using namespace winrt::Windows::Storage;
99
using namespace winrt::Windows::Storage::Streams;
1010
using namespace concurrency;
1111

12-
namespace winrt::StyleTransferEffectCpp::implementation
12+
namespace winrt::StyleTransferEffectComponent::implementation
1313
{
1414
StyleTransferEffect::StyleTransferEffect() :
1515
Session(nullptr)

Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffect.h renamed to Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using namespace winrt::Windows::Foundation::Collections;
99
using namespace winrt::Microsoft::AI::MachineLearning;
1010
using namespace winrt::Windows::Media;
1111

12-
namespace winrt::StyleTransferEffectCpp::implementation
12+
namespace winrt::StyleTransferEffectComponent::implementation
1313
{
1414
struct SwapChainEntry {
1515
LearningModelBinding binding;
@@ -52,7 +52,7 @@ namespace winrt::StyleTransferEffectCpp::implementation
5252
};
5353
}
5454

55-
namespace winrt::StyleTransferEffectCpp::factory_implementation
55+
namespace winrt::StyleTransferEffectComponent::factory_implementation
5656
{
5757
struct StyleTransferEffect : StyleTransferEffectT<StyleTransferEffect, implementation::StyleTransferEffect>
5858
{

Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffect.idl renamed to Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffect.idl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace StyleTransferEffectCpp
1+
namespace StyleTransferEffectComponent
22
{
33
[default_interface]
44
runtimeclass StyleTransferEffect : Windows.Media.Effects.IBasicVideoEffect

Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffectComponent.csproj

Lines changed: 0 additions & 146 deletions
This file was deleted.

Samples/StyleTransfer/VideoEffect/StyleTransferEffectCpp/StyleTransferEffectCpp.def renamed to Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffectComponent.def

File renamed without changes.

Samples/StyleTransfer/VideoEffect/StyleTransferEffectComponent/StyleTransferEffectComponent.sln

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,41 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.30204.135
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StyleTransferEffectComponent", "StyleTransferEffectComponent.csproj", "{62925583-4D02-451E-9A72-27B12B66712C}"
7-
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{72021C36-D8E7-4038-87C6-C235DCD6AE2E}"
9-
ProjectSection(SolutionItems) = preProject
10-
..\..\FNSCandyStyleTransfer\UWP\cs\Assets\candy.onnx = ..\..\FNSCandyStyleTransfer\UWP\cs\Assets\candy.onnx
11-
..\..\FNSCandyStyleTransfer\UWP\cs\Assets\la_muse.onnx = ..\..\FNSCandyStyleTransfer\UWP\cs\Assets\la_muse.onnx
12-
..\..\FNSCandyStyleTransfer\UWP\cs\Assets\mosaic.onnx = ..\..\FNSCandyStyleTransfer\UWP\cs\Assets\mosaic.onnx
13-
..\..\FNSCandyStyleTransfer\UWP\cs\Assets\udnie.onnx = ..\..\FNSCandyStyleTransfer\UWP\cs\Assets\udnie.onnx
14-
EndProjectSection
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StyleTransferEffectComponent", "StyleTransferEffectComponent.vcxproj", "{05DFFB01-62C4-458C-BE13-7A97E8583E43}"
157
EndProject
168
Global
179
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18-
Debug|Any CPU = Debug|Any CPU
1910
Debug|ARM = Debug|ARM
2011
Debug|ARM64 = Debug|ARM64
2112
Debug|x64 = Debug|x64
2213
Debug|x86 = Debug|x86
23-
Release|Any CPU = Release|Any CPU
2414
Release|ARM = Release|ARM
2515
Release|ARM64 = Release|ARM64
2616
Release|x64 = Release|x64
2717
Release|x86 = Release|x86
2818
EndGlobalSection
2919
GlobalSection(ProjectConfigurationPlatforms) = postSolution
30-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|ARM.ActiveCfg = Debug|ARM
33-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|ARM.Build.0 = Debug|ARM
34-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|ARM64.ActiveCfg = Debug|ARM64
35-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|ARM64.Build.0 = Debug|ARM64
36-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|x64.ActiveCfg = Debug|x64
37-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|x64.Build.0 = Debug|x64
38-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|x86.ActiveCfg = Debug|x86
39-
{62925583-4D02-451E-9A72-27B12B66712C}.Debug|x86.Build.0 = Debug|x86
40-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|Any CPU.ActiveCfg = Release|Any CPU
41-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|ARM.ActiveCfg = Release|ARM
43-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|ARM.Build.0 = Release|ARM
44-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|ARM64.ActiveCfg = Release|ARM64
45-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|ARM64.Build.0 = Release|ARM64
46-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|x64.ActiveCfg = Release|x64
47-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|x64.Build.0 = Release|x64
48-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|x86.ActiveCfg = Release|x86
49-
{62925583-4D02-451E-9A72-27B12B66712C}.Release|x86.Build.0 = Release|x86
20+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|ARM.ActiveCfg = Debug|ARM
21+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|ARM.Build.0 = Debug|ARM
22+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|ARM64.ActiveCfg = Debug|ARM64
23+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|ARM64.Build.0 = Debug|ARM64
24+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|x64.ActiveCfg = Debug|x64
25+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|x64.Build.0 = Debug|x64
26+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|x86.ActiveCfg = Debug|x64
27+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Debug|x86.Build.0 = Debug|x64
28+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|ARM.ActiveCfg = Release|ARM
29+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|ARM.Build.0 = Release|ARM
30+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|ARM64.ActiveCfg = Release|ARM64
31+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|ARM64.Build.0 = Release|ARM64
32+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|x64.ActiveCfg = Release|x64
33+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|x64.Build.0 = Release|x64
34+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|x86.ActiveCfg = Release|Win32
35+
{05DFFB01-62C4-458C-BE13-7A97E8583E43}.Release|x86.Build.0 = Release|Win32
5036
EndGlobalSection
5137
GlobalSection(SolutionProperties) = preSolution
5238
HideSolutionNode = FALSE
5339
EndGlobalSection
5440
GlobalSection(ExtensibilityGlobals) = postSolution
55-
SolutionGuid = {EB162808-B721-4ECD-8580-CB0FCE64DEF3}
41+
SolutionGuid = {8A18F7EA-C460-45F3-BCE0-B57500570575}
5642
EndGlobalSection
5743
EndGlobal

0 commit comments

Comments
 (0)