Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5623ca9 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"

parents 20214f39 57ca262f

include/media/stagefright/openmax/OMX_IVCommon.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

media/libstagefright/ACodec.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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

media/libstagefright/OMXCodec.cpp

+0 −4
Original line number Diff line number Diff line
@@ -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

media/libstagefright/colorconversion/ColorConverter.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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),