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

Commit 1b493416 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

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

* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
  SurfaceMediaSource: use the vid enc usage bit
parents a2d54aea 21befea3
Loading
Loading
Loading
Loading
+1 −1
Original line number 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->format) != format) ||
        ((uint32_t(buffer->usage) & usage) != usage)) {
            usage |= GraphicBuffer::USAGE_HW_TEXTURE;
            usage |= GraphicBuffer::USAGE_HW_VIDEO_ENCODER;
            status_t error;
            sp<GraphicBuffer> graphicBuffer(
                    mGraphicBufferAlloc->createGraphicBuffer(