Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: c3036d4557
Branches Tags
electron
/
patches
/
chromium
/
fix_use_delegated_generic_capturer_when_available.patch

fix_use_delegated_generic_capturer_when_available.patch 2.9 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Athul Iddya <[email protected]>
    3. 

  3. Date: Fri, 14 Jul 2023 08:03:37 -0700
    4. 

  4. Subject: fix: use delegated generic capturer when available
    5. 

  5. 

  6. When the generic capturer is used to fetch capture sources, the returned
    7. 

  7. ID will be arbitrarily prefixed with "screen" or "window" regardless of
    8. 

  8. the source type. If the window capturer is used to stream video when the
    9. 

  9. source was a screen or vice-versa, the stream fails to restart in
    10. 

  10. delegated capturers like PipeWire.
    11. 

  11. 

  12. To fix this, use the generic capturer to fetch the media stream if it's
    13. 

  13. delegated and available. This does not cause any issues if the original
    14. 

  14. capturer was window or screen-specific, as the IDs remain valid for
    15. 

  15. generic capturer as well.
    16. 

  16. 

  17. diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc
    18. 

  18. index b0c4efdd8a6401e09520bdfa96221e5addcfd829..f5b7447938f70dd4623a60fa6a856775b627f3d6 100644
    19. 

  19. --- a/content/browser/media/capture/desktop_capture_device.cc
    20. 

  20. +++ b/content/browser/media/capture/desktop_capture_device.cc
    21. 

  21. @@ -794,8 +794,14 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
    22. 

  22.                DesktopCapturerLacros::CaptureType::kScreen,
    23. 

  23.                webrtc::DesktopCaptureOptions());
    24. 

  24.  #else
    25. 

  25. -      std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
    26. 

  26. -          webrtc::DesktopCapturer::CreateScreenCapturer(options));
    27. 

  27. +      std::unique_ptr<webrtc::DesktopCapturer> screen_capturer;
    28. 

  28. +      if (auto generic_capturer =
    29. 

  29. +              webrtc::DesktopCapturer::CreateGenericCapturer(options);
    30. 

  30. +          generic_capturer && generic_capturer->GetDelegatedSourceListController()) {
    31. 

  31. +        screen_capturer = std::move(generic_capturer);
    32. 

  32. +      } else {
    33. 

  33. +        screen_capturer = webrtc::DesktopCapturer::CreateScreenCapturer(options);
    34. 

  34. +      }
    35. 

  35.  #endif
    36. 

  36.        if (screen_capturer && screen_capturer->SelectSource(source.id)) {
    37. 

  37.          capturer = std::make_unique<webrtc::DesktopAndCursorComposer>(
    38. 

  38. @@ -814,8 +820,14 @@ std::unique_ptr<media::VideoCaptureDevice> DesktopCaptureDevice::Create(
    39. 

  39.            new DesktopCapturerLacros(DesktopCapturerLacros::CaptureType::kWindow,
    40. 

  40.                                      webrtc::DesktopCaptureOptions()));
    41. 

  41.  #else
    42. 

  42. -      std::unique_ptr<webrtc::DesktopCapturer> window_capturer =
    43. 

  43. -          webrtc::DesktopCapturer::CreateWindowCapturer(options);
    44. 

  44. +      std::unique_ptr<webrtc::DesktopCapturer> window_capturer;
    45. 

  45. +      if (auto generic_capturer =
    46. 

  46. +              webrtc::DesktopCapturer::CreateGenericCapturer(options);
    47. 

  47. +          generic_capturer && generic_capturer->GetDelegatedSourceListController()) {
    48. 

  48. +        window_capturer = std::move(generic_capturer);
    49. 

  49. +      } else {
    50. 

  50. +        window_capturer = webrtc::DesktopCapturer::CreateWindowCapturer(options);
    51. 

  51. +      }
    52. 

  52.  #endif
    53. 

  53.        if (window_capturer && window_capturer->SelectSource(source.id)) {
    54. 

  54.          capturer = std::make_unique<webrtc::DesktopAndCursorComposer>(
    55.