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

Commit 96f8bb84 authored by Carlos Martinez Romero's avatar Carlos Martinez Romero
Browse files

Minor IGraphicBufferProducer cleanup changes. 

We have removed references of IGraphicBufferProducer outside of libgui
so this include is no longer necessary. More information at
go/warren-buffers.

Bug: 342197851
Test: build and run
Flag: com.android.graphics.libgui.flags.wb_platform_api_improvements
Change-Id: I1dba80493523ad553ae1b61cb135bf2e824d60b7
parent 377a6702

camera/tests/fuzzer/camera_c2OutputConfiguration_fuzzer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <camera2/OutputConfiguration.h>

#include <camera2/SessionConfiguration.h>

#include <fuzzer/FuzzedDataProvider.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/Surface.h>

#include <gui/Flags.h>  // remove with WB_LIBCAMERASERVICE_WITH_DEPENDENCIES

#include <gui/SurfaceComposerClient.h>

services/camera/libcameraservice/libcameraservice_fuzzer/camera_service_fuzzer.cpp

+6 −4
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ 
#include <fakeservicemanager/FakeServiceManager.h>

#include <fuzzbinder/random_binder.h>

#include <gui/BufferItemConsumer.h>

#include <gui/Flags.h>

#include <gui/Flags.h> // remove with COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

#if not COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

#include <gui/IGraphicBufferProducer.h>

#endif

#include <gui/Surface.h>

#include <gui/SurfaceComposerClient.h>

#include <media/IAudioFlinger.h>
@@ -848,9 +850,9 @@ void Camera2Fuzzer::process() { 


        std::string noPhysicalId;

        size_t rotations = sizeof(kRotations) / sizeof(int32_t) - 1;

        sp<IGraphicBufferProducer> igbp = surface->getIGraphicBufferProducer();

        ParcelableSurfaceType pSurface = flagtools::surfaceToParcelableSurfaceType(surface);

        OutputConfiguration output(

                igbp, kRotations[mFuzzedDataProvider->ConsumeIntegralInRange<size_t>(0, rotations)],

            pSurface, kRotations[mFuzzedDataProvider->ConsumeIntegralInRange<size_t>(0, rotations)],

            noPhysicalId);

#else

        sp<IGraphicBufferProducer> gbProducer;

services/camera/libcameraservice/tests/Camera3StreamSplitterTest.cpp

+7 −0
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ 
#include <com_android_internal_camera_flags.h>

#include <gui/BufferItemConsumer.h>

#include <gui/IGraphicBufferConsumer.h>

#include <gui/Flags.h> // remove with WB_PLATFORM_API_IMPROVEMENTS

#if not COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_PLATFORM_API_IMPROVEMENTS)

#include <gui/IGraphicBufferProducer.h>

#endif

#include <gui/Surface.h>

#include <ui/Fence.h>

#include <ui/GraphicBuffer.h>
@@ -162,7 +165,11 @@ TEST_F(Camera3StreamSplitterTest, TestProcessSingleBuffer) { 
    sp<TestSurfaceListener> surfaceListener = sp<TestSurfaceListener>::make();

    EXPECT_EQ(OK, inputSurface->connect(NATIVE_WINDOW_API_CAMERA, surfaceListener, false));

    // TODO: Do this with the surface itself once the API is available.

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_PLATFORM_API_IMPROVEMENTS)

    EXPECT_EQ(OK, inputSurface->allowAllocation(false));

#else

    EXPECT_EQ(OK, inputSurface->getIGraphicBufferProducer()->allowAllocation(false));

#endif



    //

    // Create a buffer to use: