diff options
| author | xiao <fengx.xiao@intel.com> | 2011-12-19 11:35:08 +0800 |
|---|---|---|
| committer | Patrick Tjin <pattjin@google.com> | 2014-07-21 22:03:38 -0700 |
| commit | 34277d8b1ca48a932e7b17ba331c29f040ba0838 (patch) | |
| tree | 040f7ce84dcee2bfc3754730ee412d1fed3be4e5 /core | |
| parent | 92528264a273da7a58fefc7b77b0437bbcc6c330 (diff) | |
| download | wrs_omxil_core-34277d8b1ca48a932e7b17ba331c29f040ba0838.tar.gz | |
Enable native buffer mode for ICS in wrs core
,clean buffer id mode related code
BZ: 18370
Signed-off-by: xiao <fengx.xiao@intel.com>
Change-Id: I657ac61aeaaaffdbacde3afd9743a9ddeed29588
Reviewed-on: http://android.intel.com:8080/27892
Reviewed-by: Ding, Haitao <haitao.ding@intel.com>
Tested-by: Ding, Haitao <haitao.ding@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/inc/khronos/openmax/include/OMX_IndexExt.h | 20 | ||||
| -rw-r--r-- | core/inc/khronos/openmax/include/OMX_VideoExt.h | 8 |
2 files changed, 12 insertions, 16 deletions
diff --git a/core/inc/khronos/openmax/include/OMX_IndexExt.h b/core/inc/khronos/openmax/include/OMX_IndexExt.h index 7f2383e..ffbfa95 100644 --- a/core/inc/khronos/openmax/include/OMX_IndexExt.h +++ b/core/inc/khronos/openmax/include/OMX_IndexExt.h @@ -73,21 +73,25 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexConfigIntelSliceNumbers, /**< reference: OMX_VIDEO_CONFIG_INTEL_SLICE_NUMBERS */
OMX_IndexConfigIntelAIR, /**< reference: OMX_VIDEO_CONFIG_INTEL_AIR */
OMX_IndexParamIntelAVCVUI, /**< reference: OMX_VIDEO_PARAM_INTEL_AVCVUI */
- OMX_IndexParamIntelAdaptiveSliceControl, /**< reference: OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL */
- OMX_IndexBufferIDMode, /**< reference: boolean value to specify buffer id mode is in effect*/ + OMX_IndexParamIntelAdaptiveSliceControl, /**< reference: OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL */ OMX_IndexStoreMetaDataInBuffers, /**< reference: StoreMetaDataInBuffersParams*/ /* Image & Video common configurations */
- OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000,
+ OMX_IndexExtCommonStartUnused = OMX_IndexKhronosExtensions + 0x00700000, /* Other configurations */
- OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000,
+ OMX_IndexExtOtherStartUnused = OMX_IndexKhronosExtensions + 0x00800000, /* Time configurations */
- OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000,
-
- OMX_IndexExtMax = 0x7FFFFFFF
-} OMX_INDEXEXTTYPE;
+ OMX_IndexExtTimeStartUnused = OMX_IndexKhronosExtensions + 0x00900000, + + /* NativeWindow configurations */ + OMX_IndexForNativeWindow = OMX_IndexKhronosExtensions + 0x00a00000, + OMX_IndexExtEnableNativeBuffer, /**<reference: EnableNativeBuffer */ + OMX_IndexExtGetNativeBufferUsage, /**<reference: GetNativeBufferUsage */ + OMX_IndexExtUseNativeBuffer, /**<reference: UseNativeBuffer */ + OMX_IndexExtMax = 0x7FFFFFFF +} OMX_INDEXEXTTYPE; #ifdef __cplusplus
}
diff --git a/core/inc/khronos/openmax/include/OMX_VideoExt.h b/core/inc/khronos/openmax/include/OMX_VideoExt.h index 7a4a9c0..4e5d6a7 100644 --- a/core/inc/khronos/openmax/include/OMX_VideoExt.h +++ b/core/inc/khronos/openmax/include/OMX_VideoExt.h @@ -145,14 +145,6 @@ typedef struct OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL { OMX_U32 nSliceSizeSkipThreshold; // Slice size skip threshold for adaptive slice control to start a new slice } OMX_VIDEO_PARAM_INTEL_ADAPTIVE_SLICE_CONTROL; -//align with <media/stagefright/HardwareAPI.h> -typedef struct StoreMetaDataInBuffersParams { - OMX_U32 nSize; // Size of the structure - OMX_VERSIONTYPE nVersion; // OMX specification version - OMX_U32 nPortIndex; // Port that this struct applies to - OMX_BOOL bStoreMetaData; // Enable/disable meta data input -} StoreMetaDataInBuffersParams; - #ifdef __cplusplus } #endif /* __cplusplus */ |