admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fuchsia] DesktopCapturer gets display info from

Browse Source 
fuchsia.ui.display.singleton

We previously used fuchsia.ui.scenic.Scenic/GetDisplayInfo to get
fuchsia.ui.gfx.DisplayInfo. This has been migrated to
fuchsia.ui.display.singleton.Info/GetMetrics and
fuchsia.ui.display.singleton.Metrics.

Bug: fuchsia:64206
Test: applied changes manually to local chromium repo's third_party/webrtc directory and compiled
Change-Id: If3c7fbd641ebd3b3333e7e5f1126f8f3ae3b97e7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/322780
Commit-Queue: Caroline Liu <carolineliu@google.com>
Reviewed-by: Emircan Uysaler <emircan@google.com>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Cr-Commit-Position: refs/heads/main@{#42104}
This commit is contained in:
Caroline Liu 2023-10-09 17:19:06 +00:00 committed by WebRTC LUCI CQ
parent 5bd39f8a87
commit 74e9c4302c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/desktop_capture/BUILD.gn
View File

@ -453,8 +453,7 @@ rtc_library("desktop_capture") {
"../../rtc_base:divide_round", "../../rtc_base:divide_round",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.sysmem",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.composition", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.composition",
"//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.scenic", "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.display.singleton",
"//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
"//third_party/fuchsia-sdk/sdk/pkg/sys_cpp", "//third_party/fuchsia-sdk/sdk/pkg/sys_cpp",
] ]
} }

18
modules/desktop_capture/screen_capturer_fuchsia.cc
View File

@ -12,7 +12,7 @@
#include <fuchsia/sysmem/cpp/fidl.h> #include <fuchsia/sysmem/cpp/fidl.h>
#include <fuchsia/ui/composition/cpp/fidl.h> #include <fuchsia/ui/composition/cpp/fidl.h>
#include <fuchsia/ui/scenic/cpp/fidl.h> #include <fuchsia/ui/display/singleton/cpp/fidl.h>
#include <lib/sys/cpp/component_context.h> #include <lib/sys/cpp/component_context.h>
#include <algorithm> #include <algorithm>
@ -200,24 +200,26 @@ ScreenCapturerFuchsia::GetBufferConstraints() {
} }
void ScreenCapturerFuchsia::SetupBuffers() { void ScreenCapturerFuchsia::SetupBuffers() {
fuchsia::ui::scenic::ScenicSyncPtr scenic; fuchsia::ui::display::singleton::InfoSyncPtr display_info;
zx_status_t status = component_context_->svc()->Connect(scenic.NewRequest()); zx_status_t status =
component_context_->svc()->Connect(display_info.NewRequest());
if (status != ZX_OK) { if (status != ZX_OK) {
fatal_error_ = true; fatal_error_ = true;
RTC_LOG(LS_ERROR) << "Failed to connect to Scenic: " << status; RTC_LOG(LS_ERROR)
<< "Failed to connect to fuchsia.ui.display.singleton.Info: " << status;
return; return;
} }
fuchsia::ui::gfx::DisplayInfo display_info; fuchsia::ui::display::singleton::Metrics metrics;
status = scenic->GetDisplayInfo(&display_info); status = display_info->GetMetrics(&metrics);
if (status != ZX_OK) { if (status != ZX_OK) {
fatal_error_ = true; fatal_error_ = true;
RTC_LOG(LS_ERROR) << "Failed to connect to get display dimensions: " RTC_LOG(LS_ERROR) << "Failed to connect to get display dimensions: "
<< status; << status;
return; return;
} }
width_ = display_info.width_in_px; width_ = metrics.extent_in_px().width;
height_ = display_info.height_in_px; height_ = metrics.extent_in_px().height;
status = component_context_->svc()->Connect(sysmem_allocator_.NewRequest()); status = component_context_->svc()->Connect(sysmem_allocator_.NewRequest());
if (status != ZX_OK) { if (status != ZX_OK) {