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

Commit 9fbe9429 authored by Ed Heyl's avatar Ed Heyl
Browse files

Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev 

Conflicts:
	services/audioflinger/AudioFlinger.cpp

Change-Id: If27e4ff35de1e182394cc149e1557a49f0f7c95b
parents 3beb3ff4 5d246efa

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+5 −2
Original line number Diff line number Diff line
@@ -258,7 +258,9 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
            ALOGV("scanning sources haveAudio=%d, haveVideo=%d",

                 mAudioDecoder != NULL, mVideoDecoder != NULL);



            if (mNativeWindow != NULL) {

                instantiateDecoder(false, &mVideoDecoder);

            }



            if (mAudioSink != NULL) {

                instantiateDecoder(true, &mAudioDecoder);
@@ -279,7 +281,8 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                break;

            }



            if (mAudioDecoder == NULL || mVideoDecoder == NULL) {

            if (mAudioDecoder == NULL && mAudioSink != NULL ||

                mVideoDecoder == NULL && mNativeWindow != NULL) {

                msg->post(100000ll);

                mScanSourcesPending = true;

            }

media/libstagefright/ACodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1358,7 +1358,8 @@ status_t ACodec::setSupportedOutputFormat() { 
           || 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_FormatYVU420SemiPlanar

           || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka);



    return mOMX->setParameter(

            mNode, OMX_IndexParamVideoPortFormat,

media/libstagefright/OMXCodec.cpp

+10 −3
Original line number Diff line number Diff line
@@ -1217,7 +1217,8 @@ status_t OMXCodec::setVideoOutputFormat( 
               || 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_FormatYVU420SemiPlanar

               || format.eColorFormat == OMX_QCOM_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka);



        err = mOMX->setParameter(

                mNode, OMX_IndexParamVideoPortFormat,
@@ -2047,9 +2048,15 @@ int64_t OMXCodec::getDecodingTimeUs() { 


void OMXCodec::on_message(const omx_message &msg) {

    if (mState == ERROR) {

        ALOGW("Dropping OMX message - we're in ERROR state.");

        /*

         * only drop EVENT messages, EBD and FBD are still

         * processed for bookkeeping purposes

         */

        if (msg.type == omx_message::EVENT) {

            ALOGW("Dropping OMX EVENT message - we're in ERROR state.");

            return;

        }

    }



    switch (msg.type) {

        case omx_message::EVENT:

media/libstagefright/omx/OMX.cpp

+10 −7
Original line number Diff line number Diff line
@@ -252,6 +252,8 @@ status_t OMX::allocateNode( 
status_t OMX::freeNode(node_id node) {

    OMXNodeInstance *instance = findInstance(node);



    {

        Mutex::Autolock autoLock(mLock);

        ssize_t index = mLiveNodes.indexOfKey(instance->observer()->asBinder());

        if (index < 0) {

            // This could conceivably happen if the observer dies at roughly the
@@ -259,6 +261,7 @@ status_t OMX::freeNode(node_id node) { 
            return OK;

        }

        mLiveNodes.removeItemsAt(index);

    }



    instance->observer()->asBinder()->unlinkToDeath(this);
@@ -266,7 +269,7 @@ status_t OMX::freeNode(node_id node) { 


    {

        Mutex::Autolock autoLock(mLock);

        index = mDispatchers.indexOfKey(node);

        ssize_t index = mDispatchers.indexOfKey(node);

        CHECK(index >= 0);

        mDispatchers.removeItemsAt(index);

    }