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

Side by Side Diff: webrtc/modules/video_processing/frame_preprocessor.h

Issue 1738863002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up4
Patch Set: rebase Created 4 years, 9 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_ 11 #ifndef WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
12 #define WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_ 12 #define WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
13 13
14 #include "webrtc/base/scoped_ptr.h" 14 #include <memory>
15
15 #include "webrtc/modules/video_processing/include/video_processing.h" 16 #include "webrtc/modules/video_processing/include/video_processing.h"
16 #include "webrtc/modules/video_processing/content_analysis.h" 17 #include "webrtc/modules/video_processing/content_analysis.h"
17 #include "webrtc/modules/video_processing/spatial_resampler.h" 18 #include "webrtc/modules/video_processing/spatial_resampler.h"
18 #include "webrtc/modules/video_processing/video_decimator.h" 19 #include "webrtc/modules/video_processing/video_decimator.h"
19 #include "webrtc/typedefs.h" 20 #include "webrtc/typedefs.h"
20 #include "webrtc/video_frame.h" 21 #include "webrtc/video_frame.h"
21 22
22 namespace webrtc { 23 namespace webrtc {
23 24
24 class VideoDenoiser; 25 class VideoDenoiser;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 // The content does not change so much every frame, so to reduce complexity 68 // The content does not change so much every frame, so to reduce complexity
68 // we can compute new content metrics every |kSkipFrameCA| frames. 69 // we can compute new content metrics every |kSkipFrameCA| frames.
69 enum { kSkipFrameCA = 2 }; 70 enum { kSkipFrameCA = 2 };
70 71
71 VideoContentMetrics* content_metrics_; 72 VideoContentMetrics* content_metrics_;
72 VideoFrame denoised_frame_; 73 VideoFrame denoised_frame_;
73 VideoFrame resampled_frame_; 74 VideoFrame resampled_frame_;
74 VPMSpatialResampler* spatial_resampler_; 75 VPMSpatialResampler* spatial_resampler_;
75 VPMContentAnalysis* ca_; 76 VPMContentAnalysis* ca_;
76 VPMVideoDecimator* vd_; 77 VPMVideoDecimator* vd_;
77 rtc::scoped_ptr<VideoDenoiser> denoiser_; 78 std::unique_ptr<VideoDenoiser> denoiser_;
78 bool enable_ca_; 79 bool enable_ca_;
79 uint32_t frame_cnt_; 80 uint32_t frame_cnt_;
80 }; 81 };
81 82
82 } // namespace webrtc 83 } // namespace webrtc
83 84
84 #endif // WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_ 85 #endif // WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698