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

Commit d702ba16 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 519f7624: Merge "Don\'t render buffers that have size 0" into jb-mr2-dev 

* commit '519f7624':
  Don't render buffers that have size 0
parents 72f57bc4 033988dc

media/libstagefright/ACodec.cpp

+2 −1
Original line number Diff line number Diff line
@@ -3131,7 +3131,8 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) { 


    int32_t render;

    if (mCodec->mNativeWindow != NULL

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

            && msg->findInt32("render", &render) && render != 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
@@ -1656,7 +1656,7 @@ status_t MediaCodec::onReleaseOutputBuffer(const sp<AMessage> &msg) { 
        return -EACCES;

    }



    if (render) {

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

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



        if (mSoftRenderer != NULL) {