diff options
author | Diogo Ferreira <diogo@underdev.org> | 2014-09-16 15:16:55 +0100 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2014-11-19 18:59:21 +0000 |
commit | 40983086ba6232bef461486450d1215c210e4d97 (patch) | |
tree | e4505ff8385f85762ae7f24fb023470f36666e62 | |
parent | 98fa6f1152da759ef3eaf36cb16e0aaf2013376a (diff) | |
download | android_frameworks_native-40983086ba6232bef461486450d1215c210e4d97.tar.gz android_frameworks_native-40983086ba6232bef461486450d1215c210e4d97.tar.bz2 android_frameworks_native-40983086ba6232bef461486450d1215c210e4d97.zip |
mediatek: Add vendor-specific indexes
Add vendor-specific extensions.
Change-Id: I989810d33399b080c5971e5db3988bb4a7eeb464
-rw-r--r-- | include/media/openmax/OMX_Core.h | 14 | ||||
-rw-r--r-- | include/media/openmax/OMX_IVCommon.h | 9 | ||||
-rw-r--r-- | include/media/openmax/OMX_Index.h | 24 | ||||
-rw-r--r-- | include/media/openmax/OMX_IndexExt.h | 2 |
4 files changed, 48 insertions, 1 deletions
diff --git a/include/media/openmax/OMX_Core.h b/include/media/openmax/OMX_Core.h index 9fb0f6fdb..45978aa5e 100644 --- a/include/media/openmax/OMX_Core.h +++ b/include/media/openmax/OMX_Core.h @@ -457,6 +457,12 @@ typedef struct OMX_BUFFERHEADERTYPE this buffer */ OMX_U32 nInputPortIndex; /**< The index of the input port (if any) using this buffer */ +#ifdef MTK_HARDWARE + OMX_U32 nWidth; + OMX_U32 nHeight; + OMX_U32 nStride; + OMX_U32 nSliceHeight; +#endif } OMX_BUFFERHEADERTYPE; /** The OMX_EXTRADATATYPE enumeration is used to define the @@ -492,6 +498,14 @@ typedef struct OMX_PORT_PARAM_TYPE { OMX_U32 nStartPortNumber; /** first port number for this type of port */ } OMX_PORT_PARAM_TYPE; +#ifdef MTK_HARDWARE +typedef struct OMX_MTK_PLATFORM_PRIVATE { + OMX_U32 mM4UMVABufferPa; + OMX_U32 mM4UVABufferVa; + //add next private members +} OMX_MTK_PLATFORM_PRIVATE; +#endif + /** @ingroup comp */ typedef enum OMX_EVENTTYPE { diff --git a/include/media/openmax/OMX_IVCommon.h b/include/media/openmax/OMX_IVCommon.h index 96a4396e2..940911e95 100644 --- a/include/media/openmax/OMX_IVCommon.h +++ b/include/media/openmax/OMX_IVCommon.h @@ -156,13 +156,20 @@ typedef enum OMX_COLOR_FORMATTYPE { * Android-specific OMX IL colorformats. Change this enum to * an acceptable range once that is done. * */ + +#ifdef MTK_HARDWARE + OMX_COLOR_FormatVendorMTKYUV = 0x7F000001, + OMX_COLOR_FormatVendorMTKYUV_FCM = 0x7F000002, + OMX_MTK_COLOR_FormatYV12 = 0x7F000200, +#endif + OMX_COLOR_FormatAndroidOpaque = 0x7F000789, OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = 0x7F000100, OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka = 0x7FA30C03, OMX_SEC_COLOR_FormatNV12Tiled = 0x7FC00002, OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m = 0x7FA30C04, - OMX_COLOR_FormatMax = 0x7FFFFFFF + OMX_COLOR_FormatMax = 0x7FFFFFFF, } OMX_COLOR_FORMATTYPE; diff --git a/include/media/openmax/OMX_Index.h b/include/media/openmax/OMX_Index.h index d40f24f99..ab3f55e50 100644 --- a/include/media/openmax/OMX_Index.h +++ b/include/media/openmax/OMX_Index.h @@ -135,7 +135,14 @@ typedef enum OMX_INDEXTYPE { OMX_IndexParamAudioEvrc, /**< reference: OMX_AUDIO_PARAM_EVRCTYPE */ OMX_IndexParamAudioSmv, /**< reference: OMX_AUDIO_PARAM_SMVTYPE */ OMX_IndexParamAudioVorbis, /**< reference: OMX_AUDIO_PARAM_VORBISTYPE */ +#ifdef MTK_HARDWARE + OMX_IndexParamAudioApe, /**< reference: OMX_AUDIO_PARAM_APEPROFILETYPE */ +#endif OMX_IndexParamAudioFlac, /**< reference: OMX_AUDIO_PARAM_FLACTYPE */ +#ifdef MTK_HARDWARE + OMX_IndexParamAudioRaw, + OMX_IndexParamAudioWmaProfile, +#endif OMX_IndexConfigAudioMidiImmediateEvent, /**< reference: OMX_AUDIO_CONFIG_MIDIIMMEDIATEEVENTTYPE */ OMX_IndexConfigAudioMidiControl, /**< reference: OMX_AUDIO_CONFIG_MIDICONTROLTYPE */ @@ -183,7 +190,13 @@ typedef enum OMX_INDEXTYPE { OMX_IndexParamVideoWmv, /**< reference: OMX_VIDEO_PARAM_WMVTYPE */ OMX_IndexParamVideoRv, /**< reference: OMX_VIDEO_PARAM_RVTYPE */ OMX_IndexParamVideoAvc, /**< reference: OMX_VIDEO_PARAM_AVCTYPE */ +#ifdef MTK_HARDWARE + OMX_IndexParamVideoHevc, /**< reference: OMX_VIDEO_PARAM_HEVCTYPE */ +#endif OMX_IndexParamVideoH263, /**< reference: OMX_VIDEO_PARAM_H263TYPE */ +#ifdef MTK_HARDWARE + OMX_IndexParamVideoVp8, /**< reference: OMX_VIDEO_PARAM_VP8TYPE */ +#endif OMX_IndexParamVideoProfileLevelQuerySupported, /**< reference: OMX_VIDEO_PARAM_PROFILELEVELTYPE */ OMX_IndexParamVideoProfileLevelCurrent, /**< reference: OMX_VIDEO_PARAM_PROFILELEVELTYPE */ OMX_IndexConfigVideoBitrate, /**< reference: OMX_VIDEO_CONFIG_BITRATETYPE */ @@ -263,9 +276,20 @@ typedef enum OMX_INDEXTYPE { to 0x7FFFFFFE. This range is not broken out by vendor, so private indexes are not guaranteed unique and therefore should only be sent to the appropriate component. */ + +#ifdef MTK_HARDWARE + OMX_IndexVendorMtkOmxVdecTimeSource = 0x7F000001, + OMX_IndexVendorMtkOmxVdecThumbnailMode = 0x7F00000A, + OMX_IndexVendorMtkOmxVdecGetAspectRatio = 0x7F000018, + OMX_IndexVendorMtkOmxVdecGetCropInfo = 0x7F000019, + OMX_IndexVendorMtkOmxVideoSetClientLocally = 0x7f000020, +#endif + OMX_IndexParamAudioMp2, /**< reference: OMX_AUDIO_PARAM_MP2TYPE */ OMX_IndexParamAudioAc3, /**< reference: OMX_AUDIO_PARAM_AC3TYPE */ +#ifndef MTK_HARDWARE OMX_IndexParamAudioApe, /**< reference: OMX_AUDIO_PARAM_APETYPE */ +#endif OMX_IndexParamAudioDts, /**< reference: OMX_AUDIO_PARAM_DTSTYPE */ OMX_IndexParamVideoFFmpeg, /**< reference: OMX_VIDEO_PARAM_FFMPEGTYPE */ OMX_IndexParamAudioFFmpeg, /**< reference: OMX_AUDIO_PARAM_FFMPEGTYPE */ diff --git a/include/media/openmax/OMX_IndexExt.h b/include/media/openmax/OMX_IndexExt.h index d22df56bd..1f5aab0b8 100644 --- a/include/media/openmax/OMX_IndexExt.h +++ b/include/media/openmax/OMX_IndexExt.h @@ -66,7 +66,9 @@ typedef enum OMX_INDEXEXTTYPE { OMX_IndexParamNalStreamFormatSupported, /**< reference: OMX_NALSTREAMFORMATTYPE */ OMX_IndexParamNalStreamFormat, /**< reference: OMX_NALSTREAMFORMATTYPE */ OMX_IndexParamNalStreamFormatSelect, /**< reference: OMX_NALSTREAMFORMATTYPE */ +#ifndef MTK_HARDWARE OMX_IndexParamVideoVp8, /**< reference: OMX_VIDEO_PARAM_VP8TYPE */ +#endif OMX_IndexConfigVideoVp8ReferenceFrame, /**< reference: OMX_VIDEO_VP8REFERENCEFRAMETYPE */ OMX_IndexConfigVideoVp8ReferenceFrameType, /**< reference: OMX_VIDEO_VP8REFERENCEFRAMEINFOTYPE */ |