diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 17:39:15 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 17:39:15 +0000 |
commit | a164f4156567ca3eda7edd6e1cebfe856c0cd1c0 (patch) | |
tree | c24cd9c5deb837d84965a8b63546579a3d25b911 /media | |
parent | fcc7a32ca3feb781af28e23ad9acb20a66008581 (diff) | |
download | chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.zip chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.tar.gz chromium_src-a164f4156567ca3eda7edd6e1cebfe856c0cd1c0.tar.bz2 |
Rename base::ScopedPtrAlignedFree to AlignedFreeDeleter.
(The new name is consistent with base::FreeDeleter.)
Also, update comments to refer to scoped_ptr rather than the deprecated
scoped_ptr_malloc, and convert scoped_ptr_malloc<...,
ScopedPtrAlignedFree> to scoped_Ptr<..., AlignedFreeDeleter>.
R=brettw@chromium.org, dalecurtis@chromium.org, piman@chromium.org, brettw
TBR=piman, tyoshino
Review URL: https://codereview.chromium.org/167663002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251586 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/audio/win/audio_output_win_unittest.cc | 4 | ||||
-rw-r--r-- | media/base/audio_buffer.h | 2 | ||||
-rw-r--r-- | media/base/audio_bus.h | 2 | ||||
-rw-r--r-- | media/base/audio_bus_unittest.cc | 4 | ||||
-rw-r--r-- | media/base/decoder_buffer.h | 4 | ||||
-rw-r--r-- | media/base/sinc_resampler.h | 8 | ||||
-rw-r--r-- | media/base/vector_math_perftest.cc | 4 | ||||
-rw-r--r-- | media/base/vector_math_unittest.cc | 6 |
8 files changed, 17 insertions, 17 deletions
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc index 72edad6..1003db0 100644 --- a/media/audio/win/audio_output_win_unittest.cc +++ b/media/audio/win/audio_output_win_unittest.cc @@ -597,7 +597,7 @@ class SyncSocketSource : public AudioOutputStream::AudioSourceCallback { private: base::SyncSocket* socket_; int data_size_; - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data_; + scoped_ptr<float, base::AlignedFreeDeleter> data_; scoped_ptr<AudioBus> audio_bus_; }; @@ -620,7 +620,7 @@ DWORD __stdcall SyncSocketThread(void* context) { SyncThreadContext& ctx = *(reinterpret_cast<SyncThreadContext*>(context)); // Setup AudioBus wrapping data we'll pass over the sync socket. - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data(static_cast<float*>( + scoped_ptr<float, base::AlignedFreeDeleter> data(static_cast<float*>( base::AlignedAlloc(ctx.packet_size_bytes, AudioBus::kChannelAlignment))); scoped_ptr<AudioBus> audio_bus = AudioBus::WrapMemory( ctx.channels, ctx.frames, data.get()); diff --git a/media/base/audio_buffer.h b/media/base/audio_buffer.h index c3bcf4d..5d03910 100644 --- a/media/base/audio_buffer.h +++ b/media/base/audio_buffer.h @@ -130,7 +130,7 @@ class MEDIA_EXPORT AudioBuffer base::TimeDelta duration_; // Contiguous block of channel data. - scoped_ptr_malloc<uint8, base::ScopedPtrAlignedFree> data_; + scoped_ptr<uint8, base::AlignedFreeDeleter> data_; // For planar data, points to each channels data. std::vector<uint8*> channel_data_; diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index d1106f5..294cf70 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h @@ -118,7 +118,7 @@ class MEDIA_EXPORT AudioBus { void BuildChannelData(int channels, int aligned_frame, float* data); // Contiguous block of channel memory. - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data_; + scoped_ptr<float, base::AlignedFreeDeleter> data_; std::vector<float*> channel_data_; int frames_; diff --git a/media/base/audio_bus_unittest.cc b/media/base/audio_bus_unittest.cc index e8c78a3..2f1e02c 100644 --- a/media/base/audio_bus_unittest.cc +++ b/media/base/audio_bus_unittest.cc @@ -138,7 +138,7 @@ TEST_F(AudioBusTest, WrapMemory) { AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, kSampleRate, 32, kFrameCount); int data_size = AudioBus::CalculateMemorySize(params); - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data(static_cast<float*>( + scoped_ptr<float, base::AlignedFreeDeleter> data(static_cast<float*>( base::AlignedAlloc(data_size, AudioBus::kChannelAlignment))); // Fill the memory with a test value we can check for after wrapping. @@ -188,7 +188,7 @@ TEST_F(AudioBusTest, CopyTo) { { SCOPED_TRACE("Wrapped Memory"); // Try a copy to an AudioBus wrapping a memory block. - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data( + scoped_ptr<float, base::AlignedFreeDeleter> data( static_cast<float*>(base::AlignedAlloc( AudioBus::CalculateMemorySize(params), AudioBus::kChannelAlignment))); diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h index 393e586..82347bf 100644 --- a/media/base/decoder_buffer.h +++ b/media/base/decoder_buffer.h @@ -148,9 +148,9 @@ class MEDIA_EXPORT DecoderBuffer base::TimeDelta duration_; int size_; - scoped_ptr<uint8, base::ScopedPtrAlignedFree> data_; + scoped_ptr<uint8, base::AlignedFreeDeleter> data_; int side_data_size_; - scoped_ptr<uint8, base::ScopedPtrAlignedFree> side_data_; + scoped_ptr<uint8, base::AlignedFreeDeleter> side_data_; scoped_ptr<DecryptConfig> decrypt_config_; base::TimeDelta discard_padding_; diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h index 2170778..07ecf09 100644 --- a/media/base/sinc_resampler.h +++ b/media/base/sinc_resampler.h @@ -121,12 +121,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::ScopedPtrAlignedFree> kernel_storage_; - scoped_ptr<float[], base::ScopedPtrAlignedFree> kernel_pre_sinc_storage_; - scoped_ptr<float[], base::ScopedPtrAlignedFree> kernel_window_storage_; + scoped_ptr<float[], base::AlignedFreeDeleter> kernel_storage_; + scoped_ptr<float[], base::AlignedFreeDeleter> kernel_pre_sinc_storage_; + scoped_ptr<float[], base::AlignedFreeDeleter> kernel_window_storage_; // Data from the source is copied into this buffer for each processing pass. - scoped_ptr<float[], base::ScopedPtrAlignedFree> input_buffer_; + scoped_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. diff --git a/media/base/vector_math_perftest.cc b/media/base/vector_math_perftest.cc index 9742f2e..6adcfa6 100644 --- a/media/base/vector_math_perftest.cc +++ b/media/base/vector_math_perftest.cc @@ -74,8 +74,8 @@ class VectorMathPerfTest : public testing::Test { } protected: - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> input_vector_; - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> output_vector_; + scoped_ptr<float, base::AlignedFreeDeleter> input_vector_; + scoped_ptr<float, base::AlignedFreeDeleter> output_vector_; DISALLOW_COPY_AND_ASSIGN(VectorMathPerfTest); }; diff --git a/media/base/vector_math_unittest.cc b/media/base/vector_math_unittest.cc index f8278ce..bed6090 100644 --- a/media/base/vector_math_unittest.cc +++ b/media/base/vector_math_unittest.cc @@ -48,8 +48,8 @@ class VectorMathTest : public testing::Test { } protected: - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> input_vector_; - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> output_vector_; + scoped_ptr<float, base::AlignedFreeDeleter> input_vector_; + scoped_ptr<float, base::AlignedFreeDeleter> output_vector_; DISALLOW_COPY_AND_ASSIGN(VectorMathTest); }; @@ -241,7 +241,7 @@ class EWMATestScenario { private: float initial_value_; - scoped_ptr_malloc<float, base::ScopedPtrAlignedFree> data_; + scoped_ptr<float, base::AlignedFreeDeleter> data_; int data_len_; float smoothing_factor_; float expected_final_avg_; |