diff options
Diffstat (limited to 'third_party/libwebrtc/moz-patch-stack/0009.patch')
| -rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0009.patch | 842 |
1 files changed, 842 insertions, 0 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0009.patch b/third_party/libwebrtc/moz-patch-stack/0009.patch new file mode 100644 index 0000000000..9d2bd64f02 --- /dev/null +++ b/third_party/libwebrtc/moz-patch-stack/0009.patch @@ -0,0 +1,842 @@ +From: Dan Minor <dminor@mozilla.com> +Date: Tue, 31 Jul 2018 13:32:00 -0400 +Subject: Bug 1376873 - OS X desktop capture fixes; r=pehrsons + +Differential Revision: https://phabricator.services.mozilla.com/D7464 +Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/02c038eca65c1218b56fdf8937fdeab3d8767fe6 +--- + .../desktop_capture/mac/screen_capturer_mac.h | 7 + + .../mac/screen_capturer_mac.mm | 4 +- + .../mouse_cursor_monitor_mac.mm | 2 +- + .../desktop_capture/screen_capturer_mac.mm | 766 ++++++++++++++++++ + 4 files changed, 777 insertions(+), 2 deletions(-) + create mode 100644 modules/desktop_capture/screen_capturer_mac.mm + +diff --git a/modules/desktop_capture/mac/screen_capturer_mac.h b/modules/desktop_capture/mac/screen_capturer_mac.h +index d9a5966efa..7be05cc639 100644 +--- a/modules/desktop_capture/mac/screen_capturer_mac.h ++++ b/modules/desktop_capture/mac/screen_capturer_mac.h +@@ -114,6 +114,13 @@ class ScreenCapturerMac final : public DesktopCapturer { + + // Start, CaptureFrame and destructor have to called in the same thread. + SequenceChecker thread_checker_; ++ ++ // Used to force CaptureFrame to update it's screen configuration ++ // and reregister event handlers. This ensure that this ++ // occurs on the ScreenCapture thread. Read and written from ++ // both the VideoCapture thread and ScreenCapture thread. ++ // Protected by desktop_config_monitor_. ++ bool update_screen_configuration_ = false; + }; + + } // namespace webrtc +diff --git a/modules/desktop_capture/mac/screen_capturer_mac.mm b/modules/desktop_capture/mac/screen_capturer_mac.mm +index 634849122e..115f6440b1 100644 +--- a/modules/desktop_capture/mac/screen_capturer_mac.mm ++++ b/modules/desktop_capture/mac/screen_capturer_mac.mm +@@ -182,6 +182,7 @@ void ScreenCapturerMac::Start(Callback* callback) { + "webrtc", "ScreenCapturermac::Start", "target display id ", current_display_); + + callback_ = callback; ++ update_screen_configuration_ = false; + // Start and operate CGDisplayStream handler all from capture thread. + if (!RegisterRefreshAndMoveHandlers()) { + RTC_LOG(LS_ERROR) << "Failed to register refresh and move handlers."; +@@ -202,7 +203,8 @@ void ScreenCapturerMac::CaptureFrame() { + } + + MacDesktopConfiguration new_config = desktop_config_monitor_->desktop_configuration(); +- if (!desktop_config_.Equals(new_config)) { ++ if (update_screen_configuration_ || !desktop_config_.Equals(new_config)) { ++ update_screen_configuration_ = false; + desktop_config_ = new_config; + // If the display configuraiton has changed then refresh capturer data + // structures. Occasionally, the refresh and move handlers are lost when +diff --git a/modules/desktop_capture/mouse_cursor_monitor_mac.mm b/modules/desktop_capture/mouse_cursor_monitor_mac.mm +index 3db4332cd1..512103ab5e 100644 +--- a/modules/desktop_capture/mouse_cursor_monitor_mac.mm ++++ b/modules/desktop_capture/mouse_cursor_monitor_mac.mm +@@ -133,7 +133,7 @@ void MouseCursorMonitorMac::CaptureImage(float scale) { + NSSize nssize = [nsimage size]; // DIP size + + // No need to caputre cursor image if it's unchanged since last capture. +- if ([[nsimage TIFFRepresentation] isEqual:[last_cursor_ TIFFRepresentation]]) return; ++ if (last_cursor_ && [[nsimage TIFFRepresentation] isEqual:[last_cursor_ TIFFRepresentation]]) return; + last_cursor_ = nsimage; + + DesktopSize size(round(nssize.width * scale), +diff --git a/modules/desktop_capture/screen_capturer_mac.mm b/modules/desktop_capture/screen_capturer_mac.mm +new file mode 100644 +index 0000000000..285086ffa6 +--- /dev/null ++++ b/modules/desktop_capture/screen_capturer_mac.mm +@@ -0,0 +1,766 @@ ++/* ++ * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. ++ * ++ * Use of this source code is governed by a BSD-style license ++ * that can be found in the LICENSE file in the root of the source ++ * tree. An additional intellectual property rights grant can be found ++ * in the file PATENTS. All contributing project authors may ++ * be found in the AUTHORS file in the root of the source tree. ++ */ ++ ++#include <stddef.h> ++ ++#include <memory> ++#include <set> ++#include <utility> ++ ++#include <ApplicationServices/ApplicationServices.h> ++#include <Cocoa/Cocoa.h> ++#include <CoreGraphics/CoreGraphics.h> ++ ++#include "modules/desktop_capture/desktop_capture_options.h" ++#include "modules/desktop_capture/desktop_capturer.h" ++#include "modules/desktop_capture/desktop_frame.h" ++#include "modules/desktop_capture/desktop_geometry.h" ++#include "modules/desktop_capture/desktop_region.h" ++#include "modules/desktop_capture/mac/desktop_configuration.h" ++#include "modules/desktop_capture/mac/desktop_configuration_monitor.h" ++#include "modules/desktop_capture/mac/scoped_pixel_buffer_object.h" ++#include "modules/desktop_capture/screen_capture_frame_queue.h" ++#include "modules/desktop_capture/screen_capturer_helper.h" ++#include "modules/desktop_capture/shared_desktop_frame.h" ++#include "rtc_base/checks.h" ++#include "rtc_base/constructormagic.h" ++#include "rtc_base/logging.h" ++#include "rtc_base/macutils.h" ++#include "rtc_base/timeutils.h" ++ ++namespace webrtc { ++ ++namespace { ++ ++// CGDisplayStreamRefs need to be destroyed asynchronously after receiving a ++// kCGDisplayStreamFrameStatusStopped callback from CoreGraphics. This may ++// happen after the ScreenCapturerMac has been destroyed. DisplayStreamManager ++// is responsible for destroying all extant CGDisplayStreamRefs, and will ++// destroy itself once it's done. ++class DisplayStreamManager { ++ public: ++ int GetUniqueId() { return ++unique_id_generator_; } ++ void DestroyStream(int unique_id) { ++ auto it = display_stream_wrappers_.find(unique_id); ++ RTC_CHECK(it != display_stream_wrappers_.end()); ++ RTC_CHECK(!it->second.active); ++ CFRelease(it->second.stream); ++ display_stream_wrappers_.erase(it); ++ ++ if (ready_for_self_destruction_ && display_stream_wrappers_.empty()) ++ delete this; ++ } ++ ++ void SaveStream(int unique_id, ++ CGDisplayStreamRef stream) { ++ RTC_CHECK(unique_id <= unique_id_generator_); ++ DisplayStreamWrapper wrapper; ++ wrapper.stream = stream; ++ display_stream_wrappers_[unique_id] = wrapper; ++ } ++ ++ void UnregisterActiveStreams() { ++ for (auto& pair : display_stream_wrappers_) { ++ DisplayStreamWrapper& wrapper = pair.second; ++ if (wrapper.active) { ++ wrapper.active = false; ++ CFRunLoopSourceRef source = ++ CGDisplayStreamGetRunLoopSource(wrapper.stream); ++ CFRunLoopRemoveSource(CFRunLoopGetCurrent(), source, ++ kCFRunLoopCommonModes); ++ CGDisplayStreamStop(wrapper.stream); ++ } ++ } ++ } ++ ++ void PrepareForSelfDestruction() { ++ ready_for_self_destruction_ = true; ++ ++ if (display_stream_wrappers_.empty()) ++ delete this; ++ } ++ ++ // Once the DisplayStreamManager is ready for destruction, the ++ // ScreenCapturerMac is no longer present. Any updates should be ignored. ++ bool ShouldIgnoreUpdates() { return ready_for_self_destruction_; } ++ ++ private: ++ struct DisplayStreamWrapper { ++ // The registered CGDisplayStreamRef. ++ CGDisplayStreamRef stream = nullptr; ++ ++ // Set to false when the stream has been stopped. An asynchronous callback ++ // from CoreGraphics will let us destroy the CGDisplayStreamRef. ++ bool active = true; ++ }; ++ ++ std::map<int, DisplayStreamWrapper> display_stream_wrappers_; ++ int unique_id_generator_ = 0; ++ bool ready_for_self_destruction_ = false; ++}; ++ ++// Standard Mac displays have 72dpi, but we report 96dpi for ++// consistency with Windows and Linux. ++const int kStandardDPI = 96; ++ ++// Scales all coordinates of a rect by a specified factor. ++DesktopRect ScaleAndRoundCGRect(const CGRect& rect, float scale) { ++ return DesktopRect::MakeLTRB( ++ static_cast<int>(floor(rect.origin.x * scale)), ++ static_cast<int>(floor(rect.origin.y * scale)), ++ static_cast<int>(ceil((rect.origin.x + rect.size.width) * scale)), ++ static_cast<int>(ceil((rect.origin.y + rect.size.height) * scale))); ++} ++ ++// Copy pixels in the |rect| from |src_place| to |dest_plane|. |rect| should be ++// relative to the origin of |src_plane| and |dest_plane|. ++void CopyRect(const uint8_t* src_plane, ++ int src_plane_stride, ++ uint8_t* dest_plane, ++ int dest_plane_stride, ++ int bytes_per_pixel, ++ const DesktopRect& rect) { ++ // Get the address of the starting point. ++ const int src_y_offset = src_plane_stride * rect.top(); ++ const int dest_y_offset = dest_plane_stride * rect.top(); ++ const int x_offset = bytes_per_pixel * rect.left(); ++ src_plane += src_y_offset + x_offset; ++ dest_plane += dest_y_offset + x_offset; ++ ++ // Copy pixels in the rectangle line by line. ++ const int bytes_per_line = bytes_per_pixel * rect.width(); ++ const int height = rect.height(); ++ for (int i = 0 ; i < height; ++i) { ++ memcpy(dest_plane, src_plane, bytes_per_line); ++ src_plane += src_plane_stride; ++ dest_plane += dest_plane_stride; ++ } ++} ++ ++// Returns an array of CGWindowID for all the on-screen windows except ++// |window_to_exclude|, or NULL if the window is not found or it fails. The ++// caller should release the returned CFArrayRef. ++CFArrayRef CreateWindowListWithExclusion(CGWindowID window_to_exclude) { ++ if (!window_to_exclude) ++ return nullptr; ++ ++ CFArrayRef all_windows = CGWindowListCopyWindowInfo( ++ kCGWindowListOptionOnScreenOnly, kCGNullWindowID); ++ if (!all_windows) ++ return nullptr; ++ ++ CFMutableArrayRef returned_array = ++ CFArrayCreateMutable(nullptr, CFArrayGetCount(all_windows), nullptr); ++ ++ bool found = false; ++ for (CFIndex i = 0; i < CFArrayGetCount(all_windows); ++i) { ++ CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>( ++ CFArrayGetValueAtIndex(all_windows, i)); ++ ++ CFNumberRef id_ref = reinterpret_cast<CFNumberRef>( ++ CFDictionaryGetValue(window, kCGWindowNumber)); ++ ++ CGWindowID id; ++ CFNumberGetValue(id_ref, kCFNumberIntType, &id); ++ if (id == window_to_exclude) { ++ found = true; ++ continue; ++ } ++ CFArrayAppendValue(returned_array, reinterpret_cast<void *>(id)); ++ } ++ CFRelease(all_windows); ++ ++ if (!found) { ++ CFRelease(returned_array); ++ returned_array = nullptr; ++ } ++ return returned_array; ++} ++ ++// Returns the bounds of |window| in physical pixels, enlarged by a small amount ++// on four edges to take account of the border/shadow effects. ++DesktopRect GetExcludedWindowPixelBounds(CGWindowID window, ++ float dip_to_pixel_scale) { ++ // The amount of pixels to add to the actual window bounds to take into ++ // account of the border/shadow effects. ++ static const int kBorderEffectSize = 20; ++ CGRect rect; ++ CGWindowID ids[1]; ++ ids[0] = window; ++ ++ CFArrayRef window_id_array = ++ CFArrayCreate(nullptr, reinterpret_cast<const void**>(&ids), 1, nullptr); ++ CFArrayRef window_array = ++ CGWindowListCreateDescriptionFromArray(window_id_array); ++ ++ if (CFArrayGetCount(window_array) > 0) { ++ CFDictionaryRef window = reinterpret_cast<CFDictionaryRef>( ++ CFArrayGetValueAtIndex(window_array, 0)); ++ CFDictionaryRef bounds_ref = reinterpret_cast<CFDictionaryRef>( ++ CFDictionaryGetValue(window, kCGWindowBounds)); ++ CGRectMakeWithDictionaryRepresentation(bounds_ref, &rect); ++ } ++ ++ CFRelease(window_id_array); ++ CFRelease(window_array); ++ ++ rect.origin.x -= kBorderEffectSize; ++ rect.origin.y -= kBorderEffectSize; ++ rect.size.width += kBorderEffectSize * 2; ++ rect.size.height += kBorderEffectSize * 2; ++ // |rect| is in DIP, so convert to physical pixels. ++ return ScaleAndRoundCGRect(rect, dip_to_pixel_scale); ++} ++ ++// Create an image of the given region using the given |window_list|. ++// |pixel_bounds| should be in the primary display's coordinate in physical ++// pixels. The caller should release the returned CGImageRef and CFDataRef. ++CGImageRef CreateExcludedWindowRegionImage(const DesktopRect& pixel_bounds, ++ float dip_to_pixel_scale, ++ CFArrayRef window_list) { ++ CGRect window_bounds; ++ // The origin is in DIP while the size is in physical pixels. That's what ++ // CGWindowListCreateImageFromArray expects. ++ window_bounds.origin.x = pixel_bounds.left() / dip_to_pixel_scale; ++ window_bounds.origin.y = pixel_bounds.top() / dip_to_pixel_scale; ++ window_bounds.size.width = pixel_bounds.width(); ++ window_bounds.size.height = pixel_bounds.height(); ++ ++ return CGWindowListCreateImageFromArray( ++ window_bounds, window_list, kCGWindowImageDefault); ++} ++ ++// A class to perform video frame capturing for mac. ++class ScreenCapturerMac : public DesktopCapturer { ++ public: ++ explicit ScreenCapturerMac( ++ rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor, ++ bool detect_updated_region); ++ ~ScreenCapturerMac() override; ++ ++ bool Init(); ++ ++ // DesktopCapturer interface. ++ void Start(Callback* callback) override; ++ void CaptureFrame() override; ++ void SetExcludedWindow(WindowId window) override; ++ bool GetSourceList(SourceList* screens) override; ++ bool SelectSource(SourceId id) override; ++ ++ private: ++ // Returns false if the selected screen is no longer valid. ++ bool CgBlit(const DesktopFrame& frame, const DesktopRegion& region); ++ ++ // Called when the screen configuration is changed. ++ void ScreenConfigurationChanged(); ++ ++ bool RegisterRefreshAndMoveHandlers(); ++ void UnregisterRefreshAndMoveHandlers(); ++ ++ void ScreenRefresh(CGRectCount count, ++ const CGRect *rect_array, ++ DesktopVector display_origin); ++ void ReleaseBuffers(); ++ ++ std::unique_ptr<DesktopFrame> CreateFrame(); ++ ++ const bool detect_updated_region_; ++ ++ Callback* callback_ = nullptr; ++ ++ ScopedPixelBufferObject pixel_buffer_object_; ++ ++ // Queue of the frames buffers. ++ ScreenCaptureFrameQueue<SharedDesktopFrame> queue_; ++ ++ // Current display configuration. ++ MacDesktopConfiguration desktop_config_; ++ ++ // Currently selected display, or 0 if the full desktop is selected. On OS X ++ // 10.6 and before, this is always 0. ++ CGDirectDisplayID current_display_ = 0; ++ ++ // The physical pixel bounds of the current screen. ++ DesktopRect screen_pixel_bounds_; ++ ++ // The dip to physical pixel scale of the current screen. ++ float dip_to_pixel_scale_ = 1.0f; ++ ++ // A thread-safe list of invalid rectangles, and the size of the most ++ // recently captured screen. ++ ScreenCapturerHelper helper_; ++ ++ // Contains an invalid region from the previous capture. ++ DesktopRegion last_invalid_region_; ++ ++ // Monitoring display reconfiguration. ++ rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor_; ++ ++ CGWindowID excluded_window_ = 0; ++ ++ // A self-owned object that will destroy itself after ScreenCapturerMac and ++ // all display streams have been destroyed.. ++ DisplayStreamManager* display_stream_manager_; ++ ++ // Used to force CaptureFrame to update it's screen configuration ++ // and reregister event handlers. This ensure that this ++ // occurs on the ScreenCapture thread. Read and written from ++ // both the VideoCapture thread and ScreenCapture thread. ++ // Protected by desktop_config_monitor_. ++ bool update_screen_configuration_ = false; ++ ++ RTC_DISALLOW_COPY_AND_ASSIGN(ScreenCapturerMac); ++}; ++ ++// DesktopFrame wrapper that flips wrapped frame upside down by inverting ++// stride. ++class InvertedDesktopFrame : public DesktopFrame { ++ public: ++ InvertedDesktopFrame(std::unique_ptr<DesktopFrame> frame) ++ : DesktopFrame( ++ frame->size(), ++ -frame->stride(), ++ frame->data() + (frame->size().height() - 1) * frame->stride(), ++ frame->shared_memory()) { ++ original_frame_ = std::move(frame); ++ MoveFrameInfoFrom(original_frame_.get()); ++ } ++ ~InvertedDesktopFrame() override {} ++ ++ private: ++ std::unique_ptr<DesktopFrame> original_frame_; ++ ++ RTC_DISALLOW_COPY_AND_ASSIGN(InvertedDesktopFrame); ++}; ++ ++ScreenCapturerMac::ScreenCapturerMac( ++ rtc::scoped_refptr<DesktopConfigurationMonitor> desktop_config_monitor, ++ bool detect_updated_region) ++ : detect_updated_region_(detect_updated_region), ++ desktop_config_monitor_(desktop_config_monitor) { ++ display_stream_manager_ = new DisplayStreamManager; ++} ++ ++ScreenCapturerMac::~ScreenCapturerMac() { ++ ReleaseBuffers(); ++ UnregisterRefreshAndMoveHandlers(); ++ display_stream_manager_->PrepareForSelfDestruction(); ++} ++ ++bool ScreenCapturerMac::Init() { ++ desktop_config_monitor_->Lock(); ++ desktop_config_ = desktop_config_monitor_->desktop_configuration(); ++ desktop_config_monitor_->Unlock(); ++ if (!RegisterRefreshAndMoveHandlers()) { ++ return false; ++ } ++ ScreenConfigurationChanged(); ++ return true; ++} ++ ++void ScreenCapturerMac::ReleaseBuffers() { ++ // The buffers might be in use by the encoder, so don't delete them here. ++ // Instead, mark them as "needs update"; next time the buffers are used by ++ // the capturer, they will be recreated if necessary. ++ queue_.Reset(); ++} ++ ++void ScreenCapturerMac::Start(Callback* callback) { ++ assert(!callback_); ++ assert(callback); ++ ++ callback_ = callback; ++ desktop_config_monitor_->Lock(); ++ update_screen_configuration_ = true; ++ desktop_config_monitor_->Unlock(); ++} ++ ++void ScreenCapturerMac::CaptureFrame() { ++ int64_t capture_start_time_nanos = rtc::TimeNanos(); ++ ++ // Spin RunLoop for 1/100th of a second, handling at most one source ++ CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.01, true); ++ ++ queue_.MoveToNextFrame(); ++ RTC_DCHECK(!queue_.current_frame() || !queue_.current_frame()->IsShared()); ++ ++ desktop_config_monitor_->Lock(); ++ MacDesktopConfiguration new_config = ++ desktop_config_monitor_->desktop_configuration(); ++ if (update_screen_configuration_ || !desktop_config_.Equals(new_config)) { ++ update_screen_configuration_ = false; ++ desktop_config_ = new_config; ++ // If the display configuraiton has changed then refresh capturer data ++ // structures. Occasionally, the refresh and move handlers are lost when ++ // the screen mode changes, so re-register them here. ++ UnregisterRefreshAndMoveHandlers(); ++ RegisterRefreshAndMoveHandlers(); ++ ScreenConfigurationChanged(); ++ } ++ ++ DesktopRegion region; ++ helper_.TakeInvalidRegion(®ion); ++ ++ // If the current buffer is from an older generation then allocate a new one. ++ // Note that we can't reallocate other buffers at this point, since the caller ++ // may still be reading from them. ++ if (!queue_.current_frame()) ++ queue_.ReplaceCurrentFrame(SharedDesktopFrame::Wrap(CreateFrame())); ++ ++ DesktopFrame* current_frame = queue_.current_frame(); ++ ++ if (!CgBlit(*current_frame, region)) { ++ desktop_config_monitor_->Unlock(); ++ callback_->OnCaptureResult(Result::ERROR_PERMANENT, nullptr); ++ return; ++ } ++ std::unique_ptr<DesktopFrame> new_frame = queue_.current_frame()->Share(); ++ if (detect_updated_region_) { ++ *new_frame->mutable_updated_region() = region; ++ } else { ++ new_frame->mutable_updated_region()->AddRect( ++ DesktopRect::MakeSize(new_frame->size())); ++ } ++ ++ if (current_display_) { ++ const MacDisplayConfiguration* config = ++ desktop_config_.FindDisplayConfigurationById(current_display_); ++ if (config) { ++ new_frame->set_top_left(config->bounds.top_left().subtract( ++ desktop_config_.bounds.top_left())); ++ } ++ } ++ ++ helper_.set_size_most_recent(new_frame->size()); ++ ++ // Signal that we are done capturing data from the display framebuffer, ++ // and accessing display structures. ++ desktop_config_monitor_->Unlock(); ++ ++ new_frame->set_capture_time_ms((rtc::TimeNanos() - capture_start_time_nanos) / ++ rtc::kNumNanosecsPerMillisec); ++ callback_->OnCaptureResult(Result::SUCCESS, std::move(new_frame)); ++} ++ ++void ScreenCapturerMac::SetExcludedWindow(WindowId window) { ++ excluded_window_ = window; ++} ++ ++bool ScreenCapturerMac::GetSourceList(SourceList* screens) { ++ assert(screens->size() == 0); ++ ++ for (MacDisplayConfigurations::iterator it = desktop_config_.displays.begin(); ++ it != desktop_config_.displays.end(); ++it) { ++ screens->push_back({it->id}); ++ } ++ return true; ++} ++ ++bool ScreenCapturerMac::SelectSource(SourceId id) { ++ if (id == kFullDesktopScreenId) { ++ current_display_ = 0; ++ } else { ++ const MacDisplayConfiguration* config = ++ desktop_config_.FindDisplayConfigurationById( ++ static_cast<CGDirectDisplayID>(id)); ++ if (!config) ++ return false; ++ current_display_ = config->id; ++ } ++ ++ ScreenConfigurationChanged(); ++ return true; ++} ++ ++bool ScreenCapturerMac::CgBlit(const DesktopFrame& frame, const DesktopRegion& region) { ++ // Copy the entire contents of the previous capture buffer, to capture over. ++ // TODO(wez): Get rid of this as per crbug.com/145064, or implement ++ // crbug.com/92354. ++ if (queue_.previous_frame()) { ++ memcpy(frame.data(), queue_.previous_frame()->data(), ++ frame.stride() * frame.size().height()); ++ } ++ ++ MacDisplayConfigurations displays_to_capture; ++ if (current_display_) { ++ // Capturing a single screen. Note that the screen id may change when ++ // screens are added or removed. ++ const MacDisplayConfiguration* config = ++ desktop_config_.FindDisplayConfigurationById(current_display_); ++ if (config) { ++ displays_to_capture.push_back(*config); ++ } else { ++ RTC_LOG(LS_ERROR) << "The selected screen cannot be found for capturing."; ++ return false; ++ } ++ } else { ++ // Capturing the whole desktop. ++ displays_to_capture = desktop_config_.displays; ++ } ++ ++ // Create the window list once for all displays. ++ CFArrayRef window_list = CreateWindowListWithExclusion(excluded_window_); ++ ++ for (size_t i = 0; i < displays_to_capture.size(); ++i) { ++ const MacDisplayConfiguration& display_config = displays_to_capture[i]; ++ ++ // Capturing mixed-DPI on one surface is hard, so we only return displays ++ // that match the "primary" display's DPI. The primary display is always ++ // the first in the list. ++ if (i > 0 && display_config.dip_to_pixel_scale != ++ displays_to_capture[0].dip_to_pixel_scale) { ++ continue; ++ } ++ // Determine the display's position relative to the desktop, in pixels. ++ DesktopRect display_bounds = display_config.pixel_bounds; ++ display_bounds.Translate(-screen_pixel_bounds_.left(), ++ -screen_pixel_bounds_.top()); ++ ++ // Determine which parts of the blit region, if any, lay within the monitor. ++ DesktopRegion copy_region = region; ++ copy_region.IntersectWith(display_bounds); ++ if (copy_region.is_empty()) ++ continue; ++ ++ // Translate the region to be copied into display-relative coordinates. ++ copy_region.Translate(-display_bounds.left(), -display_bounds.top()); ++ ++ DesktopRect excluded_window_bounds; ++ CGImageRef excluded_image = nullptr; ++ if (excluded_window_ && window_list) { ++ // Get the region of the excluded window relative the primary display. ++ excluded_window_bounds = GetExcludedWindowPixelBounds( ++ excluded_window_, display_config.dip_to_pixel_scale); ++ excluded_window_bounds.IntersectWith(display_config.pixel_bounds); ++ ++ // Create the image under the excluded window first, because it's faster ++ // than captuing the whole display. ++ if (!excluded_window_bounds.is_empty()) { ++ excluded_image = CreateExcludedWindowRegionImage( ++ excluded_window_bounds, display_config.dip_to_pixel_scale, ++ window_list); ++ } ++ } ++ ++ // Create an image containing a snapshot of the display. ++ CGImageRef image = CGDisplayCreateImage(display_config.id); ++ if (!image) { ++ if (excluded_image) ++ CFRelease(excluded_image); ++ continue; ++ } ++ ++ // Verify that the image has 32-bit depth. ++ int bits_per_pixel = CGImageGetBitsPerPixel(image); ++ if (bits_per_pixel / 8 != DesktopFrame::kBytesPerPixel) { ++ RTC_LOG(LS_ERROR) << "CGDisplayCreateImage() returned imaged with " << bits_per_pixel ++ << " bits per pixel. Only 32-bit depth is supported."; ++ CFRelease(image); ++ if (excluded_image) ++ CFRelease(excluded_image); ++ return false; ++ } ++ ++ // Request access to the raw pixel data via the image's DataProvider. ++ CGDataProviderRef provider = CGImageGetDataProvider(image); ++ CFDataRef data = CGDataProviderCopyData(provider); ++ assert(data); ++ ++ const uint8_t* display_base_address = CFDataGetBytePtr(data); ++ int src_bytes_per_row = CGImageGetBytesPerRow(image); ++ ++ // |image| size may be different from display_bounds in case the screen was ++ // resized recently. ++ copy_region.IntersectWith( ++ DesktopRect::MakeWH(CGImageGetWidth(image), CGImageGetHeight(image))); ++ ++ // Copy the dirty region from the display buffer into our desktop buffer. ++ uint8_t* out_ptr = frame.GetFrameDataAtPos(display_bounds.top_left()); ++ for (DesktopRegion::Iterator i(copy_region); !i.IsAtEnd(); i.Advance()) { ++ CopyRect(display_base_address, src_bytes_per_row, out_ptr, frame.stride(), ++ DesktopFrame::kBytesPerPixel, i.rect()); ++ } ++ ++ CFRelease(data); ++ CFRelease(image); ++ ++ if (excluded_image) { ++ CGDataProviderRef provider = CGImageGetDataProvider(excluded_image); ++ CFDataRef excluded_image_data = CGDataProviderCopyData(provider); ++ assert(excluded_image_data); ++ display_base_address = CFDataGetBytePtr(excluded_image_data); ++ src_bytes_per_row = CGImageGetBytesPerRow(excluded_image); ++ ++ // Translate the bounds relative to the desktop, because |frame| data ++ // starts from the desktop top-left corner. ++ DesktopRect window_bounds_relative_to_desktop(excluded_window_bounds); ++ window_bounds_relative_to_desktop.Translate(-screen_pixel_bounds_.left(), ++ -screen_pixel_bounds_.top()); ++ ++ DesktopRect rect_to_copy = ++ DesktopRect::MakeSize(excluded_window_bounds.size()); ++ rect_to_copy.IntersectWith(DesktopRect::MakeWH( ++ CGImageGetWidth(excluded_image), CGImageGetHeight(excluded_image))); ++ ++ if (CGImageGetBitsPerPixel(excluded_image) / 8 == ++ DesktopFrame::kBytesPerPixel) { ++ CopyRect(display_base_address, src_bytes_per_row, ++ frame.GetFrameDataAtPos( ++ window_bounds_relative_to_desktop.top_left()), ++ frame.stride(), DesktopFrame::kBytesPerPixel, rect_to_copy); ++ } ++ ++ CFRelease(excluded_image_data); ++ CFRelease(excluded_image); ++ } ++ } ++ if (window_list) ++ CFRelease(window_list); ++ return true; ++} ++ ++void ScreenCapturerMac::ScreenConfigurationChanged() { ++ if (current_display_) { ++ const MacDisplayConfiguration* config = ++ desktop_config_.FindDisplayConfigurationById(current_display_); ++ screen_pixel_bounds_ = config ? config->pixel_bounds : DesktopRect(); ++ dip_to_pixel_scale_ = config ? config->dip_to_pixel_scale : 1.0f; ++ } else { ++ screen_pixel_bounds_ = desktop_config_.pixel_bounds; ++ dip_to_pixel_scale_ = desktop_config_.dip_to_pixel_scale; ++ } ++ ++ // Release existing buffers, which will be of the wrong size. ++ ReleaseBuffers(); ++ ++ // Clear the dirty region, in case the display is down-sizing. ++ helper_.ClearInvalidRegion(); ++ ++ // Re-mark the entire desktop as dirty. ++ helper_.InvalidateScreen(screen_pixel_bounds_.size()); ++ ++ // Make sure the frame buffers will be reallocated. ++ queue_.Reset(); ++} ++ ++bool ScreenCapturerMac::RegisterRefreshAndMoveHandlers() { ++ desktop_config_ = desktop_config_monitor_->desktop_configuration(); ++ for (const auto& config : desktop_config_.displays) { ++ size_t pixel_width = config.pixel_bounds.width(); ++ size_t pixel_height = config.pixel_bounds.height(); ++ if (pixel_width == 0 || pixel_height == 0) ++ continue; ++ // Using a local variable forces the block to capture the raw pointer. ++ DisplayStreamManager* manager = display_stream_manager_; ++ int unique_id = manager->GetUniqueId(); ++ CGDirectDisplayID display_id = config.id; ++ DesktopVector display_origin = config.pixel_bounds.top_left(); ++ ++ CGDisplayStreamFrameAvailableHandler handler = ++ ^(CGDisplayStreamFrameStatus status, uint64_t display_time, ++ IOSurfaceRef frame_surface, CGDisplayStreamUpdateRef updateRef) { ++ if (status == kCGDisplayStreamFrameStatusStopped) { ++ manager->DestroyStream(unique_id); ++ return; ++ } ++ ++ if (manager->ShouldIgnoreUpdates()) ++ return; ++ ++ // Only pay attention to frame updates. ++ if (status != kCGDisplayStreamFrameStatusFrameComplete) ++ return; ++ ++ size_t count = 0; ++ const CGRect* rects = CGDisplayStreamUpdateGetRects( ++ updateRef, kCGDisplayStreamUpdateDirtyRects, &count); ++ if (count != 0) { ++ // According to CGDisplayStream.h, it's safe to call ++ // CGDisplayStreamStop() from within the callback. ++ ScreenRefresh(count, rects, display_origin); ++ } ++ }; ++ CGDisplayStreamRef display_stream = CGDisplayStreamCreate( ++ display_id, pixel_width, pixel_height, 'BGRA', nullptr, handler); ++ ++ if (display_stream) { ++ CGError error = CGDisplayStreamStart(display_stream); ++ if (error != kCGErrorSuccess) ++ return false; ++ ++ CFRunLoopSourceRef source = ++ CGDisplayStreamGetRunLoopSource(display_stream); ++ CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopCommonModes); ++ display_stream_manager_->SaveStream(unique_id, display_stream); ++ } ++ } ++ ++ return true; ++} ++ ++void ScreenCapturerMac::UnregisterRefreshAndMoveHandlers() { ++ display_stream_manager_->UnregisterActiveStreams(); ++} ++ ++void ScreenCapturerMac::ScreenRefresh(CGRectCount count, ++ const CGRect* rect_array, ++ DesktopVector display_origin) { ++ if (screen_pixel_bounds_.is_empty()) ++ ScreenConfigurationChanged(); ++ ++ // The refresh rects are in display coordinates. We want to translate to ++ // framebuffer coordinates. If a specific display is being captured, then no ++ // change is necessary. If all displays are being captured, then we want to ++ // translate by the origin of the display. ++ DesktopVector translate_vector; ++ if (!current_display_) ++ translate_vector = display_origin; ++ ++ DesktopRegion region; ++ for (CGRectCount i = 0; i < count; ++i) { ++ // All rects are already in physical pixel coordinates. ++ DesktopRect rect = DesktopRect::MakeXYWH( ++ rect_array[i].origin.x, rect_array[i].origin.y, ++ rect_array[i].size.width, rect_array[i].size.height); ++ ++ rect.Translate(translate_vector); ++ ++ region.AddRect(rect); ++ } ++ ++ helper_.InvalidateRegion(region); ++} ++ ++std::unique_ptr<DesktopFrame> ScreenCapturerMac::CreateFrame() { ++ std::unique_ptr<DesktopFrame> frame( ++ new BasicDesktopFrame(screen_pixel_bounds_.size())); ++ frame->set_dpi(DesktopVector(kStandardDPI * dip_to_pixel_scale_, ++ kStandardDPI * dip_to_pixel_scale_)); ++ return frame; ++} ++ ++} // namespace ++ ++// static ++std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer( ++ const DesktopCaptureOptions& options) { ++ if (!options.configuration_monitor()) ++ return nullptr; ++ ++ std::unique_ptr<ScreenCapturerMac> capturer(new ScreenCapturerMac( ++ options.configuration_monitor(), options.detect_updated_region())); ++ if (!capturer.get()->Init()) { ++ return nullptr; ++ } ++ ++ return capturer; ++} ++ ++} // namespace webrtc +-- +2.34.1 + |