Specify time units (us) in time members of

media::Audio[In|Out]putBufferParameters member name changed to: AudioInputBufferParameters::capture_time_us; AudioOutputBufferParameters::delay_us; AudioOutputBufferParameters::delay_timestamp_us; R=raymes@chromium.org, tommi@chromium.org Bug: 802212 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Change-Id: I95b3205087e04b9508760d6bc4cc9fb88456c5b0 Reviewed-on: https://chromium-review.googlesource.com/977249 Reviewed-by: Raymes Khoury <raymes@chromium.org> Reviewed-by: Olga Sharonova <olka@chromium.org> Commit-Queue: Olga Sharonova <olka@chromium.org> Cr-Commit-Position: refs/heads/master@{#545788}
cbchan · Mar 26, 2018 · 058bf2f · 058bf2f
1 parent 5604466
commit 058bf2f
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -494,6 +494,7 @@ Li Yin <li.yin@intel.com>
 Lidwine Genevet <lgenevet@cisco.com>
 Lingyun Cai <lingyun.cai@intel.com>
 Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+Lizhi Fan <lizhi.fan@samsung.com>
 Loo Rong Jie <loorongjie@gmail.com>
 Lorenzo Stoakes <lstoakes@gmail.com>
 Lu Guanqun <guanqun.lu@gmail.com>

diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc
@@ -472,7 +472,7 @@ void AudioInputDevice::AudioThreadCallback::Process(uint32_t pending_data) {
   // TODO(olka, tommi): Take advantage of |capture_time| in the renderer.
   const base::TimeTicks capture_time =
       base::TimeTicks() +
-      base::TimeDelta::FromMicroseconds(buffer->params.capture_time);
+      base::TimeDelta::FromMicroseconds(buffer->params.capture_time_us);
   const base::TimeTicks now_time = base::TimeTicks::Now();
   DCHECK_GE(now_time, capture_time);
 

diff --git a/media/audio/audio_input_sync_writer.cc b/media/audio/audio_input_sync_writer.cc
@@ -349,7 +349,7 @@ void AudioInputSyncWriter::WriteParametersToCurrentSegment(
   buffer->params.volume = volume;
   buffer->params.size = audio_bus_memory_size_;
   buffer->params.key_pressed = key_pressed;
-  buffer->params.capture_time =
+  buffer->params.capture_time_us =
       (capture_time - base::TimeTicks()).InMicroseconds();
   buffer->params.id = next_buffer_id_;
 }

diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
@@ -523,11 +523,11 @@ void AudioOutputDevice::AudioThreadCallback::Process(uint32_t control_signal) {
   buffer->params.frames_skipped = 0;
 
   base::TimeDelta delay =
-      base::TimeDelta::FromMicroseconds(buffer->params.delay);
+      base::TimeDelta::FromMicroseconds(buffer->params.delay_us);
 
   base::TimeTicks delay_timestamp =
       base::TimeTicks() +
-      base::TimeDelta::FromMicroseconds(buffer->params.delay_timestamp);
+      base::TimeDelta::FromMicroseconds(buffer->params.delay_timestamp_us);
 
   TRACE_EVENT_BEGIN2("audio", "AudioOutputDevice::FireRenderCallback",
                      "callback_num", callback_num_, "frames skipped",

diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
@@ -97,9 +97,9 @@ ACTION_P2(RequestMoreData, socket, shared_memory) {
   AudioOutputBuffer* buffer =
       reinterpret_cast<AudioOutputBuffer*>(shared_memory->memory());
   buffer->params.frames_skipped = 0;
-  buffer->params.delay =
+  buffer->params.delay_us =
       base::TimeDelta::FromMilliseconds(kOutputDelayMs).InMicroseconds();
-  buffer->params.delay_timestamp =
+  buffer->params.delay_timestamp_us =
       (base::TimeTicks::Now() - base::TimeTicks()).InMicroseconds();
 
   constexpr int kControlSignal = 0;

diff --git a/media/audio/audio_sync_reader.cc b/media/audio/audio_sync_reader.cc
@@ -148,8 +148,8 @@ void AudioSyncReader::RequestMoreData(base::TimeDelta delay,
       reinterpret_cast<AudioOutputBuffer*>(shared_memory_->memory());
   // Increase the number of skipped frames stored in shared memory.
   buffer->params.frames_skipped += prior_frames_skipped;
-  buffer->params.delay = delay.InMicroseconds();
-  buffer->params.delay_timestamp =
+  buffer->params.delay_us = delay.InMicroseconds();
+  buffer->params.delay_timestamp_us =
       (delay_timestamp - base::TimeTicks()).InMicroseconds();
 
   // Zero out the entire output buffer to avoid stuttering/repeating-buffers

diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
@@ -547,8 +547,8 @@ class SyncSocketSource : public AudioOutputStream::AudioSourceCallback {
                  AudioBus* dest) override {
     uint32_t control_signal = 0;
     socket_->Send(&control_signal, sizeof(control_signal));
-    output_buffer()->params.delay = delay.InMicroseconds();
-    output_buffer()->params.delay_timestamp =
+    output_buffer()->params.delay_us = delay.InMicroseconds();
+    output_buffer()->params.delay_timestamp_us =
         (delay_timestamp - base::TimeTicks()).InMicroseconds();
     uint32_t size = socket_->Receive(data_.get(), packet_size_);
 
@@ -605,10 +605,10 @@ DWORD __stdcall SyncSocketThread(void* context) {
     if (ctx.socket->Receive(&control_signal, sizeof(control_signal)) == 0)
       break;
     base::TimeDelta delay =
-        base::TimeDelta::FromMicroseconds(ctx.buffer->params.delay);
+        base::TimeDelta::FromMicroseconds(ctx.buffer->params.delay_us);
     base::TimeTicks delay_timestamp =
-        base::TimeTicks() +
-        base::TimeDelta::FromMicroseconds(ctx.buffer->params.delay_timestamp);
+        base::TimeTicks() + base::TimeDelta::FromMicroseconds(
+                                ctx.buffer->params.delay_timestamp_us);
     sine.OnMoreData(delay, delay_timestamp, 0, audio_bus.get());
     ctx.socket->Send(data.get(), ctx.packet_size_bytes);
   }

diff --git a/media/base/audio_parameters.h b/media/base/audio_parameters.h
@@ -40,15 +40,15 @@ static_assert(AudioBus::kChannelAlignment == PARAMETERS_ALIGNMENT,
 struct MEDIA_SHMEM_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT)
     AudioInputBufferParameters {
   double volume;
-  int64_t capture_time;  // base::TimeTicks in microseconds.
+  int64_t capture_time_us;  // base::TimeTicks in microseconds.
   uint32_t size;
   uint32_t id;
   bool key_pressed;
 };
 struct MEDIA_SHMEM_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT)
     AudioOutputBufferParameters {
-  int64_t delay;            // base::TimeDelta in microseconds.
-  int64_t delay_timestamp;  // base::TimeTicks in microseconds.
+  int64_t delay_us;            // base::TimeDelta in microseconds.
+  int64_t delay_timestamp_us;  // base::TimeTicks in microseconds.
   uint32_t frames_skipped;
   uint32_t bitstream_data_size;
   uint32_t bitstream_frames;

diff --git a/ppapi/proxy/audio_output_resource.cc b/ppapi/proxy/audio_output_resource.cc
@@ -245,7 +245,7 @@ void AudioOutputResource::Run() {
 
     {
       base::TimeDelta delay =
-          base::TimeDelta::FromMicroseconds(buffer->params.delay);
+          base::TimeDelta::FromMicroseconds(buffer->params.delay_us);
 
       audio_output_callback_(client_buffer_.get(), client_buffer_size_bytes_,
                              delay.InSecondsF(), user_data_);

diff --git a/ppapi/shared_impl/ppb_audio_shared.cc b/ppapi/shared_impl/ppb_audio_shared.cc
@@ -229,7 +229,7 @@ void PPB_Audio_Shared::Run() {
       media::AudioOutputBuffer* buffer =
           reinterpret_cast<media::AudioOutputBuffer*>(shared_memory_->memory());
       base::TimeDelta delay =
-          base::TimeDelta::FromMicroseconds(buffer->params.delay);
+          base::TimeDelta::FromMicroseconds(buffer->params.delay_us);
 
       callback_.Run(client_buffer_.get(), client_buffer_size_bytes_,
                     delay.InSecondsF(), user_data_);