Improvements and linux pre (#1)

* Implement getting sources from screencapture kit

* Expose stream rect on linux in metadata

Author: iparaskev

modules/desktop_capture/linux/wayland/base_capturer_pipewire.cc

@@ -243,4 +243,7 @@ void BaseCapturerPipeWire::SendFramesImmediately(bool send_frames_immediately) {
   send_frames_immediately_ = send_frames_immediately;
 }
 
+DesktopCaptureMetadata BaseCapturerPipeWire::GetMetadata() {
+  return DesktopCaptureMetadata{GetSessionDetails()};
+}
 }  // namespace webrtc

modules/desktop_capture/linux/wayland/base_capturer_pipewire.h

@@ -50,6 +50,7 @@ class RTC_EXPORT BaseCapturerPipeWire
   bool SelectSource(SourceId id) override;
   DelegatedSourceListController* GetDelegatedSourceListController() override;
   void SetMaxFrameRate(uint32_t max_frame_rate) override;
+  DesktopCaptureMetadata GetMetadata() override;
 
   // DelegatedSourceListController
   void Observe(Observer* observer) override;

modules/desktop_capture/linux/wayland/screencast_portal.cc

@@ -118,6 +118,18 @@ void ScreenCastPortal::SetSessionDetails(
   if (session_details.pipewire_stream_node_id) {
     pw_stream_node_id_ = session_details.pipewire_stream_node_id;
   }
+  if (session_details.top) {
+    top_ = session_details.top;
+  }
+  if (session_details.left) {
+    left_ = session_details.left;
+  }
+  if (session_details.width) {
+    width_ = session_details.width;
+  }
+  if (session_details.height) {
+    height_ = session_details.height;
+  }
 }
 
 void ScreenCastPortal::Start() {
@@ -127,7 +139,16 @@ void ScreenCastPortal::Start() {
 }
 
 xdg_portal::SessionDetails ScreenCastPortal::GetSessionDetails() {
-  return {};  // No-op
+  return xdg_portal::SessionDetails{
+      proxy_,
+      cancellable_,
+      session_handle_,
+      pw_stream_node_id_,
+      width_,
+      height_,
+      top_,
+      left_
+  };
 }
 
 void ScreenCastPortal::OnPortalDone(RequestResponse result) {
@@ -383,6 +404,12 @@ void ScreenCastPortal::OnStartRequestResponseSignal(GDBusConnection* connection,
 
       that->pw_stream_node_id_ = stream_id;
 
+      int32_t width = 0,  height = 0, top = 0, left = 0;
+      g_variant_lookup(options.get(), "position", "(ii)", &left, &top);
+      g_variant_lookup(options.get(), "size", "(ii)", &width, &height);
+      xdg_portal::SessionDetails details{nullptr, nullptr, std::string{}, 0, width, height, top, left};
+      that->SetSessionDetails(details);
+
       break;
     }
   }

modules/desktop_capture/linux/wayland/screencast_portal.h

@@ -165,6 +165,12 @@ class RTC_EXPORT ScreenCastPortal
   guint start_request_signal_id_ = 0;
   guint session_closed_signal_id_ = 0;
 
+  // Temporary solution for storing stream origin
+  int32_t width_ = 0;
+  int32_t height_ = 0;
+  int32_t top_ = 0;
+  int32_t left_ = 0;
+
   void UnsubscribeSignalHandlers();
   static void OnProxyRequested(GObject* object,
                                GAsyncResult* result,

modules/desktop_capture/mac/screen_capturer_sck.mm

@@ -462,10 +462,54 @@ friend void AbslStringify(Sink& sink,
 bool ScreenCapturerSck::GetSourceList(SourceList* sources) {
   RTC_DCHECK_RUN_ON(&api_checker_);
   sources->clear();
-  EnsurePickerHandle();
-  if (picker_handle_) {
-    sources->push_back({picker_handle_->Source(), std::string()});
+
+  if (capture_options_.allow_sck_system_picker()) {
+    EnsurePickerHandle();
+    if (picker_handle_) {
+      sources->push_back({picker_handle_->Source(), std::string()});
+    }
+    return true;
+  }
+
+  __block SCShareableContent* shareable_content = nil;
+  __block NSError* fetch_error = nil;
+
+  // Use synchronous approach with semaphore to wait for async completion
+  dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+
+  [SCShareableContent getShareableContentWithCompletionHandler:^(SCShareableContent* content, NSError* error) {
+    shareable_content = content;
+    fetch_error = error;
+    dispatch_semaphore_signal(semaphore);
+  }];
+
+  // Wait for the completion handler
+  dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+
+  if (fetch_error || !shareable_content) {
+    RTC_LOG(LS_ERROR) << "ScreenCapturerSck " << this
+                      << " GetSourceList failed to get shareable content with error code "
+                      << (fetch_error ? fetch_error.code : 0) << ".";
+    return false;
+  }
+
+  if (!shareable_content.displays.count) {
+    RTC_LOG(LS_WARNING) << "ScreenCapturerSck " << this
+                        << " GetSourceList returned no displays.";
+    return true; // Return true but with empty list
   }
+
+  // Populate sources with available displays
+  for (SCDisplay* display in shareable_content.displays) {
+    DesktopCapturer::Source source;
+    source.id = static_cast<SourceId>(display.displayID);
+
+    source.display_id = display.displayID;
+    sources->push_back(source);
+  }
+
+  RTC_LOG(LS_INFO) << "ScreenCapturerSck " << this
+                   << " GetSourceList found " << sources->size() << " displays.";
   return true;
 }
 

modules/portal/xdg_session_details.h

@@ -25,6 +25,10 @@ struct SessionDetails {
   GCancellable* cancellable = nullptr;
   std::string session_handle;
   uint32_t pipewire_stream_node_id = 0;
+  int32_t width = 0;
+  int32_t height = 0;
+  int32_t top = 0;
+  int32_t left = 0;
 };
 
 }  // namespace xdg_portal