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

Commit 05a4b64e authored by Lajos Molnar's avatar Lajos Molnar Committed by Android Git Automerger
Browse files

am 5db1e3a6: Merge "correct one logic error in decide whether should render or not" 

* commit '5db1e3a6':
  correct one logic error in decide whether should render or not
parents 2db7eac5 5db1e3a6

media/libstagefright/ACodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3427,7 +3427,7 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) { 
    int32_t render;

    if (mCodec->mNativeWindow != NULL

            && msg->findInt32("render", &render) && render != 0

            && (info->mData == NULL || info->mData->size() != 0)) {

            && info->mData != NULL && info->mData->size() != 0) {

        // The client wants this buffer to be rendered.



        status_t err;

media/libstagefright/MediaCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1680,7 +1680,7 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) { 
        return -EACCES;

    }



    if (render && (info->mData == NULL || info->mData->size() != 0)) {

    if (render && info->mData != NULL && info->mData->size() != 0) {

        info->mNotify->setInt32("render", true);



        if (mSoftRenderer != NULL) {