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

Commit 255adceb authored by Dave Burke's avatar Dave Burke Committed by Android Git Automerger
Browse files

am 0cc1e42d: am ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1 

* commit '0cc1e42d74e09c259a6da0abc9009d1abf7537b1':
  SurfaceMediaSource: use the HW_TEXTURE usage bit
parents 079123ee 7e2f9956

media/libstagefright/SurfaceMediaSource.cpp

+3 −1
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h, 
        (uint32_t(buffer->height) != h) ||

        (uint32_t(buffer->format) != format) ||

        ((uint32_t(buffer->usage) & usage) != usage)) {

            usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER;

            // XXX: This will be changed to USAGE_HW_VIDEO_ENCODER once driver

            // issues with that flag get fixed.

            usage |= GraphicBuffer::USAGE_HW_TEXTURE;

            status_t error;

            sp<GraphicBuffer> graphicBuffer(

                    mGraphicBufferAlloc->createGraphicBuffer(