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

Commit 4b2f8180 authored by Craig Donner's avatar Craig Donner
Browse files

Use layered version of graphic buffer allocation calls. 

Allocators now require a layer count, but in these cases we can
assume that a single layer is sufficient, since that's what they
effectively do now.

Bug: 31686534
Test: manual
Change-Id: Ic22f56f8dbbf5bca01ad21421d12faac95783de7
parent f348da28

media/libstagefright/wifi-display/MediaSender.cpp

+5 −3
Original line number Diff line number Diff line
@@ -423,9 +423,11 @@ status_t MediaSender::packetizeAccessUnit( 
            CHECK_GE(accessUnit->size(), rangeLength);



            sp<GraphicBuffer> grbuf(new GraphicBuffer(

                    rangeOffset + rangeLength, 1, HAL_PIXEL_FORMAT_Y8,

                    GRALLOC_USAGE_HW_VIDEO_ENCODER, rangeOffset + rangeLength,

                    handle, false));

                    rangeOffset + rangeLength /* width */, 1 /* height */,

                    HAL_PIXEL_FORMAT_Y8, 1 /* layerCount */,

                    GRALLOC_USAGE_HW_VIDEO_ENCODER,

                    rangeOffset + rangeLength /* stride */, handle,

                    false /* keepOwnership */));



            err = mHDCP->encryptNative(

                    grbuf, rangeOffset, rangeLength,

services/camera/libcameraservice/device3/Camera3BufferManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -221,7 +221,8 @@ status_t Camera3BufferManager::getBufferForStream(int streamId, int streamSetId, 
            status_t res = OK;

            buffer.fenceFd = -1;

            buffer.graphicBuffer = mAllocator->createGraphicBuffer(

                    info.width, info.height, info.format, info.combinedUsage, &res);

                    info.width, info.height, info.format, 1 /* layerCount */,

                    info.combinedUsage, &res);

            ALOGV("%s: allocating a new graphic buffer (%dx%d, format 0x%x) %p with handle %p",

                    __FUNCTION__, info.width, info.height, info.format,

                    buffer.graphicBuffer.get(), buffer.graphicBuffer->handle);