Fixed the HololensCameraStreamToMatHelper.

Author: EnoxSoftware

Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/HololensCameraStreamToMatHelper.cs

@@ -20,7 +20,7 @@ namespace HoloLensWithOpenCVForUnityExample
 
     /// <summary>
     /// Hololens camera stream to mat helper.
-    /// v 1.0.0
+    /// v 1.0.1
     /// 
     /// Combination of camera frame size and frame rate that can be acquired on Hololens. (width x height : framerate)
     /// 1280 x 720 : 30
@@ -63,7 +63,7 @@ public class HololensCameraStreamToMatHelper : WebCamTextureToMatHelper
         protected System.Object latestImageBytesLockObject = new System.Object ();
 
         protected HoloLensCameraStream.VideoCapture videoCapture;
-        protected CameraParameters cameraParams;
+        protected HoloLensCameraStream.CameraParameters cameraParams;
 
         protected Matrix4x4 _cameraToWorldMatrix = Matrix4x4.identity;
         protected Matrix4x4 cameraToWorldMatrix {
@@ -116,6 +116,14 @@ protected byte[] latestImageBytes {
             set { lock (lockObject)
                 _hasInitDone = value; }
         }
+            
+        protected bool _hasInitEventCompleted = false;
+        protected bool hasInitEventCompleted {
+            get { lock (lockObject)
+                return _hasInitEventCompleted; }
+            set { lock (lockObject)
+                _hasInitEventCompleted = value; }
+        }
 
         protected virtual void LateUpdate ()
         {
@@ -159,7 +167,7 @@ protected virtual void OnFrameSampleAcquired(VideoCaptureSample sample)
             didUpdateThisFrame = true;
             didUpdateImageBufferInCurrentFrame = true;
 
-            if (hasInitDone && frameMatAcquired != null)
+            if (hasInitEventCompleted && frameMatAcquired != null)
             {
                 Mat mat = new Mat (cameraParams.cameraResolutionHeight, cameraParams.cameraResolutionWidth, CvType.CV_8UC4);
                 OpenCVForUnity.Utils.copyToMat<byte> (latestImageBytes, mat);
@@ -181,15 +189,15 @@ protected virtual void OnFrameSampleAcquired(VideoCaptureSample sample)
             }
         }
 
-        protected virtual CameraParameters CreateCameraParams (HoloLensCameraStream.VideoCapture videoCapture)
+        protected virtual HoloLensCameraStream.CameraParameters CreateCameraParams (HoloLensCameraStream.VideoCapture videoCapture)
         {
             int min1 = videoCapture.GetSupportedResolutions().Min (r => Mathf.Abs((r.width * r.height) - (_requestedWidth * _requestedHeight)));
             HoloLensCameraStream.Resolution resolution = videoCapture.GetSupportedResolutions().First (r => Mathf.Abs((r.width * r.height) - (_requestedWidth * _requestedHeight)) == min1);
 
             float min2 = videoCapture.GetSupportedFrameRatesForResolution(resolution).Min (f => Mathf.Abs(f - _requestedFPS));
             float frameRate = videoCapture.GetSupportedFrameRatesForResolution(resolution).First (f => Mathf.Abs(f - _requestedFPS) == min2);
 
-            CameraParameters cameraParams = new CameraParameters();
+            HoloLensCameraStream.CameraParameters cameraParams = new HoloLensCameraStream.CameraParameters();
             cameraParams.cameraResolutionHeight = resolution.height;
             cameraParams.cameraResolutionWidth = resolution.width;
             cameraParams.frameRate = Mathf.RoundToInt(frameRate);
@@ -279,7 +287,11 @@ protected override IEnumerator _Initialize ()
             } else {                
 
                 //Fetch a pointer to Unity's spatial coordinate system if you need pixel mapping
+                #if UNITY_2017_2_OR_NEWER
+                spatialCoordinateSystemPtr = UnityEngine.XR.WSA.WorldManager.GetNativeISpatialCoordinateSystemPtr ();
+                #else
                 spatialCoordinateSystemPtr = UnityEngine.VR.WSA.WorldManager.GetNativeISpatialCoordinateSystemPtr ();
+                #endif
 
                 HoloLensCameraStream.VideoCapture.CreateAync (videoCapture => {
 
@@ -348,12 +360,13 @@ protected override IEnumerator _Initialize ()
                     }
 
                     isInitWaiting = false;
+                    hasInitDone = true;
                     initCoroutine = null;
 
                     if (onInitialized != null)
                         onInitialized.Invoke ();
 
-                    hasInitDone = true;
+                    hasInitEventCompleted = true;
 
                     break;
                 } else {
@@ -390,6 +403,15 @@ protected override IEnumerator _Initialize ()
             }
         }
 
+        /// <summary>
+        /// Indicates whether this instance has been initialized.
+        /// </summary>
+        /// <returns><c>true</c>, if this instance has been initialized, <c>false</c> otherwise.</returns>
+        public override bool IsInitialized ()
+        {      
+            return hasInitDone;
+        }
+
         /// <summary>
         /// Starts the webcam texture.
         /// </summary>
@@ -572,6 +594,7 @@ protected override void ReleaseResources ()
         {
             isInitWaiting = false;
             hasInitDone = false;
+            hasInitEventCompleted = false;
 
             latestImageBytes = null;
             didUpdateThisFrame = false;

Assets/HoloLensWithOpenCVForUnityExample/Scripts/Utils/WebCamTextureToMatHelper.cs

@@ -9,14 +9,14 @@ namespace HoloLensWithOpenCVForUnityExample
 {
     /// <summary>
     /// Webcam texture to mat helper.
-    /// v 1.0.5
+    /// v 1.0.6
     /// </summary>
     public class WebCamTextureToMatHelper : MonoBehaviour
     {
         /// <summary>
-        /// Set the name of the device to use.
+        /// Set the name of the device to use. (or device index)
         /// </summary>
-        [SerializeField, FormerlySerializedAs("requestedDeviceName"), TooltipAttribute ("Set the name of the device to use.")]
+        [SerializeField, FormerlySerializedAs("requestedDeviceName"), TooltipAttribute ("Set the name of the device to use. (or device index)")]
         protected string _requestedDeviceName = null;
         public string requestedDeviceName {
             get { return _requestedDeviceName; } 
@@ -92,10 +92,11 @@ public bool flipHorizontal {
             get { return _flipHorizontal; } 
             set { _flipHorizontal = value; }
         }
-
+            
         /// <summary>
-        /// The timeout frame count.
+        /// The number of frames before the initialization process times out.
         /// </summary>
+        [SerializeField, FormerlySerializedAs("timeoutFrameCount"), TooltipAttribute ("The number of frames before the initialization process times out.")]
         protected int _timeoutFrameCount = 300;
         public int timeoutFrameCount {
             get { return _timeoutFrameCount; } 
@@ -275,10 +276,27 @@ protected virtual IEnumerator _Initialize ()
             isInitWaiting = true;
 
             if (!String.IsNullOrEmpty (requestedDeviceName)) {
-                webCamTexture = new WebCamTexture (requestedDeviceName, requestedWidth, requestedHeight, requestedFPS);
-            } else {
+                int requestedDeviceIndex = -1;
+                if (Int32.TryParse (requestedDeviceName, out requestedDeviceIndex)) {                    
+                    if (requestedDeviceIndex >= 0 && requestedDeviceIndex < WebCamTexture.devices.Length) {
+                        webCamDevice = WebCamTexture.devices [requestedDeviceIndex];
+                        webCamTexture = new WebCamTexture (webCamDevice.name, requestedWidth, requestedHeight, requestedFPS);
+                    }
+                } else {
+                    for (int cameraIndex = 0; cameraIndex < WebCamTexture.devices.Length; cameraIndex++) {
+                        if (WebCamTexture.devices [cameraIndex].name == requestedDeviceName) {
+                            webCamTexture = new WebCamTexture (requestedDeviceName, requestedWidth, requestedHeight, requestedFPS);
+                        }
+                    }
+                }
+
+                if (webCamTexture == null)
+                    Debug.Log ("Cannot find webcam device " + requestedDeviceName + ".");
+            }
+
+            if (webCamTexture == null) {
                 // Checks how many and which cameras are available on the device
-                for (int cameraIndex = 0; cameraIndex < WebCamTexture.devices.Length; cameraIndex++) {
+                for (int cameraIndex = 0; cameraIndex < WebCamTexture.devices.Length; cameraIndex++) {                   
                     if (WebCamTexture.devices [cameraIndex].isFrontFacing == requestedIsFrontFacing) {
 
                         webCamDevice = WebCamTexture.devices [cameraIndex];
@@ -334,7 +352,7 @@ protected virtual IEnumerator _Initialize ()
                     #endif
                 #endif
 
-                    Debug.Log ("WebCamTextureToMatHelper:: " + "name:" + webCamTexture.name + " width:" + webCamTexture.width + " height:" + webCamTexture.height + " fps:" + webCamTexture.requestedFPS
+                    Debug.Log ("WebCamTextureToMatHelper:: " + "devicename:" + webCamTexture.deviceName + " name:" + webCamTexture.name + " width:" + webCamTexture.width + " height:" + webCamTexture.height + " fps:" + webCamTexture.requestedFPS
                         + " videoRotationAngle:" + webCamTexture.videoRotationAngle + " videoVerticallyMirrored:" + webCamTexture.videoVerticallyMirrored + " isFrongFacing:" + webCamDevice.isFrontFacing);
 
                     if (colors == null || colors.Length != webCamTexture.width * webCamTexture.height)