webrtc/modules/video_processing/frame_preprocessor.h - Issue 1738863002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_*/

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/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, 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/video_capture/test/video_capture_unittest.cc ('k') | webrtc/modules/video_processing/test/brightness_detection_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_processing/frame_preprocessor.h

diff --git a/webrtc/modules/video_processing/frame_preprocessor.h b/webrtc/modules/video_processing/frame_preprocessor.h

index 5bdc576f3712f7f71bdffb5f22ed0942fbd5f05d..6dd3693dbf0f54dd31191044e88568391bc41958 100644

--- a/webrtc/modules/video_processing/frame_preprocessor.h

+++ b/webrtc/modules/video_processing/frame_preprocessor.h

@@ -11,7 +11,8 @@

#ifndef WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_

#define WEBRTC_MODULES_VIDEO_PROCESSING_FRAME_PREPROCESSOR_H_

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

+#include <memory>

#include "webrtc/modules/video_processing/include/video_processing.h"

#include "webrtc/modules/video_processing/content_analysis.h"

#include "webrtc/modules/video_processing/spatial_resampler.h"

@@ -74,7 +75,7 @@ class VPMFramePreprocessor {

VPMSpatialResampler* spatial_resampler_;

VPMContentAnalysis* ca_;

VPMVideoDecimator* vd_;

- rtc::scoped_ptr<VideoDenoiser> denoiser_;

+ std::unique_ptr<VideoDenoiser> denoiser_;

bool enable_ca_;

uint32_t frame_cnt_;

};