diff options
| author | James Dong <jdong@google.com> | 2011-06-03 17:43:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-03 17:43:20 -0700 |
| commit | d5623ca906f64cc257cd695abd2a6b52b085f65f (patch) | |
| tree | 120c2fa56fc8778e4a282f1cebb17643b81abaee | |
| parent | 20214f3908a6f085ea531c65496347953e2d25b6 (diff) | |
| parent | 57ca262f8d1c0aabeea294ddb53e4db172fc6bec (diff) | |
| download | frameworks_av-d5623ca906f64cc257cd695abd2a6b52b085f65f.zip frameworks_av-d5623ca906f64cc257cd695abd2a6b52b085f65f.tar.gz frameworks_av-d5623ca906f64cc257cd695abd2a6b52b085f65f.tar.bz2 | |
Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"
| -rw-r--r-- | include/media/stagefright/openmax/OMX_IVCommon.h | 1 | ||||
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/colorconversion/ColorConverter.cpp | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/include/media/stagefright/openmax/OMX_IVCommon.h b/include/media/stagefright/openmax/OMX_IVCommon.h index 4a8be7b..12b4f93 100644 --- a/include/media/stagefright/openmax/OMX_IVCommon.h +++ b/include/media/stagefright/openmax/OMX_IVCommon.h @@ -149,6 +149,7 @@ 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 */ + OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, OMX_COLOR_FormatMax = 0x7FFFFFFF } OMX_COLOR_FORMATTYPE; diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 642b3a3..d628301 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -888,8 +888,6 @@ status_t ACodec::setSupportedOutputFormat() { CHECK_EQ(err, (status_t)OK); CHECK_EQ((int)format.eCompressionFormat, (int)OMX_VIDEO_CodingUnused); - static const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00; - CHECK(format.eColorFormat == OMX_COLOR_FormatYUV420Planar || format.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar || format.eColorFormat == OMX_COLOR_FormatCbYCrY diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 79e767b..9c69a6f 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -61,8 +61,6 @@ namespace android { -static const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00; - struct CodecInfo { const char *mime; const char *codec; @@ -1389,8 +1387,6 @@ status_t OMXCodec::setVideoOutputFormat( CHECK_EQ(err, (status_t)OK); CHECK_EQ((int)format.eCompressionFormat, (int)OMX_VIDEO_CodingUnused); - static const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00; - CHECK(format.eColorFormat == OMX_COLOR_FormatYUV420Planar || format.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar || format.eColorFormat == OMX_COLOR_FormatCbYCrY diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp index 4b72a53..b28d947 100644 --- a/media/libstagefright/colorconversion/ColorConverter.cpp +++ b/media/libstagefright/colorconversion/ColorConverter.cpp @@ -20,8 +20,6 @@ namespace android { -static const int OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00; - ColorConverter::ColorConverter( OMX_COLOR_FORMATTYPE from, OMX_COLOR_FORMATTYPE to) : mSrcFormat(from), |