diff options
| author | Gabriel M. Beddingfield <gabrbedd@ti.com> | 2012-07-27 15:44:38 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-07-27 18:13:06 -0500 |
| commit | d4b29254e641b9cb7532122d251bfec374e51b53 (patch) | |
| tree | 88f7b1220e2a775181bf013266343755dc383cbc | |
| parent | 36f7931bee6748d11ca9de7478ac2c1ecc6a6ff1 (diff) | |
| download | domx-omapzoom-d4b29254e641b9cb7532122d251bfec374e51b53.tar.gz | |
WA: Added Android OMX color format tokensjb-released-jb-release
The OMX_QCOM_COLOR_FormatYVU420SemiPlanar and
OMX_COLOR_FormatAndroidOpaque tokens are part of
JB StageFright, but native Google code does not define
separate header for it. Instead tokens are written
directly into Google's OMX_IVCommon_h.
Since TI DOMX headers effectively replace Google OMX
headers, these token copied into DOMX OMX_IVCommon_h
as well.
Change-Id: I5b52557bf055f8d483170519a5525ddf25a1eeda
Signed-off-by: Gabriel M. Beddingfield <gabrbedd@ti.com>
Signed-off-by: Daniel Levin <dendy@ti.com>
| -rw-r--r-- | omx_core/inc/OMX_IVCommon.h | 9 | ||||
| -rwxr-xr-x | omx_core/inc/OMX_TI_IVCommon.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/omx_core/inc/OMX_IVCommon.h b/omx_core/inc/OMX_IVCommon.h index 2149c7c..ca21e87 100644 --- a/omx_core/inc/OMX_IVCommon.h +++ b/omx_core/inc/OMX_IVCommon.h @@ -149,6 +149,15 @@ typedef enum OMX_COLOR_FORMATTYPE { OMX_COLOR_Format24BitABGR6666, OMX_COLOR_FormatKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ OMX_COLOR_FormatVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ + /**<Reserved android opaque colorformat. Tells the encoder that + * the actual colorformat will be relayed by the + * Gralloc Buffers. + * FIXME: In the process of reserving some enum values for + * Android-specific OMX IL colorformats. Change this enum to + * an acceptable range once that is done. + * */ + OMX_COLOR_FormatAndroidOpaque = 0x7F000789, + OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, OMX_COLOR_FormatMax = 0x7FFFFFFF } OMX_COLOR_FORMATTYPE; diff --git a/omx_core/inc/OMX_TI_IVCommon.h b/omx_core/inc/OMX_TI_IVCommon.h index f26bd1e..c2b5bb8 100755 --- a/omx_core/inc/OMX_TI_IVCommon.h +++ b/omx_core/inc/OMX_TI_IVCommon.h @@ -2142,8 +2142,6 @@ typedef enum OMX_TI_COLOR_FORMATTYPE { OMX_COLOR_FormatVendorStartUnused + 2, /**< 10 bit raw for stereo */ OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x100, /* 0x100 is used since it is the corresponding HAL pixel fromat */ - OMX_COLOR_FormatAndroidOpaque = - (OMX_COLOR_FORMATTYPE) OMX_COLOR_FormatVendorStartUnused + 0x789, /**< Platform specified opaque format set to unique value 0x789*/ OMX_TI_ColorFormatTypeMax = 0x7fffffff } OMX_TI_COLOR_FORMATTYPE; |