Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Issue 297 - Upgrading MixedRemoteViewCompositor to SDK 10.0.18362.0 (v142) #336

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Issue 297 - Upgrading MixedRemoteViewCompositor to SDK 10.0.18362.0 (v142) #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b77c86
Upgrading to 10.0.14393.0 with v142
danilogr Jun 20, 2019
0b4fa94
Upgrading to 10.0.15063.0 with v142
danilogr Jun 20, 2019
b93d3e4
Upgrading to 10.0.16299.0 with v142
danilogr Jun 20, 2019
2a1b18e
Upgrading to 10.0.18362.0 with v142
danilogr Jun 20, 2019
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
2 changes: 1 addition & 1 deletion MixedRemoteViewCompositor/Source/Shared/Media/NetworkMediaSinkStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ HRESULT NetworkMediaSinkStreamImpl::ProcessCameraData(
UINT32 blobSize = 0;

using float4x4 = ABI::Windows::Foundation::Numerics::Matrix4x4;
MFPinholeCameraIntrinsics cameraIntrinsics;
ABI::MixedRemoteViewCompositor::MFPinholeCameraIntrinsics cameraIntrinsics;
float4x4 worldToCameraMatrix;
float4x4 cameraProjectionTransform;
float4x4 cameraViewTransform;
Expand Down
14 changes: 7 additions & 7 deletions MixedRemoteViewCompositor/Source/Shared/MixedRemoteViewCompositor.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ import "Windows.Storage.idl";
import "Windows.Storage.Streams.idl";

// Additional imports to ensure that all required headers are included
cpp_quote("#if defined(__cplusplus)")
cpp_quote("}")
cpp_quote("#endif // defined(__cplusplus)")
//cpp_quote("#if defined(__cplusplus)")
//cpp_quote("}")
//cpp_quote("#endif // defined(__cplusplus)")
cpp_quote("#include <Windows.Foundation.h>")
cpp_quote("#if !defined(__windows2Enetworking2Esockets_h__)")
cpp_quote("#include <Windows.Networking.Sockets.h>")
cpp_quote("#endif // !defined(__windows2Enetworking2Esockets_h__)")
cpp_quote("#if defined(__cplusplus)")
cpp_quote("extern \"C\" {")
cpp_quote("#endif // defined(__cplusplus)")
//cpp_quote("#if defined(__cplusplus)")
//cpp_quote("extern \"C\" {")
//cpp_quote("#endif // defined(__cplusplus)")

namespace MixedRemoteViewCompositor
{
Expand Down Expand Up @@ -293,7 +293,7 @@ namespace MixedRemoteViewCompositor {
Windows.Foundation.Numerics.Matrix4x4 worldToCameraMatrix;
Windows.Foundation.Numerics.Matrix4x4 cameraProjectionTransform;
Windows.Foundation.Numerics.Matrix4x4 cameraViewTransform;
MFPinholeCameraIntrinsics cameraIntrinsics;
MFPinholeCameraIntrinsics cameraIntrinsics;
};

[version(1.0)]
Expand Down
2 changes: 1 addition & 1 deletion MixedRemoteViewCompositor/Source/Shared/pch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
#endif

// mf guids for pulling sample data
EXTERN_GUID(MFSampleExtension_PinholeCameraIntrinsics, 0x4ee3b6c5, 0x6a15, 0x4e72, 0x97, 0x61, 0x70, 0xc1, 0xdb, 0x8b, 0x9f, 0xe3);
//EXTERN_GUID(MFSampleExtension_PinholeCameraIntrinsics, 0x4ee3b6c5, 0x6a15, 0x4e72, 0x97, 0x61, 0x70, 0xc1, 0xdb, 0x8b, 0x9f, 0xe3);
#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
EXTERN_GUID(MFSampleExtension_Spatial_CameraCoordinateSystem, 0x9d13c82f, 0x2199, 0x4e67, 0x91, 0xcd, 0xd1, 0xa4, 0x18, 0x1f, 0x25, 0x34);
EXTERN_GUID(MFSampleExtension_Spatial_CameraViewTransform, 0x4e251fa4, 0x830f, 0x4770, 0x85, 0x9a, 0x4b, 0x8d, 0x99, 0xaa, 0x80, 0x9b);
Expand Down
4 changes: 2 additions & 2 deletions MixedRemoteViewCompositor/Source/WSA/WSA.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
<ProjectName>WSA</ProjectName>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions MixedRemoteViewCompositor/Source/Win32/Win32.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<ProjectGuid>{60B0431F-7F25-4A1E-811C-7B7DE08A4393}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Win32</RootNamespace>
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand Down