From: ht1211.kim <ht1211.kim@samsung.com>
Date: Thu, 11 Apr 2013 07:55:19 +0000 (+0900)
Subject: [libmm-camcorder] video camera orientation tag added
X-Git-Tag: 2.1b_release^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_2.1;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git

[libmm-camcorder] video camera orientation tag added

Change-Id: Id30b90de31a2c1058ad1e52664d906e17b96d4f9
---

diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec
index 07ef8b8..a11b3f2 100644
--- a/packaging/libmm-camcorder.spec
+++ b/packaging/libmm-camcorder.spec
@@ -1,6 +1,6 @@
 Name:       libmm-camcorder
 Summary:    Camera and recorder library
-Version:    0.7.10
+Version:    0.7.11
 Release:    0
 Group:      libs
 License:    Apache-2.0
diff --git a/src/include/mm_camcorder.h b/src/include/mm_camcorder.h
index e078aa2..6eb962b 100644
--- a/src/include/mm_camcorder.h
+++ b/src/include/mm_camcorder.h
@@ -541,6 +541,10 @@
 		<td>Orientation of captured image</td>
 	</tr>
 	<tr>
+		<td>#MMCAM_TAG_VIDEO_ORIENTATION</td>
+		<td>Orientation of encoded video</td>
+	</tr>
+	<tr>
 		<td>#MMCAM_TAG_SOFTWARE</td>
 		<td>software name and version</td>
 	</tr>
@@ -1101,6 +1105,12 @@ extern "C" {
 #define MMCAM_TAG_ORIENTATION                   "tag-orientation"
 
 /**
+ * Orientation of captured video
+ * @see		MMCamcorderTagVideoOrientation
+ */
+#define MMCAM_TAG_VIDEO_ORIENTATION            "tag-video-orientation"
+
+/**
  * software name and version
  */
 #define MMCAM_TAG_SOFTWARE                      "tag-software"
@@ -1475,6 +1485,17 @@ enum MMCamcorderTagOrientation {
 	MM_CAMCORDER_TAG_ORT_0R_VL_0C_VB,	/**< The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.*/
 };
 
+/**
+ * An enumeration for captured video orientation values of tag .
+ */
+enum MMCamcorderTagVideoOrientation {
+	MM_CAMCORDER_TAG_VIDEO_ORT_NONE =0,	/**< No Orientation.*/
+	MM_CAMCORDER_TAG_VIDEO_ORT_90,		/**< 90 degree */
+	MM_CAMCORDER_TAG_VIDEO_ORT_180,	/**< 180 degree */
+	MM_CAMCORDER_TAG_VIDEO_ORT_270,	/**< 270 degree */
+};
+
+
 
 /**
  * An enumeration for Strobe mode.
diff --git a/src/include/mm_camcorder_attribute.h b/src/include/mm_camcorder_attribute.h
index 30b4cd8..406dece 100644
--- a/src/include/mm_camcorder_attribute.h
+++ b/src/include/mm_camcorder_attribute.h
@@ -171,6 +171,7 @@ typedef enum
 	MM_CAM_CAMERA_FACING_DIRECTION,
 	MM_CAM_DISPLAY_FLIP,
 	MM_CAM_CAMERA_VIDEO_STABILIZATION,
+	MM_CAM_TAG_VIDEO_ORIENTATION,
 	MM_CAM_NUM
 }MMCamcorderAttrsID;
 
diff --git a/src/mm_camcorder_attribute.c b/src/mm_camcorder_attribute.c
index 15b9489..4dfeef6 100644
--- a/src/mm_camcorder_attribute.c
+++ b/src/mm_camcorder_attribute.c
@@ -1460,6 +1460,18 @@ mm_cam_attr_construct_info cam_attrs_const_info[] ={
 		0,
 		0,
 		_mmcamcorder_commit_camera_video_stabilization,
+	},
+	//118
+	{
+		MM_CAM_TAG_VIDEO_ORIENTATION,
+		"tag-video-orientation",
+		MMF_VALUE_TYPE_INT,
+		MM_ATTRS_FLAG_RW,
+		{(void*)MM_CAMCORDER_TAG_VIDEO_ORT_NONE},
+		MM_ATTRS_VALID_TYPE_INT_RANGE,
+		MM_CAMCORDER_TAG_VIDEO_ORT_NONE,
+		MM_CAMCORDER_TAG_VIDEO_ORT_270,
+		NULL,
 	}
 };
 
diff --git a/src/mm_camcorder_util.c b/src/mm_camcorder_util.c
index 25ce1f3..88381ba 100644
--- a/src/mm_camcorder_util.c
+++ b/src/mm_camcorder_util.c
@@ -285,23 +285,23 @@ gboolean _mmcamcorder_update_composition_matrix(FILE *f, int orientation)
 	guint32 d = 0x00010000;
 
 	switch (orientation) {
-	case MM_CAMCORDER_TAG_ORT_0R_VR_0C_VT:/* 90 degree */
+	case MM_CAMCORDER_TAG_VIDEO_ORT_90:/* 90 degree */
 		a = 0;
 		b = 0x00010000;
 		c = 0xffff0000;
 		d = 0;
 		break;
-	case MM_CAMCORDER_TAG_ORT_0R_VB_0C_VR:/* 180 degree */
+	case MM_CAMCORDER_TAG_VIDEO_ORT_180:/* 180 degree */
 		a = 0xffff0000;
 		d = 0xffff0000;
 		break;
-	case MM_CAMCORDER_TAG_ORT_0R_VL_0C_VB:/* 270 degree */
+	case MM_CAMCORDER_TAG_VIDEO_ORT_270:/* 270 degree */
 		a = 0;
 		b = 0xffff0000;
 		c = 0x00010000;
 		d = 0;
 		break;
-	case MM_CAMCORDER_TAG_ORT_0R_VT_0C_VL:/* 0 degree */
+	case MM_CAMCORDER_TAG_VIDEO_ORT_NONE:/* 0 degree */
 	default:
 		break;
 	}
diff --git a/src/mm_camcorder_videorec.c b/src/mm_camcorder_videorec.c
index ab1123a..0a04eab 100644
--- a/src/mm_camcorder_videorec.c
+++ b/src/mm_camcorder_videorec.c
@@ -1475,7 +1475,7 @@ static gboolean __mmcamcorder_add_locationinfo_mp4(MMHandleType handle)
 	                            MMCAM_TAG_LATITUDE, &latitude,
 	                            MMCAM_TAG_LONGITUDE, &longitude,
 	                            MMCAM_TAG_ALTITUDE, &altitude,
-	                            MMCAM_TAG_ORIENTATION, &orientation,
+	                            MMCAM_TAG_VIDEO_ORIENTATION, &orientation,
 	                            NULL);
 	if (err_name) {
 		_mmcam_dbg_warn("Get tag attrs fail. (%s:%x)", err_name, err);