OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/media/audio_input_sync_writer.h" | 5 #include "content/browser/renderer_host/media/audio_input_sync_writer.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "build/build_config.h" | 12 #include "build/build_config.h" |
13 #include "content/browser/renderer_host/media/media_stream_manager.h" | 13 #include "content/browser/renderer_host/media/media_stream_manager.h" |
14 #include "content/public/browser/browser_thread.h" | 14 #include "content/public/browser/browser_thread.h" |
15 #include "media/audio/audio_device_thread.h" | |
15 | 16 |
16 using media::AudioBus; | 17 using media::AudioBus; |
17 using media::AudioInputBuffer; | 18 using media::AudioInputBuffer; |
18 using media::AudioInputBufferParameters; | 19 using media::AudioInputBufferParameters; |
20 using Packet = media::AudioDeviceThread::Packet; | |
19 | 21 |
20 namespace content { | 22 namespace content { |
21 | 23 |
22 namespace { | 24 namespace { |
23 | 25 |
24 // Used to log if any audio glitches have been detected during an audio session. | 26 // Used to log if any audio glitches have been detected during an audio session. |
25 // Elements in this enum should not be added, deleted or rearranged. | 27 // Elements in this enum should not be added, deleted or rearranged. |
26 enum AudioGlitchResult { | 28 enum AudioGlitchResult { |
27 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0, | 29 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0, |
28 AUDIO_CAPTURER_AUDIO_GLITCHES = 1, | 30 AUDIO_CAPTURER_AUDIO_GLITCHES = 1, |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
318 ptr += current_segment_id_ * shared_memory_segment_size_; | 320 ptr += current_segment_id_ * shared_memory_segment_size_; |
319 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr); | 321 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr); |
320 buffer->params.volume = volume; | 322 buffer->params.volume = volume; |
321 buffer->params.size = audio_bus_memory_size_; | 323 buffer->params.size = audio_bus_memory_size_; |
322 buffer->params.key_pressed = key_pressed; | 324 buffer->params.key_pressed = key_pressed; |
323 buffer->params.hardware_delay_bytes = hardware_delay_bytes; | 325 buffer->params.hardware_delay_bytes = hardware_delay_bytes; |
324 buffer->params.id = next_buffer_id_; | 326 buffer->params.id = next_buffer_id_; |
325 } | 327 } |
326 | 328 |
327 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() { | 329 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() { |
328 if (socket_->Send(¤t_segment_id_, sizeof(current_segment_id_)) != | 330 Packet packet = {current_segment_id_, |
329 sizeof(current_segment_id_)) { | 331 base::TimeTicks::Now().ToInternalValue()}; |
miu
2016/10/23 01:19:15
Please don't use ToInternalValue() (per http://crb
Mikhail
2016/10/24 19:50:23
Done. Even though IMO in this particular case usin
miu
2016/10/24 22:45:52
Your use was appropriate here. :)
As the base/tim
| |
332 if (socket_->Send(&packet, sizeof(Packet)) != sizeof(Packet)) { | |
330 const std::string error_message = "AISW: No room in socket buffer."; | 333 const std::string error_message = "AISW: No room in socket buffer."; |
331 LOG(WARNING) << error_message; | 334 LOG(WARNING) << error_message; |
332 AddToNativeLog(error_message); | 335 AddToNativeLog(error_message); |
333 return false; | 336 return false; |
334 } | 337 } |
335 | 338 |
336 if (++current_segment_id_ >= shared_memory_segment_count_) | 339 if (++current_segment_id_ >= shared_memory_segment_count_) |
337 current_segment_id_ = 0; | 340 current_segment_id_ = 0; |
338 ++number_of_filled_segments_; | 341 ++number_of_filled_segments_; |
339 CHECK_LE(number_of_filled_segments_, | 342 CHECK_LE(number_of_filled_segments_, |
340 static_cast<int>(shared_memory_segment_count_)); | 343 static_cast<int>(shared_memory_segment_count_)); |
341 ++next_buffer_id_; | 344 ++next_buffer_id_; |
342 | 345 |
343 return true; | 346 return true; |
344 } | 347 } |
345 | 348 |
346 } // namespace content | 349 } // namespace content |
OLD | NEW |