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

Unified Diff: media/base/sinc_resampler.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-media-base: . 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
Index: media/base/sinc_resampler.h
diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h
index f320633235168d03314a52ae8220c66a5faeeb9f..afbd2abc9cc4e6513b7b8ebbefd2db0457652e34 100644
--- a/media/base/sinc_resampler.h
+++ b/media/base/sinc_resampler.h
@@ -5,11 +5,12 @@
#ifndef MEDIA_BASE_SINC_RESAMPLER_H_
#define MEDIA_BASE_SINC_RESAMPLER_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/aligned_memory.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "media/base/media_export.h"
@@ -134,12 +135,12 @@ class MEDIA_EXPORT SincResampler {
// Contains kKernelOffsetCount kernels back-to-back, each of size kKernelSize.
// The kernel offsets are sub-sample shifts of a windowed sinc shifted from
// 0.0 to 1.0 sample.
- scoped_ptr<float[], base::AlignedFreeDeleter> kernel_storage_;
- scoped_ptr<float[], base::AlignedFreeDeleter> kernel_pre_sinc_storage_;
- scoped_ptr<float[], base::AlignedFreeDeleter> kernel_window_storage_;
+ std::unique_ptr<float[], base::AlignedFreeDeleter> kernel_storage_;
+ std::unique_ptr<float[], base::AlignedFreeDeleter> kernel_pre_sinc_storage_;
+ std::unique_ptr<float[], base::AlignedFreeDeleter> kernel_window_storage_;
// Data from the source is copied into this buffer for each processing pass.
- scoped_ptr<float[], base::AlignedFreeDeleter> input_buffer_;
+ std::unique_ptr<float[], base::AlignedFreeDeleter> input_buffer_;
// Pointers to the various regions inside |input_buffer_|. See the diagram at
// the top of the .cc file for more information.

Powered by Google App Engine
This is Rietveld 408576698