Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(514)

Side by Side Diff: webrtc/modules/desktop_capture/cropped_desktop_frame.cc

Issue 1988783003: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include <memory> 11 #include <memory>
12 12
13 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h" 13 #include "webrtc/modules/desktop_capture/cropped_desktop_frame.h"
14 14
15 #include "webrtc/base/constructormagic.h" 15 #include "webrtc/base/constructormagic.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 // A DesktopFrame that is a sub-rect of another DesktopFrame. 19 // A DesktopFrame that is a sub-rect of another DesktopFrame.
20 class CroppedDesktopFrame : public DesktopFrame { 20 class CroppedDesktopFrame : public DesktopFrame {
21 public: 21 public:
22 CroppedDesktopFrame(DesktopFrame* frame, const DesktopRect& rect); 22 CroppedDesktopFrame(std::unique_ptr<DesktopFrame> frame,
23 const DesktopRect& rect);
23 24
24 private: 25 private:
25 std::unique_ptr<DesktopFrame> frame_; 26 std::unique_ptr<DesktopFrame> frame_;
26 27
27 RTC_DISALLOW_COPY_AND_ASSIGN(CroppedDesktopFrame); 28 RTC_DISALLOW_COPY_AND_ASSIGN(CroppedDesktopFrame);
28 }; 29 };
29 30
30 DesktopFrame* 31 std::unique_ptr<DesktopFrame> CreateCroppedDesktopFrame(
31 CreateCroppedDesktopFrame(DesktopFrame* frame, const DesktopRect& rect) { 32 std::unique_ptr<DesktopFrame> frame,
32 if (!DesktopRect::MakeSize(frame->size()).ContainsRect(rect)) { 33 const DesktopRect& rect) {
33 delete frame; 34 if (!DesktopRect::MakeSize(frame->size()).ContainsRect(rect))
34 return NULL; 35 return nullptr;
35 }
36 36
37 return new CroppedDesktopFrame(frame, rect); 37 return std::unique_ptr<DesktopFrame>(
38 new CroppedDesktopFrame(std::move(frame), rect));
38 } 39 }
39 40
40 CroppedDesktopFrame::CroppedDesktopFrame(DesktopFrame* frame, 41 CroppedDesktopFrame::CroppedDesktopFrame(std::unique_ptr<DesktopFrame> frame,
41 const DesktopRect& rect) 42 const DesktopRect& rect)
42 : DesktopFrame(rect.size(), 43 : DesktopFrame(rect.size(),
43 frame->stride(), 44 frame->stride(),
44 frame->GetFrameDataAtPos(rect.top_left()), 45 frame->GetFrameDataAtPos(rect.top_left()),
45 frame->shared_memory()), 46 frame->shared_memory()) {
46 frame_(frame) { 47 frame_ = std::move(frame);
47 } 48 }
48 49
49 } // namespace webrtc 50 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/cropped_desktop_frame.h ('k') | webrtc/modules/desktop_capture/cropping_window_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698