Merge "mm-core: Remove the size and version fields for some vpp structures"

1 files changed, 11 insertions, 12 deletions

diff --git a/mm-core/inc/OMX_QCOMExtns.h b/mm-core/inc/OMX_QCOMExtns.h
index 6b981546..681f433b 100644
--- a/mm-core/inc/OMX_QCOMExtns.h
+++ b/mm-core/inc/OMX_QCOMExtns.h
@@ -1779,6 +1779,7 @@ typedef struct QOMX_VIDEO_H264ENTROPYCODINGTYPE {
 
 
 /* VIDEO POSTPROCESSING CTRLS AND ENUMS */
+/* MUST KEEP SAME AS IN vpp.h */
 #define QOMX_VPP_HQV_CUSTOMPAYLOAD_SZ 256
 #define VPP_HQV_CONTROL_GLOBAL_START (VPP_HQV_CONTROL_CUST + 1)
 
@@ -1805,6 +1806,14 @@ typedef enum QOMX_VPP_HQV_HUE_MODE {
     VPP_HQV_HUE_MODE_MAX,
 } QOMX_VPP_HQV_HUE_MODE;
 
+typedef enum QOMX_VPP_SPLIT_DIRECTION {
+    VPP_HQV_SPLIT_LEFT_TO_RIGHT,
+    VPP_HQV_SPLIT_RIGHT_TO_LEFT,
+    VPP_HQV_SPLIT_TOP_TO_BOTTOM,
+    VPP_HQV_SPLIT_BOTTOM_TO_TOP,
+    VPP_HQV_SPLIT_MAX,
+} QOMX_VPP_SPLIT_DIRECTION;
+
 typedef enum QOMX_VPP_HQV_FRC_MODE {
    VPP_HQV_FRC_MODE_OFF,
    VPP_HQV_FRC_MODE_LOW,
@@ -1815,8 +1824,6 @@ typedef enum QOMX_VPP_HQV_FRC_MODE {
 
 
 typedef struct QOMX_VPP_HQVCTRL_CADE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     QOMX_VPP_HQV_MODE mode;
     OMX_U32 level;
     OMX_S32 contrast;
@@ -1824,15 +1831,11 @@ typedef struct QOMX_VPP_HQVCTRL_CADE {
 } QOMX_VPP_HQVCTRL_CADE;
 
 typedef struct QOMX_VPP_HQVCTRL_CNR {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     QOMX_VPP_HQV_MODE mode;
     OMX_U32 level;
 } QOMX_VPP_HQVCTRL_CNR;
 
 typedef struct QOMX_VPP_HQVCTRL_AIE {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     QOMX_VPP_HQV_MODE mode;
     QOMX_VPP_HQV_HUE_MODE hue_mode;
     OMX_U32 cade_level;
@@ -1840,25 +1843,21 @@ typedef struct QOMX_VPP_HQVCTRL_AIE {
 } QOMX_VPP_HQVCTRL_AIE;
 
 typedef struct QOMX_VPP_HQVCTRL_CUSTOM {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     OMX_U32 id;
     OMX_U32 len;
     OMX_U8 data[QOMX_VPP_HQV_CUSTOMPAYLOAD_SZ];
 } QOMX_VPP_HQVCTRL_CUSTOM;
 
 typedef struct QOMX_VPP_HQVCTRL_GLOBAL_DEMO {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     OMX_U32 process_percent;
+    QOMX_VPP_SPLIT_DIRECTION process_direction;
 } QOMX_VPP_HQVCTRL_GLOBAL_DEMO;
 
 typedef struct QOMX_VPP_HQVCTRL_FRC {
-    OMX_U32 nSize;
-    OMX_VERSIONTYPE nVersion;
     QOMX_VPP_HQV_FRC_MODE mode;
 } QOMX_VPP_HQVCTRL_FRC;
 
+/* VIDEO POSTPROCESSING OMX CTRLS */
 typedef struct QOMX_VPP_HQVCONTROL {
     OMX_U32 nSize;
     OMX_VERSIONTYPE nVersion;