From 22029508934659a51c6345b6c01da386f6006ec2 Mon Sep 17 00:00:00 2001 From: Jiwen 'Steve' Cai Date: Mon, 12 Feb 2018 22:26:05 -0800 Subject: Support BufferHub-backed IGBP in libgui_test Use gtest's TestWithParam tests to support testing both BufferQueue backend and BufferHub backend. Testing against BufferHub backend is gated by USE_BUFFER_HUB_AS_BUFFER_QUEUE build time flag, so that build targets don't support BufferHub won't be impacted by this test. Known issues: b/36724099: Add support for BufferHubProducer::setAsyncMode(true) b/38137191: Implement BufferHubProducer::detachBuffer b/69981968: Implement BufferHubProducer::attachBuffer b/70041889: BufferHubProducer need to support metadata: numPendingBuffers b/70041952: BufferHubProducer need to support metadata: nextFrameNumber b/73267953: Make BufferHub hornor producer and consumer connection Bug: 68733388 Bug: 70046255 Bug: 73160000 Test: libgui_test Change-Id: I35631762781a622cabb0fba7302d18fb983dde40 --- libs/gui/BufferQueue.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'libs/gui/BufferQueue.cpp') diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp index 41512127f2..198869075d 100644 --- a/libs/gui/BufferQueue.cpp +++ b/libs/gui/BufferQueue.cpp @@ -18,6 +18,8 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS //#define LOG_NDEBUG 0 +#include +#include #include #include #include @@ -101,4 +103,31 @@ void BufferQueue::createBufferQueue(sp* outProducer, *outConsumer = consumer; } +void BufferQueue::createBufferHubQueue(sp* outProducer, + sp* outConsumer) { + LOG_ALWAYS_FATAL_IF(outProducer == NULL, "BufferQueue: outProducer must not be NULL"); + LOG_ALWAYS_FATAL_IF(outConsumer == NULL, "BufferQueue: outConsumer must not be NULL"); + + sp producer; + sp consumer; + + dvr::ProducerQueueConfigBuilder configBuilder; + std::shared_ptr producerQueue = + dvr::ProducerQueue::Create(configBuilder.SetMetadata().Build(), + dvr::UsagePolicy{}); + LOG_ALWAYS_FATAL_IF(producerQueue == NULL, "BufferQueue: failed to create ProducerQueue."); + + std::shared_ptr consumerQueue = producerQueue->CreateConsumerQueue(); + LOG_ALWAYS_FATAL_IF(consumerQueue == NULL, "BufferQueue: failed to create ConsumerQueue."); + + producer = BufferHubProducer::Create(producerQueue); + consumer = BufferHubConsumer::Create(consumerQueue); + + LOG_ALWAYS_FATAL_IF(producer == NULL, "BufferQueue: failed to create BufferQueueProducer"); + LOG_ALWAYS_FATAL_IF(consumer == NULL, "BufferQueue: failed to create BufferQueueConsumer"); + + *outProducer = producer; + *outConsumer = consumer; +} + }; // namespace android -- cgit v1.2.3-59-g8ed1b From 639d479b8a432771f7fa5ae4b93f677d2c8eb125 Mon Sep 17 00:00:00 2001 From: Jiwen 'Steve' Cai Date: Thu, 5 Apr 2018 16:49:05 -0700 Subject: BufferHubProducer: don't check user_metadata_size Now we are using canonical metadata for all BufferHubQueue, it's actually wrong to enforce user_metadata_size. Bug: 75962234 Bug: 77655695 Test: buffer_hub_queue-test, buffer_hub_queue_producer-test, SurfaceParcelable_test, dvr_buffer_queue-test, libgui_test Change-Id: I6736ed277f7ac08d1f4a7288ce4a101bc89ca35b --- libs/gui/BufferHubProducer.cpp | 6 ------ libs/gui/BufferQueue.cpp | 3 +-- libs/gui/tests/SurfaceParcelable_test.cpp | 1 - libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp | 4 +--- libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp | 2 +- 5 files changed, 3 insertions(+), 13 deletions(-) (limited to 'libs/gui/BufferQueue.cpp') diff --git a/libs/gui/BufferHubProducer.cpp b/libs/gui/BufferHubProducer.cpp index 70321caa96..061710a1b4 100644 --- a/libs/gui/BufferHubProducer.cpp +++ b/libs/gui/BufferHubProducer.cpp @@ -26,12 +26,6 @@ using namespace dvr; /* static */ sp BufferHubProducer::Create(const std::shared_ptr& queue) { - if (queue->metadata_size() != sizeof(DvrNativeBufferMetadata)) { - ALOGE("BufferHubProducer::Create producer's metadata size is different " - "than the size of DvrNativeBufferMetadata"); - return nullptr; - } - sp producer = new BufferHubProducer; producer->queue_ = queue; return producer; diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp index 198869075d..2917f45164 100644 --- a/libs/gui/BufferQueue.cpp +++ b/libs/gui/BufferQueue.cpp @@ -113,8 +113,7 @@ void BufferQueue::createBufferHubQueue(sp* outProducer, dvr::ProducerQueueConfigBuilder configBuilder; std::shared_ptr producerQueue = - dvr::ProducerQueue::Create(configBuilder.SetMetadata().Build(), - dvr::UsagePolicy{}); + dvr::ProducerQueue::Create(configBuilder.Build(), dvr::UsagePolicy{}); LOG_ALWAYS_FATAL_IF(producerQueue == NULL, "BufferQueue: failed to create ProducerQueue."); std::shared_ptr consumerQueue = producerQueue->CreateConsumerQueue(); diff --git a/libs/gui/tests/SurfaceParcelable_test.cpp b/libs/gui/tests/SurfaceParcelable_test.cpp index 99a8a7a591..686dc82f3e 100644 --- a/libs/gui/tests/SurfaceParcelable_test.cpp +++ b/libs/gui/tests/SurfaceParcelable_test.cpp @@ -49,7 +49,6 @@ public: mProducerQueue = dvr::ProducerQueue::Create(configBuilder.SetDefaultWidth(kBufferWidth) .SetDefaultHeight(kBufferHeight) .SetDefaultFormat(kBufferFormat) - .SetMetadata() .Build(), dvr::UsagePolicy{}); mBufferHubProducer = BufferHubProducer::Create(mProducerQueue); diff --git a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp index 3e9698940c..4f10f83211 100644 --- a/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp +++ b/libs/vr/libbufferhubqueue/tests/buffer_hub_queue_producer-test.cpp @@ -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() - .Build(); + auto config = ProducerQueueConfigBuilder().Build(); auto queue = ProducerQueue::Create(config, UsagePolicy{}); ASSERT_TRUE(queue != nullptr); diff --git a/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp b/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp index 301458a546..5d9d8b5665 100644 --- a/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp +++ b/libs/vr/libdvr/tests/dvr_buffer_queue-test.cpp @@ -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_); -- cgit v1.2.3-59-g8ed1b From e3f35e348f6dea5288913736f26fa1233aa428fd Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 9 Apr 2018 12:16:30 +0900 Subject: Mark some libs as double_loadable Following libs are explicitly marked as double_loadable since they are one of the (indirect) dependencies of LLNDK libraries and at the same time they themselves are marked as VNDK. Such lib can be double loaded inside a vendor process. * libgui and libbinder: due to indirect dependency from libmediandk via libmediaomx. libmediandk is LLNDK) * libui: due to dependency from libnativewindow, which is LLNDK. Also, dependencies from libui and libgui to libpdx_default_transport and libbufferhubque are cut when building libui and libgui for vendors. This is primarily to exclude libpdx* and libbufferhubqueue from VNDK and secondly not to mark transitive dependencies of the libs (such as libcrypto) as double_loadable. Note: even without this change, the library is already capable of being double loaded due to the dependency chain towards it. This change is to make it explicit so that double loading of a library is carefully tracked and signed-off by the owner of the lib. Bug: 77155589 Test: m -j Merged-In: Id4768162aeb72b71d63d7e4498980f276ef58e6b Change-Id: I30c10400d3c4630539001b972ec897faabb4be20 (cherry picked from commit a75d3d6d9f2aef4b1855e6a58332859f3531143d) --- libs/gui/Android.bp | 16 ++++++++++++++++ libs/gui/BufferQueue.cpp | 5 +++++ libs/gui/IGraphicBufferProducer.cpp | 6 ++++++ libs/gui/include/gui/BufferQueue.h | 2 ++ libs/ui/Android.bp | 2 +- libs/vr/libbufferhub/Android.bp | 9 --------- libs/vr/libbufferhubqueue/Android.bp | 4 ---- libs/vr/libdvr/Android.bp | 5 +---- libs/vr/libpdx/Android.bp | 4 ---- libs/vr/libpdx_default_transport/Android.bp | 8 -------- libs/vr/libpdx_uds/Android.bp | 4 ---- 11 files changed, 31 insertions(+), 34 deletions(-) (limited to 'libs/gui/BufferQueue.cpp') diff --git a/libs/gui/Android.bp b/libs/gui/Android.bp index 6528b49994..b29c1d5157 100644 --- a/libs/gui/Android.bp +++ b/libs/gui/Android.bp @@ -140,10 +140,26 @@ cc_library_shared { "android.hardware.configstore-utils", ], + // bufferhub is not used when building libgui for vendors + target: { + vendor: { + cflags: ["-DNO_BUFFERHUB"], + exclude_srcs: [ + "BufferHubConsumer.cpp", + "BufferHubProducer.cpp", + ], + exclude_shared_libs: [ + "libbufferhubqueue", + "libpdx_default_transport", + ], + }, + }, + header_libs: [ "libdvr_headers", "libnativebase_headers", "libgui_headers", + "libpdx_headers", ], export_shared_lib_headers: [ diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp index 2917f45164..a8da1347cb 100644 --- a/libs/gui/BufferQueue.cpp +++ b/libs/gui/BufferQueue.cpp @@ -18,8 +18,11 @@ #define ATRACE_TAG ATRACE_TAG_GRAPHICS //#define LOG_NDEBUG 0 +#ifndef NO_BUFFERHUB #include #include +#endif + #include #include #include @@ -103,6 +106,7 @@ void BufferQueue::createBufferQueue(sp* outProducer, *outConsumer = consumer; } +#ifndef NO_BUFFERHUB void BufferQueue::createBufferHubQueue(sp* outProducer, sp* outConsumer) { LOG_ALWAYS_FATAL_IF(outProducer == NULL, "BufferQueue: outProducer must not be NULL"); @@ -128,5 +132,6 @@ void BufferQueue::createBufferHubQueue(sp* outProducer, *outProducer = producer; *outConsumer = consumer; } +#endif }; // namespace android diff --git a/libs/gui/IGraphicBufferProducer.cpp b/libs/gui/IGraphicBufferProducer.cpp index 777a3e5e9b..0749fde1ad 100644 --- a/libs/gui/IGraphicBufferProducer.cpp +++ b/libs/gui/IGraphicBufferProducer.cpp @@ -27,7 +27,9 @@ #include #include +#ifndef NO_BUFFERHUB #include +#endif #include #include #include @@ -706,6 +708,7 @@ sp IGraphicBufferProducer::createFromParcel(const Parcel } case USE_BUFFER_HUB: { ALOGE("createFromParcel: BufferHub not implemented."); +#ifndef NO_BUFFERHUB dvr::ProducerQueueParcelable producerParcelable; res = producerParcelable.readFromParcel(parcel); if (res != NO_ERROR) { @@ -713,6 +716,9 @@ sp IGraphicBufferProducer::createFromParcel(const Parcel return nullptr; } return BufferHubProducer::Create(std::move(producerParcelable)); +#else + return nullptr; +#endif } default: { ALOGE("createFromParcel: Unexpected mgaic: 0x%x.", outMagic); diff --git a/libs/gui/include/gui/BufferQueue.h b/libs/gui/include/gui/BufferQueue.h index f175573366..da952744f3 100644 --- a/libs/gui/include/gui/BufferQueue.h +++ b/libs/gui/include/gui/BufferQueue.h @@ -79,9 +79,11 @@ public: sp* outConsumer, bool consumerIsSurfaceFlinger = false); +#ifndef NO_BUFFERHUB // Creates an IGraphicBufferProducer and IGraphicBufferConsumer pair backed by BufferHub. static void createBufferHubQueue(sp* outProducer, sp* outConsumer); +#endif BufferQueue() = delete; // Create through createBufferQueue }; diff --git a/libs/ui/Android.bp b/libs/ui/Android.bp index ae5fcbe949..d25ad1a46d 100644 --- a/libs/ui/Android.bp +++ b/libs/ui/Android.bp @@ -85,7 +85,6 @@ cc_library_shared { "libhidlbase", "libhidltransport", "libhwbinder", - "libpdx_default_transport", "libsync", "libutils", "libutilscallstack", @@ -107,6 +106,7 @@ cc_library_shared { "libnativebase_headers", "libhardware_headers", "libui_headers", + "libpdx_headers", ], export_static_lib_headers: [ diff --git a/libs/vr/libbufferhub/Android.bp b/libs/vr/libbufferhub/Android.bp index b38ecc7190..7b5ad44f67 100644 --- a/libs/vr/libbufferhub/Android.bp +++ b/libs/vr/libbufferhub/Android.bp @@ -56,15 +56,6 @@ cc_library { export_header_lib_headers: [ "libnativebase_headers", ], - vendor_available: false, - vndk: { - enabled: true, - }, - target: { - vendor: { - exclude_srcs: ["detached_buffer.cpp"], - }, - }, } cc_test { diff --git a/libs/vr/libbufferhubqueue/Android.bp b/libs/vr/libbufferhubqueue/Android.bp index eeec9ec49c..9f72c05f0c 100644 --- a/libs/vr/libbufferhubqueue/Android.bp +++ b/libs/vr/libbufferhubqueue/Android.bp @@ -59,10 +59,6 @@ cc_library_shared { static_libs: staticLibraries, shared_libs: sharedLibraries, header_libs: headerLibraries, - vendor_available: false, - vndk: { - enabled: true, - }, } subdirs = ["benchmarks", "tests"] diff --git a/libs/vr/libdvr/Android.bp b/libs/vr/libdvr/Android.bp index d0e34eef43..16906f57cd 100644 --- a/libs/vr/libdvr/Android.bp +++ b/libs/vr/libdvr/Android.bp @@ -16,10 +16,7 @@ cc_library_headers { name: "libdvr_headers", export_include_dirs: ["include"], - vendor_available: false, - vndk: { - enabled: true, - }, + vendor_available: true, } cflags = [ diff --git a/libs/vr/libpdx/Android.bp b/libs/vr/libpdx/Android.bp index 5516d21fb7..1a9d7274a1 100644 --- a/libs/vr/libpdx/Android.bp +++ b/libs/vr/libpdx/Android.bp @@ -28,10 +28,6 @@ cc_library_static { "libutils", "liblog", ], - vendor_available: false, - vndk: { - enabled: true, - }, } cc_test { diff --git a/libs/vr/libpdx_default_transport/Android.bp b/libs/vr/libpdx_default_transport/Android.bp index 475eb50f29..74b8c8bd21 100644 --- a/libs/vr/libpdx_default_transport/Android.bp +++ b/libs/vr/libpdx_default_transport/Android.bp @@ -12,10 +12,6 @@ cc_defaults { name: "pdx_default_transport_lib_defaults", export_include_dirs: ["private"], whole_static_libs: ["libpdx"], - vendor_available: false, - vndk: { - enabled: true, - }, } cc_defaults { @@ -37,10 +33,6 @@ cc_library_shared { "pdx_default_transport_lib_defaults", "pdx_use_transport_uds", ], - vendor_available: false, - vndk: { - enabled: true, - }, shared_libs: [ "libbase", "libbinder", diff --git a/libs/vr/libpdx_uds/Android.bp b/libs/vr/libpdx_uds/Android.bp index 79cfdf6324..d64095061e 100644 --- a/libs/vr/libpdx_uds/Android.bp +++ b/libs/vr/libpdx_uds/Android.bp @@ -30,10 +30,6 @@ cc_library_static { whole_static_libs: [ "libselinux", ], - vendor_available: false, - vndk: { - enabled: true, - }, } cc_test { -- cgit v1.2.3-59-g8ed1b