Merge 264918 "Fix the output request size for AudioBufferConvert..."

media/base/audio_buffer_converter.h

 // 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.
 
 #ifndef MEDIA_BASE_AUDIO_BUFFER_CONVERTER
 #define MEDIA_BASE_AUDIO_BUFFER_CONVERTER
 
 #include <deque>
 
 #include "base/memory/ref_counted.h"
@@ skipping 24 matching lines @@
   // This should only be called this is HasNextBuffer() returns true.
   scoped_refptr<AudioBuffer> GetNextBuffer();
 
   // Reset internal state.
   void Reset();
 
   // Reset internal timestamp state. Upon the next AddInput() call, our base
   // timestamp will be set to match the input buffer.
   void ResetTimestampState();
 
+  int input_buffer_size_for_testing() const {
+    return input_params_.frames_per_buffer();
+  }
+  int input_frames_left_for_testing() const {
+    return input_frames_;
+  }
+
  private:
   // Callback to provide data to the AudioConverter
   virtual double ProvideInput(AudioBus* audio_bus,
                               base::TimeDelta buffer_delay) OVERRIDE;
 
   // Reset the converter in response to a configuration change.
   void ResetConverter(const scoped_refptr<AudioBuffer>& input_buffer);
 
   // Perform conversion if we have enough data.
   void ConvertIfPossible();
@@ skipping 37 matching lines @@
   // full AudioBuses in ProvideInput()?
   bool is_flushing_;
 
   // The AudioConverter which does the real work here.
   scoped_ptr<AudioConverter> audio_converter_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_BUFFER_CONVERTER