Simplified AudioOutputStream interface.

media/audio/mac/audio_input_mac.cc

 // Copyright (c) 2010 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/audio/mac/audio_input_mac.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/audio/audio_util.h"
 #include "media/audio/mac/audio_manager_mac.h"
 
 #if !defined(MAC_OS_X_VERSION_10_6) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 enum {
   kAudioQueueErr_EnqueueDuringReset = -66632
 };
 #endif
 
 PCMQueueInAudioInputStream::PCMQueueInAudioInputStream(
-    AudioManagerMac* manager,
-    AudioParameters params,
-    int samples_per_buffer)
+    AudioManagerMac* manager, AudioParameters params)
     : manager_(manager),
       callback_(NULL),
       audio_queue_(NULL),
       buffer_size_bytes_(0) {
   // We must have a manager.
   DCHECK(manager_);
   // A frame is one sample across all channels. In interleaved audio the per
   // frame fields identify the set of n |channels|. In uncompressed audio, a
   // packet is always one frame.
   format_.mSampleRate = params.sample_rate;
   format_.mFormatID = kAudioFormatLinearPCM;
   format_.mFormatFlags = kLinearPCMFormatFlagIsPacked |
                          kLinearPCMFormatFlagIsSignedInteger;
   format_.mBitsPerChannel = params.bits_per_sample;
   format_.mChannelsPerFrame = params.channels;
   format_.mFramesPerPacket = 1;
   format_.mBytesPerPacket = (params.bits_per_sample * params.channels) / 8;
   format_.mBytesPerFrame = format_.mBytesPerPacket;
 
-  buffer_size_bytes_ = format_.mBytesPerFrame * samples_per_buffer;
+  buffer_size_bytes_ = params.GetPacketSize();
 }
 
 PCMQueueInAudioInputStream::~PCMQueueInAudioInputStream() {
   DCHECK(!callback_);
   DCHECK(!audio_queue_);
 }
 
 bool PCMQueueInAudioInputStream::Open() {
   OSStatus err = AudioQueueNewInput(&format_,
                                     &HandleInputBufferStatic,
@@ skipping 118 matching lines @@
       // TODO(joth): PCMQueueOutAudioOutputStream uses callback_ to provide an
       // extra guard for this situation, but it seems to introduce more
       // complications than it solves (memory barrier issues accessing it from
       // multiple threads, looses the means to indicate OnClosed to client).
       // Should determine if we need to do something equivalent here.
       return;
     }
     HandleError(err);
   }
 }