Simplified AudioOutputStream interface.

media/audio/linux/alsa_input.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/linux/alsa_input.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
@@ skipping 10 matching lines @@
 
 const char kDefaultDevice1[] = "default";
 const char kDefaultDevice2[] = "plug:default";
 
 }  // namespace
 
 const char* AlsaPcmInputStream::kAutoSelectDevice = "";
 
 AlsaPcmInputStream::AlsaPcmInputStream(const std::string& device_name,
                                        const AudioParameters& params,
-                                       int samples_per_packet,
                                        AlsaWrapper* wrapper)
     : device_name_(device_name),
       params_(params),
-      samples_per_packet_(samples_per_packet),
-      bytes_per_packet_(samples_per_packet_ *
+      bytes_per_packet_(params.samples_per_packet *
                         (params.channels * params.bits_per_sample) / 8),
       wrapper_(wrapper),
       packet_duration_ms_(
-          (samples_per_packet_ * base::Time::kMillisecondsPerSecond) /
+          (params.samples_per_packet * base::Time::kMillisecondsPerSecond) /
           params.sample_rate),
       callback_(NULL),
       device_handle_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {
 }
 
 AlsaPcmInputStream::~AlsaPcmInputStream() {}
 
 bool AlsaPcmInputStream::Open() {
   if (device_handle_)
@@ skipping 89 matching lines @@
 
 void AlsaPcmInputStream::ReadAudio() {
   DCHECK(callback_);
 
   snd_pcm_sframes_t frames = wrapper_->PcmAvailUpdate(device_handle_);
   if (frames < 0) {  // Potentially recoverable error?
     LOG(WARNING) << "PcmAvailUpdate(): " << wrapper_->StrError(frames);
     Recover(frames);
   }
 
-  if (frames < samples_per_packet_) {
+  if (frames < params_.samples_per_packet) {
     // Not enough data yet or error happened. In both cases wait for a very
     // small duration before checking again.
     MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         task_factory_.NewRunnableMethod(&AlsaPcmInputStream::ReadAudio),
         kNoAudioReadAgainTimeoutMs);
     return;
   }
 
-  int num_packets = frames / samples_per_packet_;
+  int num_packets = frames / params_.samples_per_packet;
   while (num_packets--) {
     int frames_read = wrapper_->PcmReadi(device_handle_, audio_packet_.get(),
-                                         samples_per_packet_);
-    if (frames_read == samples_per_packet_) {
+                                         params_.samples_per_packet);
+    if (frames_read == params_.samples_per_packet) {
       callback_->OnData(this, audio_packet_.get(), bytes_per_packet_);
     } else {
       LOG(WARNING) << "PcmReadi returning less than expected frames: "
-                   << frames_read << " vs. " << samples_per_packet_
+                   << frames_read << " vs. " << params_.samples_per_packet
                    << ". Dropping this packet.";
     }
   }
 
   next_read_time_ += base::TimeDelta::FromMilliseconds(packet_duration_ms_);
   int64 delay_ms = (next_read_time_ - base::Time::Now()).InMilliseconds();
   if (delay_ms < 0) {
     LOG(WARNING) << "Audio read callback behind schedule by "
                  << (packet_duration_ms_ - delay_ms) << " (ms).";
     delay_ms = 0;
@@ skipping 27 matching lines @@
 
   audio_packet_.reset();
   device_handle_ = NULL;
   callback_->OnClose(this);
 }
 
 void AlsaPcmInputStream::HandleError(const char* method, int error) {
   LOG(WARNING) << method << ": " << wrapper_->StrError(error);
   callback_->OnError(this, error);
 }
-