diff options
9 files changed, 5 insertions, 86 deletions
diff --git a/libs/vr/libdisplay/display_manager_client.cpp b/libs/vr/libdisplay/display_manager_client.cpp index 8fd3627d80..fe186198cd 100644 --- a/libs/vr/libdisplay/display_manager_client.cpp +++ b/libs/vr/libdisplay/display_manager_client.cpp @@ -98,14 +98,9 @@ bool dvrDisplayManagerClientSurfaceListGetClientIsVisible( int dvrDisplayManagerClientGetSurfaceBuffers( DvrDisplayManagerClient* client, int surface_id, DvrDisplayManagerClientSurfaceBuffers** surface_buffers) { - std::vector<std::unique_ptr<android::dvr::BufferConsumer>> buffer_list; - int ret = client->client->GetSurfaceBuffers(surface_id, &buffer_list); - if (ret < 0) - return ret; - - *surface_buffers = - new DvrDisplayManagerClientSurfaceBuffers(std::move(buffer_list)); - return ret; + // TODO(jwcai, hendrikw) Remove this after we replacing + // dvrDisplayManagerClientGetSurfaceBuffers is dvr_api. + return -1; } void dvrDisplayManagerClientSurfaceBuffersDestroy( diff --git a/libs/vr/libdisplay/display_manager_client_impl.cpp b/libs/vr/libdisplay/display_manager_client_impl.cpp index 82198b92c9..3fbd1e09ef 100644 --- a/libs/vr/libdisplay/display_manager_client_impl.cpp +++ b/libs/vr/libdisplay/display_manager_client_impl.cpp @@ -31,27 +31,5 @@ int DisplayManagerClient::GetSurfaceList( return 0; } -int DisplayManagerClient::GetSurfaceBuffers( - int surface_id, std::vector<std::unique_ptr<BufferConsumer>>* consumers) { - auto status = - InvokeRemoteMethod<DisplayManagerRPC::GetSurfaceBuffers>(surface_id); - if (!status) { - ALOGE( - "DisplayManagerClient::GetSurfaceBuffers: Failed to get buffers for " - "surface_id=%d: %s", - surface_id, status.GetErrorMessage().c_str()); - return -status.error(); - } - - std::vector<std::unique_ptr<BufferConsumer>> consumer_buffers; - std::vector<LocalChannelHandle> channel_handles = status.take(); - for (auto&& handle : channel_handles) { - consumer_buffers.push_back(BufferConsumer::Import(std::move(handle))); - } - - *consumers = std::move(consumer_buffers); - return 0; -} - } // namespace dvr } // namespace android diff --git a/libs/vr/libdisplay/include/private/dvr/display_manager_client.h b/libs/vr/libdisplay/include/private/dvr/display_manager_client.h index 8ba9175f28..f515b8feca 100644 --- a/libs/vr/libdisplay/include/private/dvr/display_manager_client.h +++ b/libs/vr/libdisplay/include/private/dvr/display_manager_client.h @@ -62,10 +62,8 @@ int dvrDisplayManagerClientSurfaceListGetClientZOrder( bool dvrDisplayManagerClientSurfaceListGetClientIsVisible( DvrDisplayManagerClientSurfaceList* surface_list, size_t index); -// Populates |surface_buffers| with the list of buffers for |surface_id|. -// |surface_id| should be a valid ID from the list of surfaces. -// -// @return Returns 0 on success. Otherwise it returns a negative error value. +// TODO(jwcai, hendrikw) Remove this after we replacing +// dvrDisplayManagerClientGetSurfaceBuffers is dvr_api. int dvrDisplayManagerClientGetSurfaceBuffers( DvrDisplayManagerClient* client, int surface_id, DvrDisplayManagerClientSurfaceBuffers** surface_buffers); diff --git a/libs/vr/libdisplay/include/private/dvr/display_manager_client_impl.h b/libs/vr/libdisplay/include/private/dvr/display_manager_client_impl.h index 4ecd8d4fc0..0897126ce9 100644 --- a/libs/vr/libdisplay/include/private/dvr/display_manager_client_impl.h +++ b/libs/vr/libdisplay/include/private/dvr/display_manager_client_impl.h @@ -17,9 +17,6 @@ class DisplayManagerClient : public pdx::ClientBase<DisplayManagerClient> { int GetSurfaceList(std::vector<DisplaySurfaceInfo>* surface_list); - int GetSurfaceBuffers( - int surface_id, std::vector<std::unique_ptr<BufferConsumer>>* consumers); - using Client::event_fd; using Client::GetChannel; diff --git a/libs/vr/libdisplay/include/private/dvr/display_rpc.h b/libs/vr/libdisplay/include/private/dvr/display_rpc.h index 1c1a5e0467..d37aed7d63 100644 --- a/libs/vr/libdisplay/include/private/dvr/display_rpc.h +++ b/libs/vr/libdisplay/include/private/dvr/display_rpc.h @@ -258,7 +258,6 @@ struct DisplayManagerRPC { // Op codes. enum { kOpGetSurfaceList = 0, - kOpGetSurfaceBuffers, kOpUpdateSurfaces, }; @@ -269,8 +268,6 @@ struct DisplayManagerRPC { // Methods. PDX_REMOTE_METHOD(GetSurfaceList, kOpGetSurfaceList, std::vector<DisplaySurfaceInfo>(Void)); - PDX_REMOTE_METHOD(GetSurfaceBuffers, kOpGetSurfaceBuffers, - std::vector<LocalChannelHandle>(int surface_id)); PDX_REMOTE_METHOD( UpdateSurfaces, kOpUpdateSurfaces, int(const std::map<int, DisplaySurfaceAttributes>& updates)); diff --git a/libs/vr/libvrflinger/display_manager_service.cpp b/libs/vr/libvrflinger/display_manager_service.cpp index 6730ba8cd0..6df1642b8e 100644 --- a/libs/vr/libvrflinger/display_manager_service.cpp +++ b/libs/vr/libvrflinger/display_manager_service.cpp @@ -77,11 +77,6 @@ int DisplayManagerService::HandleMessage(pdx::Message& message) { *this, &DisplayManagerService::OnGetSurfaceList, message); return 0; - case DisplayManagerRPC::GetSurfaceBuffers::Opcode: - DispatchRemoteMethod<DisplayManagerRPC::GetSurfaceBuffers>( - *this, &DisplayManagerService::OnGetSurfaceBuffers, message); - return 0; - case DisplayManagerRPC::UpdateSurfaces::Opcode: DispatchRemoteMethod<DisplayManagerRPC::UpdateSurfaces>( *this, &DisplayManagerService::OnUpdateSurfaces, message); @@ -128,26 +123,6 @@ std::vector<DisplaySurfaceInfo> DisplayManagerService::OnGetSurfaceList( return items; } -std::vector<LocalChannelHandle> DisplayManagerService::OnGetSurfaceBuffers( - pdx::Message& message, int surface_id) { - std::shared_ptr<DisplaySurface> surface = - display_service_->GetDisplaySurface(surface_id); - if (!surface) - REPLY_ERROR_RETURN(message, ENOENT, {}); - - std::vector<LocalChannelHandle> consumers; - int ret = surface->GetConsumers(&consumers); - if (ret < 0) { - ALOGE( - "DisplayManagerService::OnGetDisplaySurfaceBuffers: Failed to get " - "consumers for surface %d: %s", - surface_id, strerror(-ret)); - REPLY_ERROR_RETURN(message, -ret, {}); - } - - return consumers; -} - int DisplayManagerService::OnUpdateSurfaces( pdx::Message& /*message*/, const std::map<int, DisplaySurfaceAttributes>& updates) { diff --git a/libs/vr/libvrflinger/display_manager_service.h b/libs/vr/libvrflinger/display_manager_service.h index 46401fa1fc..3f83c7d85d 100644 --- a/libs/vr/libvrflinger/display_manager_service.h +++ b/libs/vr/libvrflinger/display_manager_service.h @@ -51,8 +51,6 @@ class DisplayManagerService : public pdx::ServiceBase<DisplayManagerService> { const std::shared_ptr<DisplayService>& display_service); std::vector<DisplaySurfaceInfo> OnGetSurfaceList(pdx::Message& message); - std::vector<pdx::LocalChannelHandle> OnGetSurfaceBuffers( - pdx::Message& message, int surface_id); int OnUpdateSurfaces(pdx::Message& message, const std::map<int, DisplaySurfaceAttributes>& updates); diff --git a/libs/vr/libvrflinger/display_surface.cpp b/libs/vr/libvrflinger/display_surface.cpp index 7c821bfd68..d427ea6b10 100644 --- a/libs/vr/libvrflinger/display_surface.cpp +++ b/libs/vr/libvrflinger/display_surface.cpp @@ -84,22 +84,6 @@ void DisplaySurface::ClientSetBlurBehind(bool blur_behind) { client_blur_behind_ = blur_behind; } -size_t DisplaySurface::GetBufferCount() const { - std::lock_guard<std::mutex> autolock(lock_); - return buffers_.size(); -} - -std::vector<std::shared_ptr<BufferConsumer>> DisplaySurface::GetBuffers() { - std::lock_guard<std::mutex> autolock(lock_); - std::vector<std::shared_ptr<BufferConsumer>> return_vector(buffers_.size()); - - for (const auto pair : buffers_) { - return_vector.push_back(pair.second); - } - - return return_vector; -} - AcquiredBuffer DisplaySurface::AcquireNewestAvailableBuffer( AcquiredBuffer* skipped_buffer) { std::lock_guard<std::mutex> autolock(lock_); diff --git a/libs/vr/libvrflinger/display_surface.h b/libs/vr/libvrflinger/display_surface.h index b7bcd973dd..fa34057191 100644 --- a/libs/vr/libvrflinger/display_surface.h +++ b/libs/vr/libvrflinger/display_surface.h @@ -65,9 +65,6 @@ class DisplaySurface : public SurfaceChannel { return buffer_id_to_index_[buffer_id]; } - size_t GetBufferCount() const; - std::vector<std::shared_ptr<BufferConsumer>> GetBuffers(); - // Gets a new set of consumers for all of the surface's buffers. These // consumers are independent from the consumers maintained internally to the // surface and may be passed to other processes over IPC. |