diff options
| author | James Dong <jdong@google.com> | 2011-06-03 12:43:48 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-06-03 12:44:48 -0700 |
| commit | 38c07129c42222a764d784327d0a63f4cfc1331b (patch) | |
| tree | 88d63c9b0c1e8747cfee86ac1d639b546cc85620 /media/libstagefright | |
| parent | 5f8d23e7f2d74be34080f091e92437f5722c749f (diff) | |
| download | frameworks_base-38c07129c42222a764d784327d0a63f4cfc1331b.zip frameworks_base-38c07129c42222a764d784327d0a63f4cfc1331b.tar.gz frameworks_base-38c07129c42222a764d784327d0a63f4cfc1331b.tar.bz2 | |
Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h
Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
Diffstat (limited to 'media/libstagefright')
| -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 |
3 files changed, 0 insertions, 8 deletions
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 6339710..42eab4d 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; @@ -1388,8 +1386,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), |