Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CaptureTestApp.NuGet/CaptureTestApp.NuGet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Configurations>Debug;Release</Configurations>
<Platforms>x86;x64</Platforms>
<Platforms>x86;x64;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.2" />
<PackageReference Include="MMaitre.MediaCaptureWPF" Version="1.2.0" />
<PackageReference Include="MMaitre.MediaCaptureWPF" Version="1.3.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion CaptureTestApp/CaptureTestApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Configurations>Debug;Release</Configurations>
<Platforms>x86;x64</Platforms>
<Platforms>x86;x64;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<AppDesigner Include="Properties\" />
Expand Down
62 changes: 62 additions & 0 deletions MediaCaptureWPF.Native/MediaCaptureWPF.Native.vcxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
Expand All @@ -9,6 +13,10 @@
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
Expand Down Expand Up @@ -40,6 +48,13 @@
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
Expand All @@ -54,6 +69,13 @@
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v143</PlatformToolset>
<CLRSupport>true</CLRSupport>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
Expand All @@ -63,12 +85,18 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
Expand All @@ -78,6 +106,10 @@
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
Expand All @@ -86,6 +118,10 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -110,6 +146,18 @@
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
Expand All @@ -134,6 +182,18 @@
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>mfuuid.lib;mfplat.lib;RuntimeObject.lib;D3d9.lib</AdditionalDependencies>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="System" />
Expand All @@ -155,8 +215,10 @@
<ClCompile Include="Stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
Expand Down
30 changes: 29 additions & 1 deletion MediaCaptureWPF.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.14.36603.0 d17.14
VisualStudioVersion = 17.14.36603.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MediaCaptureWPF.Native", "MediaCaptureWPF.Native\MediaCaptureWPF.Native.vcxproj", "{21717C88-442C-47EB-94D5-0405CB3CDD9F}"
EndProject
Expand All @@ -19,60 +19,88 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaptureTestApp.NuGet", "Cap
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|ARM64.Build.0 = Debug|ARM64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.ActiveCfg = Debug|x64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x64.Build.0 = Debug|x64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.ActiveCfg = Debug|Win32
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Debug|x86.Build.0 = Debug|Win32
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|ARM64.ActiveCfg = Release|ARM64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|ARM64.Build.0 = Release|ARM64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.ActiveCfg = Release|x64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x64.Build.0 = Release|x64
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.ActiveCfg = Release|Win32
{21717C88-442C-47EB-94D5-0405CB3CDD9F}.Release|x86.Build.0 = Release|Win32
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|ARM64.ActiveCfg = Debug|ARM64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|ARM64.Build.0 = Debug|ARM64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.ActiveCfg = Debug|x64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x64.Build.0 = Debug|x64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.ActiveCfg = Debug|x86
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Debug|x86.Build.0 = Debug|x86
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|ARM64.ActiveCfg = Release|ARM64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|ARM64.Build.0 = Release|ARM64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.ActiveCfg = Release|x64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x64.Build.0 = Release|x64
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.ActiveCfg = Release|x86
{62BDFF9F-0584-4DAF-BC8A-FE9C16CB2357}.Release|x86.Build.0 = Release|x86
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|ARM64.ActiveCfg = Debug|ARM64
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|ARM64.Build.0 = Debug|ARM64
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.ActiveCfg = Debug|x64
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x64.Build.0 = Debug|x64
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.ActiveCfg = Debug|Win32
{62AC26B6-1B32-421D-BD24-013B85533626}.Debug|x86.Build.0 = Debug|Win32
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|ARM64.ActiveCfg = Release|ARM64
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|ARM64.Build.0 = Release|ARM64
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.ActiveCfg = Release|x64
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x64.Build.0 = Release|x64
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.ActiveCfg = Release|Win32
{62AC26B6-1B32-421D-BD24-013B85533626}.Release|x86.Build.0 = Release|Win32
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|ARM64.Build.0 = Debug|ARM64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.ActiveCfg = Debug|x64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x64.Build.0 = Debug|x64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.ActiveCfg = Debug|x86
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Debug|x86.Build.0 = Debug|x86
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|ARM64.ActiveCfg = Release|ARM64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|ARM64.Build.0 = Release|ARM64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.ActiveCfg = Release|x64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x64.Build.0 = Release|x64
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.ActiveCfg = Release|x86
{FC9A3BF8-C17B-40E3-9C6A-DEAD52016D7F}.Release|x86.Build.0 = Release|x86
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|ARM64.ActiveCfg = Debug|ARM64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|ARM64.Build.0 = Debug|ARM64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.ActiveCfg = Debug|x64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x64.Build.0 = Debug|x64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.ActiveCfg = Debug|Win32
{9757CB21-B840-49A6-B057-9F322E543DD6}.Debug|x86.Build.0 = Debug|Win32
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|ARM64.ActiveCfg = Release|ARM64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|ARM64.Build.0 = Release|ARM64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.ActiveCfg = Release|x64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x64.Build.0 = Release|x64
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.ActiveCfg = Release|Win32
{9757CB21-B840-49A6-B057-9F322E543DD6}.Release|x86.Build.0 = Release|Win32
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|ARM64.ActiveCfg = Debug|ARM64
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x64.ActiveCfg = Debug|x64
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Debug|x86.ActiveCfg = Debug|Win32
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|ARM64.ActiveCfg = Release|ARM64
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x64.ActiveCfg = Release|x64
{6AB93DB9-14FB-467F-9C36-9F38375C2C3D}.Release|x86.ActiveCfg = Release|Win32
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|ARM64.ActiveCfg = Debug|ARM64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|ARM64.Build.0 = Debug|ARM64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.ActiveCfg = Debug|x64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x64.Build.0 = Debug|x64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.ActiveCfg = Debug|x86
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Debug|x86.Build.0 = Debug|x86
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|ARM64.ActiveCfg = Release|ARM64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|ARM64.Build.0 = Release|ARM64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.ActiveCfg = Release|x64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x64.Build.0 = Release|x64
{0720B3CF-AF67-4F7B-843D-2867A35C142F}.Release|x86.ActiveCfg = Release|x86
Expand Down
2 changes: 1 addition & 1 deletion MediaCaptureWPF/MediaCaptureWPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Configurations>Debug;Release</Configurations>
<Platforms>x86;x64</Platforms>
<Platforms>x86;x64;ARM64</Platforms>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Properties\**" />
Expand Down
Loading