From 78266db427f10761ce86fc9d85ebdf1c61641f38 Mon Sep 17 00:00:00 2001 From: Samuel Attard Date: Tue, 19 Dec 2017 11:56:21 +1100 Subject: [PATCH] Fix webrtc linking issues --- brightray/brightray.gyp | 4 ++-- .../chrome/browser/media/native_desktop_media_list.cc | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/brightray/brightray.gyp b/brightray/brightray.gyp index 63ceb3e8a0c4..1a224f7eb53b 100644 --- a/brightray/brightray.gyp +++ b/brightray/brightray.gyp @@ -111,7 +111,7 @@ '<(libchromiumcontent_dir)/libdom_keycode_converter.a', '<(libchromiumcontent_dir)/libsystem_wrappers.a', '<(libchromiumcontent_dir)/librtc_base.a', - '<(libchromiumcontent_dir)/librtc_base_approved.a', + '<(libchromiumcontent_dir)/librtc_base_generic.a', '<(libchromiumcontent_dir)/libwebrtc_common.a', '<(libchromiumcontent_dir)/libinit_webrtc.a', '<(libchromiumcontent_dir)/libyuv.a', @@ -194,7 +194,7 @@ '<(libchromiumcontent_dir)/libdesktop_capture.a', '<(libchromiumcontent_dir)/libdom_keycode_converter.a', '<(libchromiumcontent_dir)/librtc_base.a', - '<(libchromiumcontent_dir)/librtc_base_approved.a', + '<(libchromiumcontent_dir)/librtc_base_generic.a', '<(libchromiumcontent_dir)/libsystem_wrappers.a', '<(libchromiumcontent_dir)/libwebrtc_common.a', '<(libchromiumcontent_dir)/libinit_webrtc.a', diff --git a/chromium_src/chrome/browser/media/native_desktop_media_list.cc b/chromium_src/chrome/browser/media/native_desktop_media_list.cc index 8b95d53dcd87..4a201adaf039 100644 --- a/chromium_src/chrome/browser/media/native_desktop_media_list.cc +++ b/chromium_src/chrome/browser/media/native_desktop_media_list.cc @@ -29,8 +29,6 @@ using base::PlatformThreadRef; using content::BrowserThread; using content::DesktopMediaID; -extern "C" uint32_t SuperFastHash(const char* data, int len); - namespace { // Update the list every second. @@ -40,7 +38,7 @@ const int kDefaultUpdatePeriod = 1000; // media source has changed. uint32_t GetFrameHash(webrtc::DesktopFrame* frame) { int data_size = frame->stride() * frame->size().height(); - return SuperFastHash(reinterpret_cast(frame->data()), data_size); + return base::Hash(frame->data(), data_size); } gfx::ImageSkia ScaleDesktopFrame(std::unique_ptr frame,