| Index: media/audio/cras/cras_unified.cc
|
| diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc
|
| index ccaf11c604eb06ffba91a91b5f3f9d97d6e52917..46987d05c8a44c4747c8bd4d613df6daac425911 100644
|
| --- a/media/audio/cras/cras_unified.cc
|
| +++ b/media/audio/cras/cras_unified.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/time/time.h"
|
| #include "media/audio/cras/audio_manager_cras.h"
|
|
|
| namespace media {
|
| @@ -61,7 +62,7 @@ CrasUnifiedStream::CrasUnifiedStream(const AudioParameters& params,
|
| source_callback_(NULL),
|
| stream_direction_(CRAS_STREAM_OUTPUT) {
|
| DCHECK(manager_);
|
| - DCHECK(params_.channels() > 0);
|
| + DCHECK_GT(params_.channels(), 0);
|
|
|
| output_bus_ = AudioBus::Create(params);
|
| }
|
| @@ -306,7 +307,7 @@ uint32_t CrasUnifiedStream::WriteAudio(size_t frames,
|
| cras_client_calc_playback_latency(sample_ts, &latency_ts);
|
|
|
| int frames_filled = source_callback_->OnMoreData(
|
| - output_bus_.get(), GetBytesLatency(latency_ts), 0);
|
| + output_bus_.get(), GetBytesLatency(latency_ts), base::TimeDelta(), 0);
|
|
|
| // 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.
|
|
|