diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-23 16:39:15 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-23 16:39:15 +0100 |
| commit | 3551c9c881056c480085172ff9840cab31610854 (patch) | |
| tree | 23660320f5f4c279966609cf9da7491b96d10ca8 /media/base/audio_buffer.cc | |
| parent | 4e9d9adbbb6cf287125ca44a0823791a570472f5 (diff) | |
| download | chromium_org-3551c9c881056c480085172ff9840cab31610854.tar.gz | |
Merge from Chromium at DEPS revision r219274
This commit was generated by merge_to_master.py.
Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
Diffstat (limited to 'media/base/audio_buffer.cc')
| -rw-r--r-- | media/base/audio_buffer.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/media/base/audio_buffer.cc b/media/base/audio_buffer.cc index b2cdd8c41a..0bf37209b2 100644 --- a/media/base/audio_buffer.cc +++ b/media/base/audio_buffer.cc @@ -11,11 +11,6 @@ namespace media { -// Alignment of each channel's data; this must match what ffmpeg expects -// (which may be 0, 16, or 32, depending on the processor). Selecting 32 in -// order to work on all processors. -enum { kChannelAlignment = 32 }; - AudioBuffer::AudioBuffer(SampleFormat sample_format, int channel_count, int frame_count, @@ -73,6 +68,8 @@ AudioBuffer::AudioBuffer(SampleFormat sample_format, data_size *= channel_count; data_.reset( static_cast<uint8*>(base::AlignedAlloc(data_size, kChannelAlignment))); + channel_data_.reserve(1); + channel_data_.push_back(data_.get()); if (data) memcpy(data_.get(), data[0], data_size); } |