webrtc/common_audio/resampler/push_sinc_resampler.h - Issue 1712513002: Replace scoped_ptr with unique_ptr in webrtc/common_audio/

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/common_audio/resampler/push_sinc_resampler.h

Issue 1712513002: Replace scoped_ptr with unique_ptr in webrtc/common_audio/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

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/common_audio/resampler/include/push_resampler.h ('k') | webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/common_audio/resampler/push_sinc_resampler.h

diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/webrtc/common_audio/resampler/push_sinc_resampler.h

index cefc62aa2a9eb27a78530e8364f7f4be847baefd..2ba60cac9c428a4c8b6f7a1d34eaaf674e6c9c58 100644

--- a/webrtc/common_audio/resampler/push_sinc_resampler.h

+++ b/webrtc/common_audio/resampler/push_sinc_resampler.h

@@ -11,8 +11,9 @@

#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_

#define WEBRTC_COMMON_AUDIO_RESAMPLER_PUSH_SINC_RESAMPLER_H_

+#include <memory>

#include "webrtc/base/constructormagic.h"

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

#include "webrtc/common_audio/resampler/sinc_resampler.h"

#include "webrtc/typedefs.h"

@@ -56,8 +57,8 @@ class PushSincResampler : public SincResamplerCallback {

friend class PushSincResamplerTest;

SincResampler* get_resampler_for_testing() { return resampler_.get(); }

- rtc::scoped_ptr<SincResampler> resampler_;

- rtc::scoped_ptr<float[]> float_buffer_;

+ std::unique_ptr<SincResampler> resampler_;

+ std::unique_ptr<float[]> float_buffer_;

const float* source_ptr_;

const int16_t* source_ptr_int_;

const size_t destination_frames_;