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

Commit 1e04c248 authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am c120d033: Merge "The framework really doesn\'t need to know the specifics... 

am c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev

* commit 'c120d033':
  The framework really doesn't need to know the specifics of the codec
parents 3958caaf c120d033

media/libstagefright/ACodec.cpp

+0 −8
Original line number Diff line number Diff line
@@ -1432,14 +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_SEC_COLOR_FormatNV12Tiled);



    return mOMX->setParameter(

            mNode, OMX_IndexParamVideoPortFormat,

            &format, sizeof(format));

media/libstagefright/OMXCodec.cpp

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



        int32_t colorFormat;

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

                && colorFormat != OMX_COLOR_FormatUnused