diff options
Diffstat (limited to 'chromium/media/base/audio_bus.h')
| -rw-r--r-- | chromium/media/base/audio_bus.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chromium/media/base/audio_bus.h b/chromium/media/base/audio_bus.h index d1106f558ef..c5b161f0236 100644 --- a/chromium/media/base/audio_bus.h +++ b/chromium/media/base/audio_bus.h @@ -104,10 +104,13 @@ class MEDIA_EXPORT AudioBus { // is provided, no adjustment is done. void Scale(float volume); - private: - friend struct base::DefaultDeleter<AudioBus>; - ~AudioBus(); + // Swaps channels identified by |a| and |b|. The caller needs to make sure + // the channels are valid. + void SwapChannels(int a, int b); + + virtual ~AudioBus(); + private: AudioBus(int channels, int frames); AudioBus(int channels, int frames, float* data); AudioBus(int frames, const std::vector<float*>& channel_data); @@ -118,7 +121,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_; |