Switch the input code to use AudioBlockFifo

media/base/audio_block_fifo.cc

 // Copyright 2014 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/base/audio_block_fifo.h"
 
 #include "base/logging.h"
 
 namespace media {
 
@@ skipping 26 matching lines @@
   while (frames_to_push) {
     // Get the current write block.
     AudioBus* current_block = audio_blocks_[write_block_];
 
     // Figure out what segment sizes we need when adding the new content to
     // the FIFO.
     const int push_frames =
         std::min(block_frames_ - write_pos_, frames_to_push);
 
     // Deinterleave the content to the FIFO and update the |write_pos_|.
-    current_block->FromInterleaved(source_ptr, push_frames, bytes_per_sample);
+    current_block->FromInterleavedPartial(source_ptr, write_pos_, push_frames,

[DaleCurtis, 2014/07/18 18:21:54]

Whoops.  Is this style clang-format approved?

[no longer working on chromium, 2014/07/21 15:13:30]

Fixed.

+                                          bytes_per_sample);
     write_pos_ = (write_pos_ + push_frames) % block_frames_;
     if (!write_pos_) {
       // The current block is completely filled, increment |write_block_| and
       // |available_blocks_|.
       write_block_ = (write_block_ + 1) % audio_blocks_.size();
       ++available_blocks_;
     }
 
     source_ptr += push_frames * bytes_per_sample * current_block->channels();
     frames_to_push -= push_frames;
+    DCHECK_GE(frames_to_push, 0);
   }
 }
 
 const AudioBus* AudioBlockFifo::Consume() {
   DCHECK(available_blocks_);
   AudioBus* audio_bus = audio_blocks_[read_block_];
   read_block_ = (read_block_ + 1) % audio_blocks_.size();
   --available_blocks_;
   return audio_bus;
 }
 
 void AudioBlockFifo::Clear() {
   write_pos_ = 0;
   write_block_ = 0;
   read_block_ = 0;
   available_blocks_ = 0;
 }
 
 int AudioBlockFifo::GetUnfilledFrames() const {
   const int unfilled_frames =
       (audio_blocks_.size() - available_blocks_) * block_frames_ - write_pos_;
   DCHECK_GE(unfilled_frames, 0);
   return unfilled_frames;
 }
 
 }  // namespace media