cras_output: Fix calculation of bytes per sample.

media/audio/linux/cras_output.cc

 // Copyright (c) 2012 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.
 //
 // The object has one error state: |state_| == kInError.  When |state_| ==
 // kInError, all public API functions will fail with an error (Start() will call
 // the OnError() function on the callback immediately), or no-op themselves with
 // the exception of Close().  Even if an error state has been entered, if Open()
 // has previously returned successfully, Close() must be called.
 
@@ skipping 267 matching lines @@
       latency_ts.tv_nsec / 1000;
 
   uint32 frames_latency = latency_usec * frame_rate_ / 1000000;
   uint32 bytes_latency = frames_latency * bytes_per_frame_;
   DCHECK_EQ(frames, static_cast<size_t>(audio_bus_->frames()));
   int frames_filled = source_callback_->OnMoreData(
       audio_bus_.get(), AudioBuffersState(0, bytes_latency));
   // Note: If this ever changes to output raw float the data must be clipped and
   // sanitized since it may come from an untrusted source such as NaCl.
   audio_bus_->ToInterleaved(
-      frames_filled, bytes_per_frame_ / (frames * num_channels_), buffer);
+      frames_filled, bytes_per_frame_ / num_channels_, buffer);
   return frames_filled;
 }
 
 void CrasOutputStream::NotifyStreamError(int err) {
   // This will remove the stream from the client.
   if (state_ == kIsClosed || state_ == kInError)
     return;  // Don't care about error if we aren't using it.
   TransitionTo(kInError);
   if (source_callback_)
     source_callback_->OnError(this, err);
@@ skipping 33 matching lines @@
     state_ = to;
   }
   return state_;
 }
 
 CrasOutputStream::InternalState CrasOutputStream::state() {
   return state_;
 }
 
 }  // namespace media