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

Commit 643319f6 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

stagefright: add graceful handling when setting port definition 

- don't crash when count of buffers is incorrect, or when the buffer
  size decreases.

This allows configuring SW video encoders for smaller than QCIF size.

Bug: 18513091
Change-Id: Ibfcd6b883a892156e408e94fbc329103b9ac09ac
parent bc0f452b

media/libstagefright/omx/SimpleSoftOMXComponent.cpp

+12 −12
Original line number Diff line number Diff line
@@ -152,28 +152,28 @@ OMX_ERRORTYPE SimpleSoftOMXComponent::internalSetParameter( 
            OMX_PARAM_PORTDEFINITIONTYPE *defParams =

                (OMX_PARAM_PORTDEFINITIONTYPE *)params;



            if (defParams->nPortIndex >= mPorts.size()

                    || defParams->nSize

                            != sizeof(OMX_PARAM_PORTDEFINITIONTYPE)) {

                return OMX_ErrorUndefined;

            if (defParams->nPortIndex >= mPorts.size()) {

                return OMX_ErrorBadPortIndex;

            }

            if (defParams->nSize != sizeof(OMX_PARAM_PORTDEFINITIONTYPE)) {

                return OMX_ErrorUnsupportedSetting;

            }



            PortInfo *port =

                &mPorts.editItemAt(defParams->nPortIndex);



            if (defParams->nBufferSize != port->mDef.nBufferSize) {

                CHECK_GE(defParams->nBufferSize, port->mDef.nBufferSize);

            // default behavior is that we only allow buffer size to increase

            if (defParams->nBufferSize > port->mDef.nBufferSize) {

                port->mDef.nBufferSize = defParams->nBufferSize;

            }



            if (defParams->nBufferCountActual

                    != port->mDef.nBufferCountActual) {

                CHECK_GE(defParams->nBufferCountActual,

                         port->mDef.nBufferCountMin);



                port->mDef.nBufferCountActual = defParams->nBufferCountActual;

            if (defParams->nBufferCountActual < port->mDef.nBufferCountMin) {

                ALOGW("component requires at least %u buffers (%u requested)",

                        port->mDef.nBufferCountMin, defParams->nBufferCountActual);

                return OMX_ErrorUnsupportedSetting;

            }



            port->mDef.nBufferCountActual = defParams->nBufferCountActual;

            return OMX_ErrorNone;

        }