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

Unified Diff: media/filters/audio_renderer_algorithm.h

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include Created 4 years, 8 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 | « media/filters/audio_file_reader_unittest.cc ('k') | media/filters/audio_renderer_algorithm_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_algorithm.h
diff --git a/media/filters/audio_renderer_algorithm.h b/media/filters/audio_renderer_algorithm.h
index 1cd0e919b89578ce2ffc82eed46e7ce0cafac141..9a476a512ea976626e5321673c5fbd060835e040 100644
--- a/media/filters/audio_renderer_algorithm.h
+++ b/media/filters/audio_renderer_algorithm.h
@@ -23,9 +23,10 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_buffer_queue.h"
@@ -182,29 +183,29 @@ class MEDIA_EXPORT AudioRendererAlgorithm {
// number of requested samples. Furthermore, due to overlap-and-add,
// the last half-window of the output is incomplete, which is stored in this
// buffer.
- scoped_ptr<AudioBus> wsola_output_;
+ std::unique_ptr<AudioBus> wsola_output_;
// Overlap-and-add window.
- scoped_ptr<float[]> ola_window_;
+ std::unique_ptr<float[]> ola_window_;
// Transition window, used to update |optimal_block_| by a weighted sum of
// |optimal_block_| and |target_block_|.
- scoped_ptr<float[]> transition_window_;
+ std::unique_ptr<float[]> transition_window_;
// Auxiliary variables to avoid allocation in every iteration.
// Stores the optimal block in every iteration. This is the most
// similar block to |target_block_| within |search_block_| and it is
// overlap-and-added to |wsola_output_|.
- scoped_ptr<AudioBus> optimal_block_;
+ std::unique_ptr<AudioBus> optimal_block_;
// A block of data that search is performed over to find the |optimal_block_|.
- scoped_ptr<AudioBus> search_block_;
+ std::unique_ptr<AudioBus> search_block_;
// Stores the target block, denoted as |target| above. |search_block_| is
// searched for a block (|optimal_block_|) that is most similar to
// |target_block_|.
- scoped_ptr<AudioBus> target_block_;
+ std::unique_ptr<AudioBus> target_block_;
DISALLOW_COPY_AND_ASSIGN(AudioRendererAlgorithm);
};
« no previous file with comments | « media/filters/audio_file_reader_unittest.cc ('k') | media/filters/audio_renderer_algorithm_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698