[Camera] Add new preview format - RGB (#465)

diff --git a/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs b/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs
index bb091621064542df20766167bd8bd8629870e7e5..c1b8b20f0bf5b380fdd5bec9a9e61c5d6a04da43 100644 (file)
--- a/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs
+++ b/src/Tizen.Multimedia.Camera/Camera/CameraEnums.cs
@@ -915,6 +915,11 @@ namespace Tizen.Multimedia
         /// Depth plane data.
         /// </summary>
         /// <since_tizen> 5 </since_tizen>
-        DepthPlane
+        DepthPlane,
+        /// <summary>
+        /// Rgb plane data.
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        RgbPlane
     }
 }

diff --git a/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs b/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs
index 88369a8a39139803866f99fee7859da60da9e161..b1975e520c93f122098ab29eb504de98d3e88a60 100644 (file)
--- a/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs
+++ b/src/Tizen.Multimedia.Camera/Camera/PreviewFrame.cs
@@ -50,6 +50,10 @@ namespace Tizen.Multimedia
                 {
                     return new DepthPlane(unmanagedStruct.Plane.DepthPlane);
                 }
+                else if (unmanagedStruct.Format == CameraPixelFormat.Rgba || unmanagedStruct.Format == CameraPixelFormat.Argb)
+                {
+                    return new RgbPlane(unmanagedStruct.Plane.RgbPlane);
+                }
                 else
                 {
                     return new SinglePlane(unmanagedStruct.Plane.SinglePlane);
@@ -80,6 +84,10 @@ namespace Tizen.Multimedia
                 {
                     return PlaneType.DepthPlane;
                 }
+                else if (unmanagedStruct.Format == CameraPixelFormat.Rgba || unmanagedStruct.Format == CameraPixelFormat.Argb)
+                {
+                    return PlaneType.RgbPlane;
+                }
                 else
                 {
                     return PlaneType.SinglePlane;

diff --git a/src/Tizen.Multimedia.Camera/Camera/RgbPlane.cs b/src/Tizen.Multimedia.Camera/Camera/RgbPlane.cs
new file mode 100644 (file)
index 0000000..0b76215
--- /dev/null
+++ b/src/Tizen.Multimedia.Camera/Camera/RgbPlane.cs
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Runtime.InteropServices;
+using static Interop.Camera;
+
+namespace Tizen.Multimedia
+{
+    /// <summary>
+    /// The class containing the rgb data for subject distance.
+    /// </summary>
+    /// <since_tizen> 5 </since_tizen>
+    public class RgbPlane : IPreviewPlane
+    {
+        internal RgbPlane(RgbPlaneStruct unmanagedData)
+        {
+            Data = new byte[unmanagedData.DataLength];
+            Marshal.Copy(unmanagedData.Data, Data, 0, (int)unmanagedData.DataLength);
+        }
+
+        /// <summary>
+        /// The buffer containing the rgb data.
+        /// </summary>
+        /// <since_tizen> 5 </since_tizen>
+        public byte[] Data { get; }
+    }
+}

diff --git a/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs b/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs
index d1b58dc6851beed0f11e19fb812addcd538bc5ba..314480030d31de9a78f9036652638491211f0286 100644 (file)
--- a/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs
+++ b/src/Tizen.Multimedia.Camera/Interop/Interop.Camera.cs
@@ -262,6 +262,13 @@ internal static partial class Interop
             internal uint DataLength;
         }
 
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct RgbPlaneStruct
+        {
+            internal IntPtr Data;
+            internal uint DataLength;
+        }
+
         [StructLayout(LayoutKind.Explicit)]
         internal struct PreviewPlaneStruct
         {
@@ -275,6 +282,8 @@ internal static partial class Interop
             internal EncodedPlaneStruct EncodedPlane;
             [FieldOffsetAttribute(0)]
             internal DepthPlaneStruct DepthPlane;
+            [FieldOffsetAttribute(0)]
+            internal RgbPlaneStruct RgbPlane;
         }
 
         [StructLayout(LayoutKind.Sequential)]