webrtc/modules/desktop_capture/screen_capturer_mac.mm - Issue 1910203002: Revert of Modify ScreenCaptureFrameQueue into a template

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/desktop_capture/screen_capturer_mac.mm

Issue 1910203002: Revert of Modify ScreenCaptureFrameQueue into a template (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/desktop_capture/screen_capture_frame_queue.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/desktop_capture/screen_capturer_mac.mm

diff --git a/webrtc/modules/desktop_capture/screen_capturer_mac.mm b/webrtc/modules/desktop_capture/screen_capturer_mac.mm

index 76de59ef103fdcfebe8209d74ca90d2c04bb9391..c41dc4d7a3b4ba59e4ebe6880f1e090dae5386b5 100644

--- a/webrtc/modules/desktop_capture/screen_capturer_mac.mm

+++ b/webrtc/modules/desktop_capture/screen_capturer_mac.mm

@@ -22,7 +22,6 @@

#include <OpenGL/CGLMacro.h>

#include <OpenGL/OpenGL.h>

-#include "webrtc/base/checks.h"

#include "webrtc/base/macutils.h"

#include "webrtc/modules/desktop_capture/desktop_capture_options.h"

#include "webrtc/modules/desktop_capture/desktop_frame.h"

@@ -33,7 +32,6 @@

#include "webrtc/modules/desktop_capture/mac/scoped_pixel_buffer_object.h"

#include "webrtc/modules/desktop_capture/screen_capture_frame_queue.h"

#include "webrtc/modules/desktop_capture/screen_capturer_helper.h"

-#include "webrtc/modules/desktop_capture/shared_desktop_frame.h"

#include "webrtc/system_wrappers/include/logging.h"

#include "webrtc/system_wrappers/include/tick_util.h"

@@ -236,7 +234,7 @@

ScopedPixelBufferObject pixel_buffer_object_;

// Queue of the frames buffers.

- ScreenCaptureFrameQueue<SharedDesktopFrame> queue_;

+ ScreenCaptureFrameQueue queue_;

// Current display configuration.

MacDesktopConfiguration desktop_config_;

@@ -386,7 +384,6 @@

TickTime capture_start_time = TickTime::Now();

queue_.MoveToNextFrame();

- RTC_DCHECK(!queue_.current_frame() || !queue_.current_frame()->IsShared());

desktop_config_monitor_->Lock();

MacDesktopConfiguration new_config =

@@ -408,7 +405,7 @@

// 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()));

+ queue_.ReplaceCurrentFrame(CreateFrame());

DesktopFrame* current_frame = queue_.current_frame();