Chromium Code Reviews| Index: media/audio/pulse/pulse_util.cc |
| diff --git a/media/audio/pulse/pulse_util.cc b/media/audio/pulse/pulse_util.cc |
| index d5c699a09e28a821fd1e7107ca1cd6be9858d24a..77758d6eca0cb37cfce0925111aacc3563dc25f7 100644 |
| --- a/media/audio/pulse/pulse_util.cc |
| +++ b/media/audio/pulse/pulse_util.cc |
| @@ -8,7 +8,6 @@ |
| #include "base/logging.h" |
| #include "base/macros.h" |
| -#include "base/time/time.h" |
| #include "media/audio/audio_device_description.h" |
| #include "media/base/audio_parameters.h" |
| @@ -136,20 +135,24 @@ void WaitForOperationCompletion(pa_threaded_mainloop* pa_mainloop, |
| pa_operation_unref(operation); |
| } |
| -int GetHardwareLatencyInBytes(pa_stream* stream, |
| - int sample_rate, |
| - int bytes_per_frame) { |
| +base::TimeDelta GetHardwareLatency(pa_stream* stream) { |
| DCHECK(stream); |
| int negative = 0; |
| pa_usec_t latency_micros = 0; |
| if (pa_stream_get_latency(stream, &latency_micros, &negative) != 0) |
| - return 0; |
| + return base::TimeDelta(); |
| if (negative) |
| - return 0; |
| + return base::TimeDelta(); |
| + |
| + return base::TimeDelta::FromMicroseconds(latency_micros); |
| +} |
| - return latency_micros * sample_rate * bytes_per_frame / |
| - base::Time::kMicrosecondsPerSecond; |
| +int GetHardwareLatencyInBytes(pa_stream* stream, |
| + int sample_rate, |
| + int bytes_per_frame) { |
| + DCHECK(stream); |
| + return GetHardwareLatency(stream).InSeconds() * sample_rate * bytes_per_frame; |
|
miu
2016/08/31 23:26:55
s/InSeconds/InSecondsF/ to prevent serious loss of
James West
2016/09/13 07:40:50
Done.
|
| } |
| // Helper macro for CreateInput/OutputStream() to avoid code spam and |