v0.0.3

Updated NatCam version to 2.0f1.
Changed the preview data format to `RGBA32` on all platforms.

Author: EnoxSoftware

Assets/NatCamWithOpenCVForUnityExample/NatCamPreviewOnlyExample/NatCamPreviewOnlyExample.cs

@@ -33,14 +33,9 @@ public enum ImageProcessingType
         public AspectRatioFitter aspectFitter;
 
         bool didUpdateThisFrame = false;
-        private Texture2D texture;
-        private byte[] buffer;
-        const TextureFormat textureFormat =
-        #if UNITY_IOS && !UNITY_EDITOR
-        TextureFormat.BGRA32;
-        #else
-        TextureFormat.RGBA32;
-        #endif
+        Texture2D texture;
+        byte[] buffer;
+        const TextureFormat textureFormat = TextureFormat.RGBA32;
 
         int updateCount = 0;
         int onFrameCount = 0;
@@ -125,7 +120,7 @@ public override void OnStart ()
                     Debug.Log(key + ": " + cameraProps[key]);
                 }
 
-                if (fpsMonitor != null && verbose){
+                if (fpsMonitor != null){
                     fpsMonitor.boxWidth = 200;
                     fpsMonitor.boxHeight = 620;
                     fpsMonitor.LocateGUI();
@@ -139,7 +134,7 @@ public override void OnStart ()
             catch(Exception e)
             {
                 Debug.Log ("Exception: " + e);
-                if (fpsMonitor != null && verbose) {
+                if (fpsMonitor != null) {
                     fpsMonitor.consoleText = "Exception: " + e;
                 }
             }
@@ -161,21 +156,26 @@ public override void OnFrame ()
                 preview.texture = NatCam.Preview;
             } else {
 
+                // Size checking
+                if (buffer != null && buffer.Length != NatCam.Preview.width * NatCam.Preview.height * 4) {
+                    buffer = null;
+                }
+
                 // Create the managed buffer
                 buffer = buffer ?? new byte[NatCam.Preview.width * NatCam.Preview.height * 4];
 
                 // Capture the current frame
                 if (!NatCam.CaptureFrame (buffer)) return;
 
-                didUpdateThisFrame = true;
-
                 // Size checking
                 if (texture && (texture.width != NatCam.Preview.width || texture.height != NatCam.Preview.height)) {
                     Texture2D.Destroy (texture);
                     texture = null;
                 }
                 // Create the texture
                 texture = texture ?? new Texture2D (NatCam.Preview.width, NatCam.Preview.height, textureFormat, false, false);
+
+                didUpdateThisFrame = true;
             }
         }
 
@@ -213,7 +213,7 @@ void Update()
 
                 } else {
 
-                    if (texture.width * texture.height * 4 != buffer.Length)
+                    if (texture == null || buffer == null || texture.width * texture.height * 4 != buffer.Length)
                         return;
 
                     // Process
@@ -257,11 +257,7 @@ private void ProcessImage (Byte[] buffer, int width, int height, int size, Image
                             y = height-1;
                         int p = (x * 4) + (y * width * 4);
                         // Set pixels in the buffer
-                        #if UNITY_IOS && !UNITY_EDITOR 
-                        buffer[p] = 0; buffer[p + 1] = 0; buffer[p + 2] = 255; buffer[p + 3] = 255;
-                        #else
                         buffer[p] = 255; buffer[p + 1] = 0; buffer[p + 2] = 0; buffer[p + 3] = 255;
-                        #endif
                     }
                 }
 

Assets/NatCamWithOpenCVForUnityExample/NatCamPreviewOnlyExample/NatCamPreviewOnlyExample.unity

@@ -1954,7 +1954,6 @@ MonoBehaviour:
   photoResolution:
     width: 1920
     height: 1080
-  verbose: 1
   imageProcessingType: 0
   imageProcessingTypeDropdown: {fileID: 1213656990}
   requestedFPS: 30

Assets/NatCamWithOpenCVForUnityExample/NatCamPreviewToMatExample/NatCamPreviewToMatExample.cs

@@ -59,16 +59,11 @@ public enum ImageProcessingType
         /// </summary>
         FpsMonitor fpsMonitor;
 
-        private Mat matrix;
-        private Mat grayMatrix;
-        private byte[] pixelBuffer;
-        private Texture2D texture;
-        private const TextureFormat textureFormat =
-        #if UNITY_IOS && !UNITY_EDITOR 
-        TextureFormat.BGRA32;
-        #else
-        TextureFormat.RGBA32;
-        #endif
+        Mat matrix;
+        Mat grayMatrix;
+        byte[] pixelBuffer;
+        Texture2D texture;
+        const TextureFormat textureFormat = TextureFormat.RGBA32;
 
         public override void Start () 
         {
@@ -267,11 +262,7 @@ private void ProcessImage (Mat matrix, ImageProcessingType imageProcessingType =
             switch (imageProcessingType) {
             case ImageProcessingType.DrawLine:
                 // Draw a diagonal line on our image
-                #if UNITY_IOS && !UNITY_EDITOR 
-                Imgproc.line (matrix, new Point (0, 0), new Point (matrix.cols (), matrix.rows ()), new Scalar (0, 0, 255, 255), 4);
-                #else
                 Imgproc.line (matrix, new Point (0, 0), new Point (matrix.cols (), matrix.rows ()), new Scalar (255, 0, 0, 255), 4);
-                #endif
 
                 break;
             case ImageProcessingType.ConvertToGray:
@@ -281,14 +272,9 @@ private void ProcessImage (Mat matrix, ImageProcessingType imageProcessingType =
                     grayMatrix = null;
                 }
                 grayMatrix = grayMatrix ?? new Mat(matrix.height(), matrix.width(), CvType.CV_8UC1);
-                
-                #if UNITY_IOS && !UNITY_EDITOR 
-                Imgproc.cvtColor (matrix, grayMatrix, Imgproc.COLOR_BGRA2GRAY);
-                Imgproc.cvtColor (grayMatrix, matrix, Imgproc.COLOR_GRAY2BGRA);
-                #else
+
                 Imgproc.cvtColor (matrix, grayMatrix, Imgproc.COLOR_RGBA2GRAY);
                 Imgproc.cvtColor (grayMatrix, matrix, Imgproc.COLOR_GRAY2RGBA);
-                #endif
 
                 break;
             }

Assets/NatCamWithOpenCVForUnityExample/NatCamPreviewToMatExample/NatCamPreviewToMatExample.unity

@@ -210,7 +210,7 @@ MonoBehaviour:
   m_Value: 0
   m_Options:
     m_Options:
-    - m_Text: 'Method: PreviewBuffer'
+    - m_Text: 'Method: CaptureFrame'
       m_Image: {fileID: 0}
     - m_Text: 'Method: BlitWithReadPixels'
       m_Image: {fileID: 0}
@@ -2497,7 +2497,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 'Method: PreviewBuffer'
+  m_Text: 'Method: CaptureFrame'
 --- !u!222 &1332287264
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -2642,7 +2642,6 @@ MonoBehaviour:
   photoResolution:
     width: 1920
     height: 1080
-  verbose: 1
   matCaptureMethod: 0
   matCaptureMethodDropdown: {fileID: 67966319}
   imageProcessingType: 0

README.md

@@ -7,7 +7,7 @@ An example of a benchmark test integrating NatCam and OpenCVForUnity.
 * Anddroid (Pixel, Nexus 7, Zenfone, SC-04E) / iOS (iPhone8, iPhone6)
 * Unity >= 5.6.1f1
 * Scripting backend MONO / IL2CPP
-* NatCam Pro 1.6f2 ([https://assetstore.unity.com/packages/tools/integration/natcam-pro-webcam-api-52154](https://assetstore.unity.com/packages/tools/integration/natcam-pro-webcam-api-52154))  
+* NatCam - WebCam API 2.0f1 ([https://assetstore.unity.com/packages/tools/integration/natcam-pro-webcam-api-52154](https://assetstore.unity.com/packages/tools/integration/natcam-pro-webcam-api-52154))  
 * OpenCV for Unity 2.2.8 ([https://assetstore.unity.com/packages/tools/integration/opencv-for-unity-21088](https://assetstore.unity.com/packages/tools/integration/opencv-for-unity-21088))