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

Commit 3e8b89bd authored by Andreas Huber's avatar Andreas Huber Committed by Android Git Automerger
Browse files

am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC... 

am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo

Merge commit '2be77a22' into froyo-plus-aosp

* commit '2be77a22':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
parents 266bb3c5 2be77a22

media/libstagefright/OMXCodec.cpp

+0 −20
Original line number Diff line number Diff line
@@ -535,26 +535,6 @@ status_t OMXCodec::configureCodec(const sp<MetaData> &meta) { 
                return err;

            }

        }

    } else if (!strncasecmp(mMIME, "audio/", 6)) {

        if ((mQuirks & kSupportsMultipleFramesPerInputBuffer)

            && !strcmp(mComponentName, "OMX.TI.AAC.decode")) {

            OMX_PARAM_PORTDEFINITIONTYPE def;

            InitOMXParams(&def);

            def.nPortIndex = kPortIndexInput;



            status_t err = mOMX->getParameter(

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

            CHECK_EQ(err, OK);



            const size_t kMinBufferSize = 100 * 1024;

            if (def.nBufferSize < kMinBufferSize) {

                def.nBufferSize = kMinBufferSize;

            }



            err = mOMX->setParameter(

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

            CHECK_EQ(err, OK);

        }

    }



    if (!strcasecmp(mMIME, MEDIA_MIMETYPE_IMAGE_JPEG)