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

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

am e0f64aae: Merge change 24178 into eclair 

Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp

* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
parents 1931f308 8723e5ab

media/libstagefright/OMXCodec.cpp

+5 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ sp<OMXCodec> OMXCodec::Create( 


        status_t err = omx->allocate_node(componentName, &node);

        if (err == OK) {

            LOGV("Successfully allocated OMX node '%s'", componentName);

            LOGI("Successfully allocated OMX node '%s'", componentName);

            break;

        }

    }
@@ -216,6 +216,10 @@ sp<OMXCodec> OMXCodec::Create( 
        quirks |= kRequiresLoadedToIdleAfterAllocation;

        quirks |= kRequiresAllocateBufferOnInputPorts;

    }

    if (!strncmp(componentName, "OMX.qcom.video.decoder.", 23)) {

        // XXX Required on P....on only.

        quirks |= kRequiresAllocateBufferOnOutputPorts;

    }



    sp<OMXCodec> codec = new OMXCodec(

            omx, node, quirks, createEncoder, mime, componentName,