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

Commit 701b9647 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "libstagefright: set actual stride info for SW encoder input port" into lmp-mr1-dev

parents df2592be a32d5435

media/libstagefright/ACodec.cpp

+5 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,11 @@ status_t ACodec::setupVideoEncoder(const char *mime, const sp<AMessage> &msg) { 


    video_def->xFramerate = (OMX_U32)(frameRate * 65536.0f);

    video_def->eCompressionFormat = OMX_VIDEO_CodingUnused;

    // this is redundant as it was already set up in setVideoPortFormatType

    // FIXME for now skip this only for flexible YUV formats

    if (colorFormat != OMX_COLOR_FormatYUV420Flexible) {

        video_def->eColorFormat = colorFormat;

    }



    err = mOMX->setParameter(

            mNode, OMX_IndexParamPortDefinition, &def, sizeof(def));

media/libstagefright/codecs/avc/enc/SoftAVCEncoder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -575,9 +575,13 @@ OMX_ERRORTYPE SoftAVCEncoder::internalSetParameter( 
                    &editPortInfo(0)->mDef;

                portDef->format.video.nFrameWidth = mVideoWidth;

                portDef->format.video.nFrameHeight = mVideoHeight;

                portDef->format.video.nStride = portDef->format.video.nFrameWidth;

                portDef->format.video.nSliceHeight = portDef->format.video.nFrameHeight;

                portDef->format.video.xFramerate = def->format.video.xFramerate;

                portDef->format.video.eColorFormat =

                    (OMX_COLOR_FORMATTYPE) mVideoColorFormat;

                portDef->nBufferSize =

                    (portDef->format.video.nStride * portDef->format.video.nSliceHeight * 3) / 2;

                portDef = &editPortInfo(1)->mDef;

                portDef->format.video.nFrameWidth = mVideoWidth;

                portDef->format.video.nFrameHeight = mVideoHeight;

media/libstagefright/codecs/m4v_h263/enc/SoftMPEG4Encoder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -462,9 +462,13 @@ OMX_ERRORTYPE SoftMPEG4Encoder::internalSetParameter( 
                    &editPortInfo(0)->mDef;

                portDef->format.video.nFrameWidth = mVideoWidth;

                portDef->format.video.nFrameHeight = mVideoHeight;

                portDef->format.video.nStride = portDef->format.video.nFrameWidth;

                portDef->format.video.nSliceHeight = portDef->format.video.nFrameHeight;

                portDef->format.video.xFramerate = def->format.video.xFramerate;

                portDef->format.video.eColorFormat =

                    (OMX_COLOR_FORMATTYPE) mVideoColorFormat;

                portDef->nBufferSize =

                    (portDef->format.video.nStride * portDef->format.video.nSliceHeight * 3) / 2;

                portDef = &editPortInfo(1)->mDef;

                portDef->format.video.nFrameWidth = mVideoWidth;

                portDef->format.video.nFrameHeight = mVideoHeight;

media/libstagefright/codecs/on2/enc/SoftVPXEncoder.cpp

+4 −0
Original line number Diff line number Diff line
@@ -805,8 +805,12 @@ OMX_ERRORTYPE SoftVPXEncoder::internalSetPortParams( 
        OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kInputPortIndex)->mDef;

        def->format.video.nFrameWidth = mWidth;

        def->format.video.nFrameHeight = mHeight;

        def->format.video.nStride = def->format.video.nFrameWidth;

        def->format.video.nSliceHeight = def->format.video.nFrameHeight;

        def->format.video.xFramerate = mFramerate;

        def->format.video.eColorFormat = mColorFormat;

        def->nBufferSize =

            (def->format.video.nStride * def->format.video.nSliceHeight * 3) / 2;

        def = &editPortInfo(kOutputPortIndex)->mDef;

        def->format.video.nFrameWidth = mWidth;

        def->format.video.nFrameHeight = mHeight;