Browse Source

Fix duplicate RTCDispatcher console error for debug build.

The solution was to call CreateScreenCapturer from content, and not link the static library in.
Nitish Sakhawalkar 7 years ago
parent
commit
ca8843102a
2 changed files with 5 additions and 9 deletions
  1. 5 6
      atom/browser/api/atom_api_desktop_capturer.cc
  2. 0 3
      brightray/brightray.gyp

+ 5 - 6
atom/browser/api/atom_api_desktop_capturer.cc

@@ -58,17 +58,16 @@ DesktopCapturer::~DesktopCapturer() {}
 void DesktopCapturer::StartHandling(bool capture_window,
                                     bool capture_screen,
                                     const gfx::Size& thumbnail_size) {
-  webrtc::DesktopCaptureOptions options =
-      content::desktop_capture::CreateDesktopCaptureOptions();
 #if defined(OS_WIN)
-  using_directx_capturer_ = options.allow_directx_capturer();
+  using_directx_capturer_ =
+      content::desktop_capture::CreateDesktopCaptureOptions()
+          .allow_directx_capturer();
 #endif  // defined(OS_WIN)
-
   std::unique_ptr<webrtc::DesktopCapturer> screen_capturer(
-      capture_screen ? webrtc::DesktopCapturer::CreateScreenCapturer(options)
+      capture_screen ? content::desktop_capture::CreateScreenCapturer()
                      : nullptr);
   std::unique_ptr<webrtc::DesktopCapturer> window_capturer(
-      capture_window ? webrtc::DesktopCapturer::CreateWindowCapturer(options)
+      capture_window ? content::desktop_capture::CreateScreenCapturer()
                      : nullptr);
   media_list_.reset(new NativeDesktopMediaList(std::move(screen_capturer),
                                                std::move(window_capturer)));

+ 0 - 3
brightray/brightray.gyp

@@ -113,7 +113,6 @@
                   # Following libraries are always linked statically.
                   '<(libchromiumcontent_dir)/libgtkui.a',
                   '<(libchromiumcontent_dir)/libhttp_server.a',
-                  '<(libchromiumcontent_dir)/libdesktop_capture.a',
                   '<(libchromiumcontent_dir)/libdevice_service.a',
                   '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
                   '<(libchromiumcontent_dir)/libsystem_wrappers.a',
@@ -206,7 +205,6 @@
                 'libraries': [
                   # Following libraries are always linked statically.
                   '<(libchromiumcontent_dir)/libhttp_server.a',
-                  '<(libchromiumcontent_dir)/libdesktop_capture.a',
                   '<(libchromiumcontent_dir)/libdevice_service.a',
                   '<(libchromiumcontent_dir)/libdom_keycode_converter.a',
                   '<(libchromiumcontent_dir)/librtc_base.a',
@@ -345,7 +343,6 @@
                   '<(libchromiumcontent_dir)/sandbox.lib',
                   '<(libchromiumcontent_dir)/sandbox_helper_win.lib',
                   '<(libchromiumcontent_dir)/http_server.lib',
-                  '<(libchromiumcontent_dir)/desktop_capture.lib',
                   '<(libchromiumcontent_dir)/device_service.lib',
                   '<(libchromiumcontent_dir)/dom_keycode_converter.lib',
                   '<(libchromiumcontent_dir)/rtc_base.lib',