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

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

Issue 1302423006: Ensure that data is not overwritten in the audio input shared memory ring buffer that sits on the b… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Tracking down compile errors. Created 5 years, 3 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/memory/shared_memory.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/stringprintf.h"
10 #include "content/browser/renderer_host/media/media_stream_manager.h" 11 #include "content/browser/renderer_host/media/media_stream_manager.h"
11 12
12 using media::AudioBus; 13 using media::AudioBus;
13 14
14 namespace content { 15 namespace content {
15 16
16 AudioInputSyncWriter::AudioInputSyncWriter(base::SharedMemory* shared_memory, 17 namespace {
18
19 // Used to log if any audio glitches have been detected during an audio session.
20 // Elements in this enum should not be added, deleted or rearranged.
21 enum AudioGlitchResult {
22 AUDIO_CAPTURER_NO_AUDIO_GLITCHES = 0,
23 AUDIO_CAPTURER_AUDIO_GLITCHES = 1,
24 AUDIO_CAPTURER_AUDIO_GLITCHES_MAX = AUDIO_CAPTURER_AUDIO_GLITCHES
25 };
26
27 } // namespace
28
29 AudioInputSyncWriter::AudioInputSyncWriter(void* shared_memory,
30 size_t shared_memory_size,
17 int shared_memory_segment_count, 31 int shared_memory_segment_count,
18 const media::AudioParameters& params) 32 const media::AudioParameters& params)
19 : shared_memory_(shared_memory), 33 : shared_memory_(static_cast<uint8*>(shared_memory)),
20 shared_memory_segment_count_(shared_memory_segment_count), 34 shared_memory_segment_count_(shared_memory_segment_count),
21 current_segment_id_(0), 35 current_segment_id_(0),
22 creation_time_(base::Time::Now()), 36 creation_time_(base::Time::Now()),
23 audio_bus_memory_size_(AudioBus::CalculateMemorySize(params)), 37 audio_bus_memory_size_(AudioBus::CalculateMemorySize(params)),
24 next_buffer_id_(0) { 38 next_buffer_id_(0),
39 next_read_buffer_index_(0),
40 number_of_filled_segments_(0),
41 write_count_(0),
42 write_error_count_(0) {
25 DCHECK_GT(shared_memory_segment_count, 0); 43 DCHECK_GT(shared_memory_segment_count, 0);
26 DCHECK_EQ(shared_memory->requested_size() % shared_memory_segment_count, 0u); 44 DCHECK_EQ(shared_memory_size % shared_memory_segment_count, 0u);
27 shared_memory_segment_size_ = 45 shared_memory_segment_size_ =
28 shared_memory->requested_size() / shared_memory_segment_count; 46 shared_memory_size / shared_memory_segment_count;
29 DVLOG(1) << "SharedMemory::requested_size: " 47 DVLOG(1) << "shared_memory_size: " << shared_memory_size;
30 << shared_memory->requested_size();
31 DVLOG(1) << "shared_memory_segment_count: " << shared_memory_segment_count; 48 DVLOG(1) << "shared_memory_segment_count: " << shared_memory_segment_count;
32 DVLOG(1) << "audio_bus_memory_size: " << audio_bus_memory_size_; 49 DVLOG(1) << "audio_bus_memory_size: " << audio_bus_memory_size_;
33 50
34 // Create vector of audio buses by wrapping existing blocks of memory. 51 // Create vector of audio buses by wrapping existing blocks of memory.
35 uint8* ptr = static_cast<uint8*>(shared_memory_->memory()); 52 uint8* ptr = shared_memory_;
36 for (int i = 0; i < shared_memory_segment_count; ++i) { 53 for (int i = 0; i < shared_memory_segment_count; ++i) {
37 CHECK((reinterpret_cast<uintptr_t>(ptr) & 54 CHECK((reinterpret_cast<uintptr_t>(ptr) &
38 (media::AudioBus::kChannelAlignment - 1)) == 0U); 55 (media::AudioBus::kChannelAlignment - 1)) == 0U)
56 << "Shared memory segment size: " << shared_memory_segment_size_
57 << ", number of segments: " << shared_memory_segment_count
58 << ", sizeof(AIBP): " << sizeof(media::AudioInputBufferParameters);
39 media::AudioInputBuffer* buffer = 59 media::AudioInputBuffer* buffer =
40 reinterpret_cast<media::AudioInputBuffer*>(ptr); 60 reinterpret_cast<media::AudioInputBuffer*>(ptr);
41 scoped_ptr<media::AudioBus> audio_bus = 61 scoped_ptr<media::AudioBus> audio_bus =
42 media::AudioBus::WrapMemory(params, buffer->audio); 62 media::AudioBus::WrapMemory(params, buffer->audio);
43 audio_buses_.push_back(audio_bus.release()); 63 audio_buses_.push_back(audio_bus.release());
44 ptr += shared_memory_segment_size_; 64 ptr += shared_memory_segment_size_;
45 } 65 }
46 } 66 }
47 67
48 AudioInputSyncWriter::~AudioInputSyncWriter() {} 68 AudioInputSyncWriter::~AudioInputSyncWriter() {
69 if (write_count_ == 0)
70 return;
71
72 UMA_HISTOGRAM_PERCENTAGE(
73 "Media.AudioCapturerMissedReadDeadline",
74 100.0 * write_error_count_ / write_count_);
75
76 UMA_HISTOGRAM_ENUMERATION("Media.AudioCapturerAudioGlitches",
77 write_error_count_ == 0 ?
78 AUDIO_CAPTURER_NO_AUDIO_GLITCHES :
79 AUDIO_CAPTURER_AUDIO_GLITCHES,
80 AUDIO_CAPTURER_AUDIO_GLITCHES_MAX + 1);
81
82 std::string log_string = base::StringPrintf(
83 #if defined(COMPILER_MSVC)
84 "AISW: number of detected audio glitches: %Iu out of %Iu",
85 #else
86 "AISW: number of detected audio glitches: %zu out of %zu",
87 #endif
88 write_error_count_,
89 write_count_);
90 MediaStreamManager::SendMessageToNativeLog(log_string);
91 DVLOG(1) << log_string;
92 }
49 93
50 void AudioInputSyncWriter::Write(const media::AudioBus* data, 94 void AudioInputSyncWriter::Write(const media::AudioBus* data,
51 double volume, 95 double volume,
52 bool key_pressed, 96 bool key_pressed,
53 uint32 hardware_delay_bytes) { 97 uint32 hardware_delay_bytes) {
98 ++write_count_;
99
54 #if !defined(OS_ANDROID) 100 #if !defined(OS_ANDROID)
55 static const base::TimeDelta kLogDelayThreadhold = 101 static const base::TimeDelta kLogDelayThreadhold =
56 base::TimeDelta::FromMilliseconds(500); 102 base::TimeDelta::FromMilliseconds(500);
57 103
58 std::ostringstream oss; 104 std::ostringstream oss;
59 if (last_write_time_.is_null()) { 105 if (last_write_time_.is_null()) {
60 // This is the first time Write is called. 106 // This is the first time Write is called.
61 base::TimeDelta interval = base::Time::Now() - creation_time_; 107 base::TimeDelta interval = base::Time::Now() - creation_time_;
62 oss << "AISW::Write: audio input data received for the first time: delay " 108 oss << "AISW::Write: audio input data received for the first time: delay "
63 "= " << interval.InMilliseconds() << "ms"; 109 "= " << interval.InMilliseconds() << "ms";
64 110
65 } else { 111 } else {
66 base::TimeDelta interval = base::Time::Now() - last_write_time_; 112 base::TimeDelta interval = base::Time::Now() - last_write_time_;
67 if (interval > kLogDelayThreadhold) { 113 if (interval > kLogDelayThreadhold) {
68 oss << "AISW::Write: audio input data delay unexpectedly long: delay = " 114 oss << "AISW::Write: audio input data delay unexpectedly long: delay = "
69 << interval.InMilliseconds() << "ms"; 115 << interval.InMilliseconds() << "ms";
70 } 116 }
71 } 117 }
72 if (!oss.str().empty()) { 118 if (!oss.str().empty()) {
73 MediaStreamManager::SendMessageToNativeLog(oss.str()); 119 AddToNativeLog(oss.str());
74 DVLOG(1) << oss.str(); 120 DVLOG(1) << oss.str();
75 } 121 }
76 122
77 last_write_time_ = base::Time::Now(); 123 last_write_time_ = base::Time::Now();
78 #endif 124 #endif
79 125
126 // Check that the renderer side has read data so that we don't overwrite data
127 // that hasn't been read yet. The renderer side sends a signal over the socket
128 // each time it has read data. Here, we read those verifications before
129 // writing. We verify that each buffer index is in sequence.
130 size_t number_of_indices_available = socket_->Peek() / sizeof(uint32_t);
131 if (number_of_indices_available > 0) {
132 scoped_ptr<uint32_t[]> indices(new uint32_t[number_of_indices_available]);
DaleCurtis 2015/09/08 22:53:47 I'd allocate this once at full capacity and reuse
133 size_t bytes_received = socket_->Receive(
134 &indices[0],
135 number_of_indices_available * sizeof(indices[0]));
136 DCHECK_EQ(number_of_indices_available * sizeof(indices[0]), bytes_received);
137 for (size_t i = 0; i < number_of_indices_available; ++i) {
138 ++next_read_buffer_index_;
139 CHECK_EQ(indices[i], next_read_buffer_index_);
140 --number_of_filled_segments_;
141 CHECK_GE(number_of_filled_segments_, 0);
142 }
143 }
144
145 // Check that the ring buffer isn't full, and if it is log error and drop the
146 // buffer.
147 if (number_of_filled_segments_ ==
148 static_cast<int>(shared_memory_segment_count_)) {
149 const std::string error_message =
150 "No room in ring buffer to write data to. Dropping the data.";
151 LOG(ERROR) << error_message;
152 AddToNativeLog(error_message);
153 ++write_error_count_;
154 return;
155 }
156
80 // Write audio parameters to shared memory. 157 // Write audio parameters to shared memory.
81 uint8* ptr = static_cast<uint8*>(shared_memory_->memory()); 158 uint8* ptr = shared_memory_;
82 ptr += current_segment_id_ * shared_memory_segment_size_; 159 ptr += current_segment_id_ * shared_memory_segment_size_;
83 media::AudioInputBuffer* buffer = 160 media::AudioInputBuffer* buffer =
84 reinterpret_cast<media::AudioInputBuffer*>(ptr); 161 reinterpret_cast<media::AudioInputBuffer*>(ptr);
85 buffer->params.volume = volume; 162 buffer->params.volume = volume;
86 buffer->params.size = audio_bus_memory_size_; 163 buffer->params.size = audio_bus_memory_size_;
87 buffer->params.key_pressed = key_pressed; 164 buffer->params.key_pressed = key_pressed;
88 buffer->params.hardware_delay_bytes = hardware_delay_bytes; 165 buffer->params.hardware_delay_bytes = hardware_delay_bytes;
89 buffer->params.id = next_buffer_id_++; 166 buffer->params.id = next_buffer_id_++;
90 167
91 // Copy data from the native audio layer into shared memory using pre- 168 // Copy data from the native audio layer into shared memory using pre-
92 // allocated audio buses. 169 // allocated audio buses.
93 media::AudioBus* audio_bus = audio_buses_[current_segment_id_]; 170 media::AudioBus* audio_bus = audio_buses_[current_segment_id_];
94 data->CopyTo(audio_bus); 171 data->CopyTo(audio_bus);
95 172
96 socket_->Send(&current_segment_id_, sizeof(current_segment_id_)); 173 socket_->Send(&current_segment_id_, sizeof(current_segment_id_));
97 174
98 if (++current_segment_id_ >= shared_memory_segment_count_) 175 if (++current_segment_id_ >= shared_memory_segment_count_)
99 current_segment_id_ = 0; 176 current_segment_id_ = 0;
177
178 ++number_of_filled_segments_;
179 CHECK_LE(number_of_filled_segments_,
180 static_cast<int>(shared_memory_segment_count_));
100 } 181 }
101 182
102 void AudioInputSyncWriter::Close() { 183 void AudioInputSyncWriter::Close() {
103 socket_->Close(); 184 socket_->Close();
104 } 185 }
105 186
106 bool AudioInputSyncWriter::Init() { 187 bool AudioInputSyncWriter::Init() {
107 socket_.reset(new base::CancelableSyncSocket()); 188 socket_.reset(new base::CancelableSyncSocket());
108 foreign_socket_.reset(new base::CancelableSyncSocket()); 189 foreign_socket_.reset(new base::CancelableSyncSocket());
109 return base::CancelableSyncSocket::CreatePair(socket_.get(), 190 return base::CancelableSyncSocket::CreatePair(socket_.get(),
110 foreign_socket_.get()); 191 foreign_socket_.get());
111 } 192 }
112 193
113 bool AudioInputSyncWriter::PrepareForeignSocket( 194 bool AudioInputSyncWriter::PrepareForeignSocket(
114 base::ProcessHandle process_handle, 195 base::ProcessHandle process_handle,
115 base::SyncSocket::TransitDescriptor* descriptor) { 196 base::SyncSocket::TransitDescriptor* descriptor) {
116 return foreign_socket_->PrepareTransitDescriptor(process_handle, descriptor); 197 return foreign_socket_->PrepareTransitDescriptor(process_handle, descriptor);
117 } 198 }
118 199
200 void AudioInputSyncWriter::AddToNativeLog(const std::string& message) {
201 MediaStreamManager::SendMessageToNativeLog(message);
202 }
119 203
120 } // namespace content 204 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698