webrtc/modules/desktop_capture/screen_capture_frame_queue.h - Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls.

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_capture_frame_queue.h

Issue 2030333003: Revert of Use std::unique_ptr<> to pass frame ownership in DesktopCapturer impls. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 6 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

Index: webrtc/modules/desktop_capture/screen_capture_frame_queue.h

diff --git a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h

index b7945b0921cc719cd25ccc7f6e35660ec1dbf275..97f3b810e9d64d467e164ce16b53946289c3dcf8 100644

--- a/webrtc/modules/desktop_capture/screen_capture_frame_queue.h

+++ b/webrtc/modules/desktop_capture/screen_capture_frame_queue.h

@@ -49,8 +49,8 @@

// Replaces the current frame with a new one allocated by the caller. The

// existing frame (if any) is destroyed. Takes ownership of |frame|.

- void ReplaceCurrentFrame(std::unique_ptr<FrameType> frame) {

- frames_[current_] = std::move(frame);

+ void ReplaceCurrentFrame(FrameType* frame) {

+ frames_[current_].reset(frame);

}

// Marks all frames obsolete and resets the previous frame pointer. No

« no previous file with comments | « webrtc/modules/desktop_capture/desktop_frame_win.cc ('k') | webrtc/modules/desktop_capture/screen_capturer_mac.mm » ('j') | no next file with comments »