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

Unified Diff: webrtc/modules/audio_processing/audio_buffer.h

Issue 1710483002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_processing/ (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
Index: webrtc/modules/audio_processing/audio_buffer.h
diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/webrtc/modules/audio_processing/audio_buffer.h
index ff12ca2d954b630e3df6b4fb4e40f55ab04bdd16..928f0a43be7a7080722ac675b8e9395b709779a4 100644
--- a/webrtc/modules/audio_processing/audio_buffer.h
+++ b/webrtc/modules/audio_processing/audio_buffer.h
@@ -11,7 +11,8 @@
#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
#define WEBRTC_MODULES_AUDIO_PROCESSING_AUDIO_BUFFER_H_
-#include "webrtc/base/scoped_ptr.h"
+#include <memory>
+
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/audio_processing/splitting_filter.h"
@@ -146,14 +147,14 @@ class AudioBuffer {
AudioFrame::VADActivity activity_;
const float* keyboard_data_;
- rtc::scoped_ptr<IFChannelBuffer> data_;
- rtc::scoped_ptr<IFChannelBuffer> split_data_;
- rtc::scoped_ptr<SplittingFilter> splitting_filter_;
- rtc::scoped_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
- rtc::scoped_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
- rtc::scoped_ptr<IFChannelBuffer> input_buffer_;
- rtc::scoped_ptr<IFChannelBuffer> output_buffer_;
- rtc::scoped_ptr<ChannelBuffer<float> > process_buffer_;
+ std::unique_ptr<IFChannelBuffer> data_;
+ std::unique_ptr<IFChannelBuffer> split_data_;
+ std::unique_ptr<SplittingFilter> splitting_filter_;
+ std::unique_ptr<ChannelBuffer<int16_t> > mixed_low_pass_channels_;
+ std::unique_ptr<ChannelBuffer<int16_t> > low_pass_reference_channels_;
+ std::unique_ptr<IFChannelBuffer> input_buffer_;
+ std::unique_ptr<IFChannelBuffer> output_buffer_;
+ std::unique_ptr<ChannelBuffer<float> > process_buffer_;
ScopedVector<PushSincResampler> input_resamplers_;
ScopedVector<PushSincResampler> output_resamplers_;
};
« no previous file with comments | « webrtc/modules/audio_processing/agc/histogram_unittest.cc ('k') | webrtc/modules/audio_processing/audio_processing_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698