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

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

Issue 2060833002: Implementation of 'AudioContext.getOutputTimestamp' method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review commnets + more tests fixes + 'Packet' structure Created 4 years, 6 months 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
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/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "content/browser/renderer_host/media/media_stream_manager.h" 12 #include "content/browser/renderer_host/media/media_stream_manager.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 #include "media/audio/audio_device_thread.h"
14 15
15 using media::AudioBus; 16 using media::AudioBus;
16 using media::AudioInputBuffer; 17 using media::AudioInputBuffer;
17 using media::AudioInputBufferParameters; 18 using media::AudioInputBufferParameters;
19 using Packet = media::AudioDeviceThread::Packet;
18 20
19 namespace content { 21 namespace content {
20 22
21 namespace { 23 namespace {
22 24
23 // Used to log if any audio glitches have been detected during an audio session. 25 // Used to log if any audio glitches have been detected during an audio session.
24 // Elements in this enum should not be added, deleted or rearranged. 26 // Elements in this enum should not be added, deleted or rearranged.
25 enum AudioGlitchResult { 27 enum AudioGlitchResult {
26 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0, 28 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0,
27 AUDIO_CAPTURER_AUDIO_GLITCHES = 1, 29 AUDIO_CAPTURER_AUDIO_GLITCHES = 1,
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 ptr += current_segment_id_ * shared_memory_segment_size_; 313 ptr += current_segment_id_ * shared_memory_segment_size_;
312 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr); 314 AudioInputBuffer* buffer = reinterpret_cast<AudioInputBuffer*>(ptr);
313 buffer->params.volume = volume; 315 buffer->params.volume = volume;
314 buffer->params.size = audio_bus_memory_size_; 316 buffer->params.size = audio_bus_memory_size_;
315 buffer->params.key_pressed = key_pressed; 317 buffer->params.key_pressed = key_pressed;
316 buffer->params.hardware_delay_bytes = hardware_delay_bytes; 318 buffer->params.hardware_delay_bytes = hardware_delay_bytes;
317 buffer->params.id = next_buffer_id_; 319 buffer->params.id = next_buffer_id_;
318 } 320 }
319 321
320 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() { 322 bool AudioInputSyncWriter::SignalDataWrittenAndUpdateCounters() {
321 if (socket_->Send(&current_segment_id_, sizeof(current_segment_id_)) != 323 // TODO(Mikhail) : Provide the actual device audio stream timestamp.
322 sizeof(current_segment_id_)) { 324 Packet packet = {current_segment_id_, media::AudioTimestamp()};
325 if (socket_->Send(&packet, sizeof(packet)) != sizeof(packet)) {
323 const std::string error_message = "AISW: No room in socket buffer."; 326 const std::string error_message = "AISW: No room in socket buffer.";
324 LOG(ERROR) << error_message; 327 LOG(ERROR) << error_message;
325 AddToNativeLog(error_message); 328 AddToNativeLog(error_message);
326 return false; 329 return false;
327 } 330 }
328 331
329 if (++current_segment_id_ >= shared_memory_segment_count_) 332 if (++current_segment_id_ >= shared_memory_segment_count_)
330 current_segment_id_ = 0; 333 current_segment_id_ = 0;
331 ++number_of_filled_segments_; 334 ++number_of_filled_segments_;
332 CHECK_LE(number_of_filled_segments_, 335 CHECK_LE(number_of_filled_segments_,
333 static_cast<int>(shared_memory_segment_count_)); 336 static_cast<int>(shared_memory_segment_count_));
334 ++next_buffer_id_; 337 ++next_buffer_id_;
335 338
336 return true; 339 return true;
337 } 340 }
338 341
339 } // namespace content 342 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698