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

Commit 7359dc9c authored by Tianyu Jiang's avatar Tianyu Jiang
Browse files

Replace android::dvr::BufferHubDefs with android::BufferHubDefs 

New libraries in libui and bufferhub shall be using
android::BufferHubDefs instead of android::dvr::BufferHubDefs.

Bug: None
Test: atest AHardwareBufferTest BufferHubBuffer_test
BufferHubMetadata_test buffer_hub_queue_producer-test libgui_test
libsensor_test vrflinger_test buffer_hub-test buffer_hub_queue-test
dvr_buffer_queue-test dvr_api-test dvr_display-test
Test: in libui_test InputSurfacesTest are segfault on top of master already.

tested on Blueline and Vega

Change-Id: Ia755022c96147969a401ed32544082a8c76936a0
parent 55ef412b

libs/ui/BufferHubBuffer.cpp

+8 −8
Original line number Diff line number Diff line
@@ -62,14 +62,14 @@ namespace { 
// to use Binder.

static constexpr char kBufferHubClientPath[] = "system/buffer_hub/client";



using dvr::BufferHubDefs::AnyClientAcquired;

using dvr::BufferHubDefs::AnyClientGained;

using dvr::BufferHubDefs::AnyClientPosted;

using dvr::BufferHubDefs::IsClientAcquired;

using dvr::BufferHubDefs::IsClientGained;

using dvr::BufferHubDefs::IsClientPosted;

using dvr::BufferHubDefs::IsClientReleased;

using dvr::BufferHubDefs::kHighBitsMask;

using BufferHubDefs::AnyClientAcquired;

using BufferHubDefs::AnyClientGained;

using BufferHubDefs::AnyClientPosted;

using BufferHubDefs::IsClientAcquired;

using BufferHubDefs::IsClientGained;

using BufferHubDefs::IsClientPosted;

using BufferHubDefs::IsClientReleased;

using BufferHubDefs::kHighBitsMask;



} // namespace

libs/ui/include/ui/BufferHubBuffer.h

+1 −1
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ 
#pragma clang diagnostic ignored "-Wunused-template"

#pragma clang diagnostic ignored "-Wweak-vtables"

#include <pdx/client.h>

#include <private/dvr/buffer_hub_defs.h>

#include <private/dvr/native_handle_wrapper.h>

#pragma clang diagnostic pop



#include <android/hardware_buffer.h>

#include <ui/BufferHubDefs.h>

#include <ui/BufferHubMetadata.h>



namespace android {

libs/ui/tests/BufferHubBuffer_test.cpp

+10 −10
Original line number Diff line number Diff line
@@ -36,16 +36,16 @@ const int kFormat = HAL_PIXEL_FORMAT_RGBA_8888; 
const int kUsage = 0;

const size_t kUserMetadataSize = 0;



using dvr::BufferHubDefs::AnyClientAcquired;

using dvr::BufferHubDefs::AnyClientGained;

using dvr::BufferHubDefs::AnyClientPosted;

using dvr::BufferHubDefs::IsBufferReleased;

using dvr::BufferHubDefs::IsClientAcquired;

using dvr::BufferHubDefs::IsClientGained;

using dvr::BufferHubDefs::IsClientPosted;

using dvr::BufferHubDefs::IsClientReleased;

using dvr::BufferHubDefs::kFirstClientBitMask;

using dvr::BufferHubDefs::kMetadataHeaderSize;

using BufferHubDefs::AnyClientAcquired;

using BufferHubDefs::AnyClientGained;

using BufferHubDefs::AnyClientPosted;

using BufferHubDefs::IsBufferReleased;

using BufferHubDefs::IsClientAcquired;

using BufferHubDefs::IsClientGained;

using BufferHubDefs::IsClientPosted;

using BufferHubDefs::IsClientReleased;

using BufferHubDefs::kFirstClientBitMask;

using BufferHubDefs::kMetadataHeaderSize;

using frameworks::bufferhub::V1_0::BufferHubStatus;

using frameworks::bufferhub::V1_0::IBufferClient;

using frameworks::bufferhub::V1_0::IBufferHub;

libs/vr/libbufferhub/buffer_hub-test.cpp

+11 −10
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
#include <sys/epoll.h>

#include <sys/eventfd.h>

#include <ui/BufferHubBuffer.h>

#include <ui/BufferHubDefs.h>



#include <mutex>

#include <thread>
@@ -21,17 +22,17 @@ 
using android::BufferHubBuffer;

using android::GraphicBuffer;

using android::sp;

using android::BufferHubDefs::AnyClientAcquired;

using android::BufferHubDefs::AnyClientGained;

using android::BufferHubDefs::AnyClientPosted;

using android::BufferHubDefs::IsBufferReleased;

using android::BufferHubDefs::IsClientAcquired;

using android::BufferHubDefs::IsClientPosted;

using android::BufferHubDefs::IsClientReleased;

using android::BufferHubDefs::kFirstClientBitMask;

using android::BufferHubDefs::kMetadataHeaderSize;

using android::dvr::ConsumerBuffer;

using android::dvr::ProducerBuffer;

using android::dvr::BufferHubDefs::AnyClientAcquired;

using android::dvr::BufferHubDefs::AnyClientGained;

using android::dvr::BufferHubDefs::AnyClientPosted;

using android::dvr::BufferHubDefs::IsBufferReleased;

using android::dvr::BufferHubDefs::IsClientAcquired;

using android::dvr::BufferHubDefs::IsClientPosted;

using android::dvr::BufferHubDefs::IsClientReleased;

using android::dvr::BufferHubDefs::kFirstClientBitMask;

using android::dvr::BufferHubDefs::kMetadataHeaderSize;

using android::pdx::LocalChannelHandle;

using android::pdx::LocalHandle;

using android::pdx::Status;
@@ -45,7 +46,7 @@ const size_t kUserMetadataSize = 0; 
// Maximum number of consumers for the buffer that only has one producer in the

// test.

const size_t kMaxConsumerCount =

    android::dvr::BufferHubDefs::kMaxNumberOfClients - 1;

    android::BufferHubDefs::kMaxNumberOfClients - 1;

const int kPollTimeoutMs = 100;



using LibBufferHubTest = ::testing::Test;

libs/vr/libbufferhub/include/private/dvr/native_handle_wrapper.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
#define ANDROID_DVR_NATIVE_HANDLE_WRAPPER_H_



#include <cutils/native_handle.h>

#include <log/log.h>

#include <pdx/rpc/serializable.h>



#include <vector>