Add Spherical Video Metadata V2 support

Change-Id: Idbbbabff024f86015b38c617a7b7c08b7e0ebe08
Signed-off-by: Mykola Alieksieiev <m.alieksieie@samsung.com>

1 files changed, 32 insertions, 18 deletions

diff --git a/include/metadata_extractor_private.h b/include/metadata_extractor_private.h
index 0834a77..f1bde66 100755
--- a/include/metadata_extractor_private.h
+++ b/include/metadata_extractor_private.h
@@ -70,24 +70,38 @@ typedef struct {
 
 /*TODO: Move attributes to metadata_extractor_type.h after ACR*/
 #ifdef SUPPORT_GSPHERICAL_METADATA
-#define METADATA_360_STITCHED					35 /**< Flag indicating if the video is stitched (Since 4.0) */
-#define METADATA_360_STITCHING_SOFTWARE			36 /**< Software used to stitch the spherical video (Since 4.0) */
-#define METADATA_360_PROJECTION_TYPE			37 /**< Projection type used in the video frames (Since 4.0) */
-#define METADATA_360_STEREO_MODE				38 /**< Description of stereoscopic 3D layout (Since 4.0) */
-#define METADATA_360_SOURCE_COUNT				39 /**< Number of cameras used to create the spherical video (Since 4.0) */
-#define METADATA_360_INIT_VIEW_HEADING			40 /**< The heading angle of the initial view in degrees. (Since 4.0) */
-#define METADATA_360_INIT_VIEW_PITCH			41 /**< The pitch angle of the initial view in degrees (Since 4.0) */
-#define METADATA_360_INIT_VIEW_ROLL 			42 /**< The roll angle of the initial view in degrees (Since 4.0) */
-#define METADATA_360_TIMESTAMP					43 /**< Epoch timestamp of when the first frame in the video was recorded (Since 4.0) */
-#define METADATA_360_FULL_PANO_WIDTH			44 /**< Width of the encoded video frame in pixels (Since 4.0) */
-#define METADATA_360_FULL_PANO_HEIGHT			45 /**< Height of the encoded video frame in pixels (Since 4.0) */
-#define METADATA_360_CROPPED_AREA_IMAGE_WIDTH	46 /**< Width of the video frame to display (e.g. cropping) (Since 4.0) */
-#define METADATA_360_CROPPED_AREA_IMAGE_HEIGHT	47 /**< Height of the video frame to display (e.g. cropping) (Since 4.0) */
-#define METADATA_360_CROPPED_AREA_LEFT			48 /**< Column where the left edge of the image was cropped from the full sized panorama (Since 4.0) */
-#define METADATA_360_CROPPED_AREA_TOP			49 /**< Row where the top edge of the image was cropped from the full sized panorama (Since 4.0) */
-#define METADATA_AMBISONIC_TYPE					50 /**< Ambisonics type in User Data Information (Since 4.0) */
-#define METADATA_AMBISONIC_FORMAT				51 /**< Ambisonics format in User Data Information (Since 4.0) */
-#define METADATA_AMBISONIC_ORDER				52 /**< Ambisonics order in User Data Information (Since 4.0) */
+
+#define METADATA_360_V1_STITCHED					35 /**< Flag indicating if the video is stitched. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_STITCHING_SOFTWARE			36 /**< Software used to stitch the spherical video. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_PROJECTION_TYPE				37 /**< Projection type used in the video frames. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_STEREO_MODE					38 /**< Description of stereoscopic 3D layout. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_SOURCE_COUNT				39 /**< Number of cameras used to create the spherical video. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_INIT_VIEW_HEADING			40 /**< The heading angle of the initial view in degrees. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_INIT_VIEW_PITCH				41 /**< The pitch angle of the initial view in degrees. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_INIT_VIEW_ROLL 				42 /**< The roll angle of the initial view in degrees. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_TIMESTAMP					43 /**< Epoch timestamp of when the first frame in the video was recorded. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_FULL_PANO_WIDTH				44 /**< Width of the encoded video frame in pixels. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_FULL_PANO_HEIGHT			45 /**< Height of the encoded video frame in pixels. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_CROPPED_AREA_IMAGE_WIDTH	46 /**< Width of the video frame to display (e.g. cropping). Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_CROPPED_AREA_IMAGE_HEIGHT	47 /**< Height of the video frame to display (e.g. cropping). Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_CROPPED_AREA_LEFT			48 /**< Column where the left edge of the image was cropped from the full sized panorama. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V1_CROPPED_AREA_TOP			49 /**< Row where the top edge of the image was cropped from the full sized panorama. Spherical Video Metadata RFC v1 (Since 4.0) */
+#define METADATA_360_V2_STEREO_MODE					50 /**< Stereo frame layout. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_METADATA_SOURCE				51 /**< Tool used to create the Spherical Video Metadata V2 (Since 4.0) */
+#define METADATA_360_V2_PROJ_TYPE					52 /**< Projection type. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_POSE_YAW					53 /**< Counter-clockwise rotation in degrees around the up vector. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_POSE_PITCH					54 /**< Counter-clockwise rotation in degrees around the right vector post yaw transform. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_POSE_ROLL					55 /**< Clockwise-rotation in degrees around the forward vector post yaw and pitch transform. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_CBMP_LAYOUT					56 /**< Layout of cube faces for the Cubemap Projection. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_CBMP_PADDING				57 /**< Number of pixels to pad from the edge of each cube face for the Cubemap Projection. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_EQUI_BOUNDS_TOP				58 /**< Amount from the top of the frame to crop. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_EQUI_BOUNDS_BOTTOM			59 /**< Amount from the bottom of the frame to crop. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_EQUI_BOUNDS_LEFT			60 /**< Amount from the left of the frame to crop. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_360_V2_EQUI_BOUNDS_RIGHT			61 /**< Amount from the right of the frame to crop. Spherical Video Metadata RFC v2 (Since 4.0) */
+#define METADATA_AMBISONIC_TYPE						62 /**< Ambisonics type in User Data Information (Since 4.0) */
+#define METADATA_AMBISONIC_FORMAT					63 /**< Ambisonics format in User Data Information (Since 4.0) */
+#define METADATA_AMBISONIC_ORDER					64 /**< Ambisonics order in User Data Information (Since 4.0) */
+
 #endif
 
 #ifdef __cplusplus