Minor changes to ARAB and ARAD necessary for OLA

media/filters/audio_renderer_algorithm_base.cc

Index: media/filters/audio_renderer_algorithm_base.cc
===================================================================
--- media/filters/audio_renderer_algorithm_base.cc	(revision 19669)
+++ media/filters/audio_renderer_algorithm_base.cc	(working copy)
@@ -4,6 +4,8 @@
 
 #include "media/filters/audio_renderer_algorithm_base.h"
 
+#include "media/base/buffers.h"
+
 namespace media {
 
 // The maximum size of the queue, which also acts as the number of initial reads
@@ -17,26 +19,24 @@
 
 AudioRendererAlgorithmBase::AudioRendererAlgorithmBase()
     : channels_(0),
-      sample_rate_(0),
-      sample_bits_(0),
+      sample_bytes_(0),
       playback_rate_(0.0f) {
 }
 
 AudioRendererAlgorithmBase::~AudioRendererAlgorithmBase() {}
 
 void AudioRendererAlgorithmBase::Initialize(int channels,
-                                            int sample_rate,
                                             int sample_bits,
                                             float initial_playback_rate,
                                             RequestReadCallback* callback) {
   DCHECK_GT(channels, 0);
-  DCHECK_GT(sample_rate, 0);
   DCHECK_GT(sample_bits, 0);
   DCHECK(callback);
+  // We only support 8, 16, 32 bit audio.
+  DCHECK_EQ(sample_bits % 8, 0)
 
   channels_ = channels;
-  sample_rate_ = sample_rate;
-  sample_bits_ = sample_bits;
+  sample_bytes_ = sample_bits / 8;

[fbarchard, 2009/06/30 23:42:18]

More of a nit/FYI...
As these are signed integers, this can generate more than you'd hope.  A sign
check, and branch for handling of negatives. Same with % 8.  Or sometimes the
compile will just do the divide instruction for new CPUs, because its optimized
for divide by power of 2... 1 cycle per log2(value).
If/when you care about code size/performance, then sample_bits & 7 and
samples_bits >> 3 will produce a single instruction.
Or you can use unsigned int, or for visual C, the assume() directive.

   request_read_callback_.reset(callback);
 
   set_playback_rate(initial_playback_rate);
@@ -84,12 +84,8 @@
   return channels_;
 }
 
-int AudioRendererAlgorithmBase::sample_rate() {
-  return sample_rate_;
+int AudioRendererAlgorithmBase::sample_bytes() {
+  return sample_bytes_;
 }
 
-int AudioRendererAlgorithmBase::sample_bits() {
-  return sample_bits_;
-}
-
 }  // namespace media