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

Commit a1fc8ab7 authored by Jiwen 'Steve' Cai's avatar Jiwen 'Steve' Cai Committed by android-build-merger
Browse files

Merge "BufferHubProducer: don't check user_metadata_size" into pi-dev am: 0c7c5d6c 

am: 1525be3c

Change-Id: I3d25af4546f9f547e0fc54e2bebca2655b4088d3
parents 9bc7971b 1525be3c

libs/gui/BufferHubProducer.cpp

+0 −6
Original line number Diff line number Diff line
@@ -26,12 +26,6 @@ using namespace dvr; 


/* static */

sp<BufferHubProducer> BufferHubProducer::Create(const std::shared_ptr<ProducerQueue>& queue) {

    if (queue->metadata_size() != sizeof(DvrNativeBufferMetadata)) {

        ALOGE("BufferHubProducer::Create producer's metadata size is different "

              "than the size of DvrNativeBufferMetadata");

        return nullptr;

    }



    sp<BufferHubProducer> producer = new BufferHubProducer;

    producer->queue_ = queue;

    return producer;

libs/gui/BufferQueue.cpp

+1 −2
Original line number Diff line number Diff line
@@ -113,8 +113,7 @@ void BufferQueue::createBufferHubQueue(sp<IGraphicBufferProducer>* outProducer, 


    dvr::ProducerQueueConfigBuilder configBuilder;

    std::shared_ptr<dvr::ProducerQueue> producerQueue =

            dvr::ProducerQueue::Create(configBuilder.SetMetadata<DvrNativeBufferMetadata>().Build(),

                                       dvr::UsagePolicy{});

            dvr::ProducerQueue::Create(configBuilder.Build(), dvr::UsagePolicy{});

    LOG_ALWAYS_FATAL_IF(producerQueue == NULL, "BufferQueue: failed to create ProducerQueue.");



    std::shared_ptr<dvr::ConsumerQueue> consumerQueue = producerQueue->CreateConsumerQueue();

libs/gui/tests/SurfaceParcelable_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ public: 
        mProducerQueue = dvr::ProducerQueue::Create(configBuilder.SetDefaultWidth(kBufferWidth)

                                                            .SetDefaultHeight(kBufferHeight)

                                                            .SetDefaultFormat(kBufferFormat)

                                                            .SetMetadata<DvrNativeBufferMetadata>()

                                                            .Build(),

                                                    dvr::UsagePolicy{});

        mBufferHubProducer = BufferHubProducer::Create(mProducerQueue);

libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp

+1 −3
Original line number Diff line number Diff line
@@ -94,9 +94,7 @@ class BufferHubQueueProducerTest : public ::testing::Test { 
    ALOGD_IF(TRACE, "Begin test: %s.%s", testInfo->test_case_name(),

             testInfo->name());



    auto config = ProducerQueueConfigBuilder()

                      .SetMetadata<DvrNativeBufferMetadata>()

                      .Build();

    auto config = ProducerQueueConfigBuilder().Build();

    auto queue = ProducerQueue::Create(config, UsagePolicy{});

    ASSERT_TRUE(queue != nullptr);

libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ TEST_F(DvrBufferQueueTest, AcquirePostGainRelease) { 
TEST_F(DvrBufferQueueTest, GetANativeWindow) {

  int ret = api_.WriteBufferQueueCreate(

      kBufferWidth, kBufferHeight, kBufferFormat, kLayerCount, kBufferUsage,

      /*capacity=*/0, sizeof(DvrNativeBufferMetadata), &write_queue_);

      /*capacity=*/0, /*user_metadata_size=*/0, &write_queue_);

  ASSERT_EQ(0, ret);

  ASSERT_NE(nullptr, write_queue_);