Merge remote-tracking branch 'origin/releases/m71' into Ivana/20190327-enumerate-devices

Author: Vladimir Morosev

ClientCore/Signalling/Conductor.cs

@@ -1669,7 +1669,9 @@ private void DisplayAudioBufferEvent(
         {
             var buffer = evt.Buffer;
             var data = buffer.Channel(0);
-            var array = data.Data.ToArray();
+
+            var dataArray = new Int16[data.Length];
+            data.GetData(dataArray);
 
 #if DISPLAY_AUDIO_BUFFER_OUTPUT
             var sb = new StringBuilder();
@@ -1687,15 +1689,15 @@ private void DisplayAudioBufferEvent(
 
             double scale = Math.Pow(2, 10);
 
-            for (int index = 0; index < array.Count(); ++index, ++totalSamples)
+            for (int index = 0; index < dataArray.Count(); ++index, ++totalSamples)
             {
 #if DISPLAY_AUDIO_BUFFER_OUTPUT
-                sb.Append(array[index] + ",");
+                sb.Append(dataArray[index] + ",");
 #endif // DISPLAY_AUDIO_BUFFER_OUTPUT
-                array[index] = (short)(Math.Sin(totalSamples) * scale);
+                dataArray[index] = (Int16)(Math.Sin(totalSamples) * scale);
             }
 
-            data.Data = array;
+            data.SetData(dataArray);
 
 #if DISPLAY_AUDIO_BUFFER_OUTPUT
             sb.Append("\n== AUDIO FRAME PROCESSING ==\n");
@@ -1769,16 +1771,30 @@ private void Process_VideoFrameBufferEvent(IVideoFrameBufferEvent evt)
                 if (null == colorSpace)
                     continue;
 
-                IReadOnlyList<byte> bits8View;
-                IReadOnlyList<UInt16> bits16View;
+                byte[] buffer8bit = null;
+                ushort[] buffer16bit = null;
+                Windows.Foundation.IMemoryBuffer bits8View;
+                Windows.Foundation.IMemoryBuffer bits16View;
 
                 var hasBit8 = colorSpace.Is8BitColorSpace;
                 if (hasBit8)
+                {
+                    // copy the data
+                    buffer8bit = new byte[colorSpace.Length];
+                    colorSpace.GetData8bit(buffer8bit);
+                    // or get a buffer view
                     bits8View = colorSpace.Data8bit;
+                }
 
                 var hasBit16 = colorSpace.Is16BitColorSpace;
                 if (hasBit16)
+                {
+                    // copy the data
+                    buffer16bit = new ushort[colorSpace.Length];
+                    colorSpace.GetData16bit(buffer16bit);
+                    // or get a buffer view
                     bits16View = colorSpace.Data16bit;
+                }
             }
 
             IReadOnlyList<float> viewTransform = mediaSample?.GetCameraViewTransform();

ClientUnity/Assets/WSATestCertificate.pfx

@@ -37,6 +37,7 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

ClientUnity/Assets/WSATestCertificate.pfx.meta

@@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 15
+  serializedVersion: 16
   productGUID: 97a0b911ef14dab4dab9026860caba16
   AndroidProfiler: 0
   AndroidFilterTouchesWhenObscured: 0
@@ -12,7 +12,7 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: OpticalTone
+  companyName: DefaultCompany
   productName: PeerCCUnity
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
@@ -125,7 +125,6 @@ PlayerSettings:
   m_HolographicPauseOnTrackingLoss: 1
   xboxOneDisableKinectGpuReservation: 0
   xboxOneEnable7thCore: 0
-  isWsaHolographicRemotingEnabled: 0
   vrSettings:
     cardboard:
       depthFormat: 0
@@ -140,10 +139,17 @@ PlayerSettings:
     hololens:
       depthFormat: 1
       depthBufferSharingEnabled: 1
+    lumin:
+      depthFormat: 0
+      frameTiming: 2
+      enableGLCache: 0
+      glCacheMaxBlobSize: 524288
+      glCacheMaxFileSize: 8388608
     oculus:
       sharedDepthBuffer: 0
       dashSupport: 0
     enable360StereoCapture: 0
+  isWsaHolographicRemotingEnabled: 0
   protectGraphicsMemory: 0
   enableFrameTimingStats: 0
   useHDRDisplay: 0
@@ -192,6 +198,10 @@ PlayerSettings:
   iPadHighResPortraitSplashScreen: {fileID: 0}
   iPadLandscapeSplashScreen: {fileID: 0}
   iPadHighResLandscapeSplashScreen: {fileID: 0}
+  iPhone65inPortraitSplashScreen: {fileID: 0}
+  iPhone65inLandscapeSplashScreen: {fileID: 0}
+  iPhone61inPortraitSplashScreen: {fileID: 0}
+  iPhone61inLandscapeSplashScreen: {fileID: 0}
   appleTVSplashScreen: {fileID: 0}
   appleTVSplashScreen2x: {fileID: 0}
   tvOSSmallIconLayers: []
@@ -235,21 +245,23 @@ PlayerSettings:
   tvOSManualSigningProvisioningProfileType: 0
   appleEnableAutomaticSigning: 0
   iOSRequireARKit: 0
+  iOSAutomaticallyDetectAndAddCapabilities: 1
   appleEnableProMotion: 0
   clonedFromGUID: 00000000000000000000000000000000
   templatePackageId: 
   templateDefaultScene: 
   AndroidTargetArchitectures: 5
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
-  AndroidKeystoreName: 
+  AndroidKeystoreName: '{inproject}: '
   AndroidKeyaliasName: 
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 1
   AndroidIsGame: 1
   AndroidEnableTango: 0
   androidEnableBanner: 1
   androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
   m_AndroidBanners:
   - width: 320
     height: 180
@@ -261,13 +273,14 @@ PlayerSettings:
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsAPIs: []
   m_BuildTargetVRSettings:
-  - m_BuildTarget: Metro
+  - m_BuildTarget: Windows Store Apps
     m_Enabled: 1
     m_Devices:
     - WindowsMR
   m_BuildTargetEnableVuforiaSettings: []
   openGLRequireES31: 0
   openGLRequireES31AEP: 0
+  openGLRequireES32: 0
   m_TemplateCustomTags: {}
   mobileMTRendering:
     Android: 1
@@ -457,6 +470,7 @@ PlayerSettings:
   ps4DownloadDataSize: 0
   ps4GarlicHeapSize: 2048
   ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
   ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
   ps4pnSessions: 1
   ps4pnPresence: 1
@@ -504,18 +518,21 @@ PlayerSettings:
   webGLCompressionFormat: 1
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
+  webGLWasmStreaming: 0
   scriptingDefineSymbols: {}
   platformArchitecture: {}
   scriptingBackend:
-    Metro: 1
+    Windows Store Apps: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}
   incrementalIl2cppBuild: {}
   allowUnsafeCode: 0
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
+  gcIncremental: 0
+  gcWBarrierValidation: 0
   apiCompatibilityLevelPerPlatform:
-    Metro: 3
+    Windows Store Apps: 3
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: PeerCCUnity
@@ -524,7 +541,7 @@ PlayerSettings:
   metroCertificatePassword: 
   metroCertificateSubject: DefaultCompany
   metroCertificateIssuer: DefaultCompany
-  metroCertificateNotAfter: 800dfa209591d401
+  metroCertificateNotAfter: 00f458483918d601
   metroApplicationDescription: PeerCCUnity
   wsaImages: {}
   metroTileShortName: UnityVideoSurface
@@ -583,7 +600,6 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
-  metroCompilationOverrides: 1
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 
@@ -608,7 +624,7 @@ PlayerSettings:
   XboxOneAllowedProductIds: []
   XboxOnePersistentLocalStorageSize: 0
   XboxOneXTitleMemory: 8
-  xboxOneScriptCompiler: 0
+  xboxOneScriptCompiler: 1
   XboxOneOverrideIdentityName: 
   vrEditorSettings:
     daydream:
@@ -621,7 +637,7 @@ PlayerSettings:
     m_PortalFolderPath: 
   luminCert:
     m_CertPath: 
-    m_PrivateKeyPath: 
+    m_SignPackage: 1
   luminIsChannelApp: 0
   luminVersion:
     m_VersionCode: 1

ClientUnity/ProjectSettings/GraphicsSettings.asset

@@ -1 +1,2 @@
-m_EditorVersion: 2018.3.6f1
+m_EditorVersion: 2019.1.0f2
+m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)

ClientUnity/ProjectSettings/ProjectSettings.asset

@@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}