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

Commit 6f1dd757 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1

parents f296ee69 6deb4b53

include/ui/GraphicBuffer.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,7 @@ public: 
        USAGE_HW_RENDER         = GRALLOC_USAGE_HW_RENDER,

        USAGE_HW_RENDER         = GRALLOC_USAGE_HW_RENDER,

        USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,

        USAGE_HW_2D             = GRALLOC_USAGE_HW_2D,

        USAGE_HW_COMPOSER       = GRALLOC_USAGE_HW_COMPOSER,

        USAGE_HW_COMPOSER       = GRALLOC_USAGE_HW_COMPOSER,

        USAGE_HW_VIDEO_ENCODER  = GRALLOC_USAGE_HW_VIDEO_ENCODER,

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

        USAGE_HW_MASK           = GRALLOC_USAGE_HW_MASK

    };

    };

media/libstagefright/SurfaceMediaSource.cpp

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

        (uint32_t(buffer->height) != h) ||

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

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

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

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

            usage |= GraphicBuffer::USAGE_HW_TEXTURE;

            usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER;

            status_t error;

            status_t error;

            sp<GraphicBuffer> graphicBuffer(

            sp<GraphicBuffer> graphicBuffer(

                    mGraphicBufferAlloc->createGraphicBuffer(

                    mGraphicBufferAlloc->createGraphicBuffer(