Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: content/browser/renderer_host/media/audio_input_sync_writer.cc

Issue 2471733004: Revert of Make more media APIs aware of |delay| and |delay_timestamp| (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_input_sync_writer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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"
16 15
17 using media::AudioBus; 16 using media::AudioBus;
18 using media::AudioInputBuffer; 17 using media::AudioInputBuffer;
19 using media::AudioInputBufferParameters; 18 using media::AudioInputBufferParameters;
20 using Packet = media::AudioDeviceThread::Packet;
21 19
22 namespace content { 20 namespace content {
23 21
24 namespace { 22 namespace {
25 23
26 // Used to log if any audio glitches have been detected during an audio session. 24 // Used to log if any audio glitches have been detected during an audio session.
27 // Elements in this enum should not be added, deleted or rearranged. 25 // Elements in this enum should not be added, deleted or rearranged.
28 enum AudioGlitchResult { 26 enum AudioGlitchResult {
29 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0, 27 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0,
30 AUDIO_CAPTURER_AUDIO_GLITCHES = 1, 28 AUDIO_CAPTURER_AUDIO_GLITCHES = 1,
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 ptr += current_segment_id_ * shared_memory_segment_size_; 318 ptr += current_segment_id_ * shared_memory_segment_size_;
321 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr); 319 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr);
322 buffer->params.volume = volume; 320 buffer->params.volume = volume;
323 buffer->params.size = audio_bus_memory_size_; 321 buffer->params.size = audio_bus_memory_size_;
324 buffer->params.key_pressed = key_pressed; 322 buffer->params.key_pressed = key_pressed;
325 buffer->params.hardware_delay_bytes = hardware_delay_bytes; 323 buffer->params.hardware_delay_bytes = hardware_delay_bytes;
326 buffer->params.id = next_buffer_id_; 324 buffer->params.id = next_buffer_id_;
327 } 325 }
328 326
329 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() { 327 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() {
330 Packet packet = { 328 if (socket_->Send(&current_segment_id_, sizeof(current_segment_id_)) !=
331 current_segment_id_, 329 sizeof(current_segment_id_)) {
332 (base::TimeTicks::Now() - base::TimeTicks()).InMicroseconds()};
333 if (socket_->Send(&packet, sizeof(Packet)) != sizeof(Packet)) {
334 const std::string error_message = "AISW: No room in socket buffer."; 330 const std::string error_message = "AISW: No room in socket buffer.";
335 LOG(WARNING) << error_message; 331 LOG(WARNING) << error_message;
336 AddToNativeLog(error_message); 332 AddToNativeLog(error_message);
337 return false; 333 return false;
338 } 334 }
339 335
340 if (++current_segment_id_ >= shared_memory_segment_count_) 336 if (++current_segment_id_ >= shared_memory_segment_count_)
341 current_segment_id_ = 0; 337 current_segment_id_ = 0;
342 ++number_of_filled_segments_; 338 ++number_of_filled_segments_;
343 CHECK_LE(number_of_filled_segments_, 339 CHECK_LE(number_of_filled_segments_,
344 static_cast<int>(shared_memory_segment_count_)); 340 static_cast<int>(shared_memory_segment_count_));
345 ++next_buffer_id_; 341 ++next_buffer_id_;
346 342
347 return true; 343 return true;
348 } 344 }
349 345
350 } // namespace content 346 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/media/audio_input_sync_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698