Upgrade AudioBus to support wrapping, interleaving.

media/filters/audio_renderer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/audio_renderer_impl.h"
 
 #include <math.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 336 matching lines @@
   int bytes_per_frame = audio_parameters_.GetBytesPerFrame();
 
   const int buf_size = audio_bus->frames() * bytes_per_frame;
   scoped_array<uint8> buf(new uint8[buf_size]);
 
   int frames_filled = FillBuffer(buf.get(), audio_bus->frames(), request_delay);
   int bytes_filled = frames_filled * bytes_per_frame;
   DCHECK_LE(bytes_filled, buf_size);
   UpdateEarliestEndTime(bytes_filled, request_delay, base::Time::Now());
 
-  // Deinterleave each audio channel.
-  int channels = audio_bus->channels();
-  for (int channel_index = 0; channel_index < channels; ++channel_index) {
-    media::DeinterleaveAudioChannel(buf.get(),
-                                    audio_bus->channel(channel_index),
-                                    channels,
-                                    channel_index,
-                                    bytes_per_frame / channels,
-                                    frames_filled);
+  // Deinterleave audio data into the output bus.
+  audio_bus->FromInterleaved(
+      buf.get(), frames_filled, audio_parameters_.bits_per_sample() / 8);
 
-    // If FillBuffer() didn't give us enough data then zero out the remainder.
-    if (frames_filled < audio_bus->frames()) {
-      int frames_to_zero = audio_bus->frames() - frames_filled;
-      memset(audio_bus->channel(channel_index) + frames_filled, 0,
-             sizeof(*audio_bus->channel(channel_index)) * frames_to_zero);
-    }
-  }
   return frames_filled;
 }
 
 uint32 AudioRendererImpl::FillBuffer(uint8* dest,
                                      uint32 requested_frames,
                                      const base::TimeDelta& playback_delay) {
   base::TimeDelta current_time = kNoTimestamp();
   base::TimeDelta max_time = kNoTimestamp();
 
   size_t frames_written = 0;
@@ skipping 147 matching lines @@
     case kUnderflow:
     case kRebuffering:
     case kStopped:
       if (status != PIPELINE_OK)
         error_cb_.Run(status);
       return;
   }
 }
 
 }  // namespace media