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

Commit 4713d3dc authored by Andreas Huber's avatar Andreas Huber
Browse files

resolved conflicts for merge of 1e04c248 to master 

Change-Id: I9a1292eaec2f12cb7636c27a53068672694c2236
parents 2e05ce2f 1e04c248

media/libstagefright/ACodec.cpp

+0 −9
Original line number Diff line number Diff line
@@ -1432,15 +1432,6 @@ status_t ACodec::setSupportedOutputFormat() { 
    CHECK_EQ(err, (status_t)OK);

    CHECK_EQ((int)format.eCompressionFormat, (int)OMX_VIDEO_CodingUnused);



    CHECK(format.eColorFormat == OMX_COLOR_FormatYUV420Planar

           || format.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar

           || format.eColorFormat == OMX_COLOR_FormatCbYCrY

           || format.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar

           || format.eColorFormat == OMX_QCOM_COLOR_FormatYVU420SemiPlanar

           || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka

           || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m

           || format.eColorFormat == OMX_SEC_COLOR_FormatNV12Tiled);



    return mOMX->setParameter(

            mNode, OMX_IndexParamVideoPortFormat,

            &format, sizeof(format));

media/libstagefright/OMXCodec.cpp

+0 −8
Original line number Diff line number Diff line
@@ -1213,14 +1213,6 @@ status_t OMXCodec::setVideoOutputFormat( 
        CHECK_EQ(err, (status_t)OK);

        CHECK_EQ((int)format.eCompressionFormat, (int)OMX_VIDEO_CodingUnused);



        CHECK(format.eColorFormat == OMX_COLOR_FormatYUV420Planar

               || format.eColorFormat == OMX_COLOR_FormatYUV420SemiPlanar

               || format.eColorFormat == OMX_COLOR_FormatCbYCrY

               || format.eColorFormat == OMX_TI_COLOR_FormatYUV420PackedSemiPlanar

               || format.eColorFormat == OMX_QCOM_COLOR_FormatYVU420SemiPlanar

               || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka

               || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar32m);



        int32_t colorFormat;

        if (meta->findInt32(kKeyColorFormat, &colorFormat)

                && colorFormat != OMX_COLOR_FormatUnused