Pass delay and timestamp to AudioSourceCallback::OnMoreData.

media/audio/pulse/pulse_util.cc

+

[chcunningham, 2016/07/29 01:21:09]

space

[jameswest, 2016/08/26 02:08:47]

Done.

 // 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.
 
 #include "media/audio/pulse/pulse_util.h"
 
 #include <stdint.h>
 
 #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"
 
 namespace media {
 
 namespace pulse {
 
 namespace {
 
 #if defined(GOOGLE_CHROME_BUILD)
@@ skipping 107 matching lines @@
     DLOG(WARNING) << "Operation is NULL";
     return;
   }
 
   while (pa_operation_get_state(operation) == PA_OPERATION_RUNNING)
     pa_threaded_mainloop_wait(pa_mainloop);
 
   pa_operation_unref(operation);
 }
 
+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 base::TimeDelta();
+
+  if (negative)
+    return base::TimeDelta();
+
+  return base::TimeDelta::FromMicroseconds(latency_micros);
+}
+
 int GetHardwareLatencyInBytes(pa_stream* stream,
                               int sample_rate,
                               int bytes_per_frame) {
   DCHECK(stream);
-  int negative = 0;
-  pa_usec_t latency_micros = 0;
-  if (pa_stream_get_latency(stream, &latency_micros, &negative) != 0)
-    return 0;
-
-  if (negative)
-    return 0;
-
-  return latency_micros * sample_rate * bytes_per_frame /
-      base::Time::kMicrosecondsPerSecond;
+  return GetHardwareLatency(stream).InSeconds() * sample_rate * bytes_per_frame;
 }
 
 // Helper macro for CreateInput/OutputStream() to avoid code spam and
 // string bloat.
 #define RETURN_ON_FAILURE(expression, message) do { \
   if (!(expression)) { \
     DLOG(ERROR) << message; \
     return false; \
   } \
 } while (0)
@@ skipping 190 matching lines @@
   }
 
   return true;
 }
 
 #undef RETURN_ON_FAILURE
 
 }  // namespace pulse
 
 }  // namespace media