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

Side by Side Diff: webrtc/media/base/videoframefactory.h

Issue 1728503002: Replace scoped_ptr with unique_ptr in webrtc/media/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up1
Patch Set: Created 4 years, 10 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
« no previous file with comments | « webrtc/media/base/videoframe_unittest.h ('k') | webrtc/media/base/videoframefactory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_ 11 #ifndef WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_
12 #define WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_ 12 #define WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/media/base/videoframe.h" 16 #include "webrtc/media/base/videoframe.h"
16 17
17 namespace cricket { 18 namespace cricket {
18 19
19 struct CapturedFrame; 20 struct CapturedFrame;
20 class VideoFrame; 21 class VideoFrame;
21 22
22 // Creates cricket::VideoFrames, or a subclass of cricket::VideoFrame 23 // Creates cricket::VideoFrames, or a subclass of cricket::VideoFrame
23 // depending on the subclass of VideoFrameFactory. 24 // depending on the subclass of VideoFrameFactory.
24 class VideoFrameFactory { 25 class VideoFrameFactory {
(...skipping 21 matching lines...) Expand all
46 int output_height) const; 47 int output_height) const;
47 48
48 void SetApplyRotation(bool enable) { apply_rotation_ = enable; } 49 void SetApplyRotation(bool enable) { apply_rotation_ = enable; }
49 50
50 protected: 51 protected:
51 bool apply_rotation_; 52 bool apply_rotation_;
52 53
53 private: 54 private:
54 // An internal frame buffer to avoid reallocations. It is mutable because it 55 // An internal frame buffer to avoid reallocations. It is mutable because it
55 // does not affect behaviour, only performance. 56 // does not affect behaviour, only performance.
56 mutable rtc::scoped_ptr<VideoFrame> output_frame_; 57 mutable std::unique_ptr<VideoFrame> output_frame_;
57 }; 58 };
58 59
59 } // namespace cricket 60 } // namespace cricket
60 61
61 #endif // WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_ 62 #endif // WEBRTC_MEDIA_BASE_VIDEOFRAMEFACTORY_H_
OLDNEW
« no previous file with comments | « webrtc/media/base/videoframe_unittest.h ('k') | webrtc/media/base/videoframefactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698