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

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: Code review. Unit test improvement. Changed read verification algorithm. 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);
39 media::AudioInputBuffer* buffer = 56 media::AudioInputBuffer* buffer =
40 reinterpret_cast<media::AudioInputBuffer*>(ptr); 57 reinterpret_cast<media::AudioInputBuffer*>(ptr);
41 scoped_ptr<media::AudioBus> audio_bus = 58 scoped_ptr<media::AudioBus> audio_bus =
42 media::AudioBus::WrapMemory(params, buffer->audio); 59 media::AudioBus::WrapMemory(params, buffer->audio);
43 audio_buses_.push_back(audio_bus.release()); 60 audio_buses_.push_back(audio_bus.release());
44 ptr += shared_memory_segment_size_; 61 ptr += shared_memory_segment_size_;
45 } 62 }
46 } 63 }
47 64
48 AudioInputSyncWriter::~AudioInputSyncWriter() {} 65 AudioInputSyncWriter::~AudioInputSyncWriter() {
66 if (write_count_ == 0)
67 return;
68
69 UMA_HISTOGRAM_PERCENTAGE(
70 "Media.AudioCapturerMissedReadDeadline",
71 100.0 * write_error_count_ / write_count_);
72
73 UMA_HISTOGRAM_ENUMERATION("Media.AudioCapturerAudioGlitches",
74 write_error_count_ == 0 ?
75 AUDIO_CAPTURER_NO_AUDIO_GLITCHES :
76 AUDIO_CAPTURER_AUDIO_GLITCHES,
77 AUDIO_CAPTURER_AUDIO_GLITCHES_MAX + 1);
78
79 std::string log_string = base::StringPrintf(
80 "AISW: number of detected audio glitches: %lu out of %lu",
81 write_error_count_,
82 write_count_);
83 MediaStreamManager::SendMessageToNativeLog(log_string);
84 DVLOG(1) << log_string;
85 }
49 86
50 void AudioInputSyncWriter::Write(const media::AudioBus* data, 87 void AudioInputSyncWriter::Write(const media::AudioBus* data,
51 double volume, 88 double volume,
52 bool key_pressed, 89 bool key_pressed,
53 uint32 hardware_delay_bytes) { 90 uint32 hardware_delay_bytes) {
54 #if !defined(OS_ANDROID) 91 #if !defined(OS_ANDROID)
55 static const base::TimeDelta kLogDelayThreadhold = 92 static const base::TimeDelta kLogDelayThreadhold =
56 base::TimeDelta::FromMilliseconds(500); 93 base::TimeDelta::FromMilliseconds(500);
57 94
58 std::ostringstream oss; 95 std::ostringstream oss;
59 if (last_write_time_.is_null()) { 96 if (last_write_time_.is_null()) {
60 // This is the first time Write is called. 97 // This is the first time Write is called.
61 base::TimeDelta interval = base::Time::Now() - creation_time_; 98 base::TimeDelta interval = base::Time::Now() - creation_time_;
62 oss << "AISW::Write: audio input data received for the first time: delay " 99 oss << "AISW::Write: audio input data received for the first time: delay "
63 "= " << interval.InMilliseconds() << "ms"; 100 "= " << interval.InMilliseconds() << "ms";
64 101
65 } else { 102 } else {
66 base::TimeDelta interval = base::Time::Now() - last_write_time_; 103 base::TimeDelta interval = base::Time::Now() - last_write_time_;
67 if (interval > kLogDelayThreadhold) { 104 if (interval > kLogDelayThreadhold) {
68 oss << "AISW::Write: audio input data delay unexpectedly long: delay = " 105 oss << "AISW::Write: audio input data delay unexpectedly long: delay = "
69 << interval.InMilliseconds() << "ms"; 106 << interval.InMilliseconds() << "ms";
70 } 107 }
71 } 108 }
72 if (!oss.str().empty()) { 109 if (!oss.str().empty()) {
73 MediaStreamManager::SendMessageToNativeLog(oss.str()); 110 AddToNativeLog(oss.str());
74 DVLOG(1) << oss.str(); 111 DVLOG(1) << oss.str();
75 } 112 }
76 113
77 last_write_time_ = base::Time::Now(); 114 last_write_time_ = base::Time::Now();
78 #endif 115 #endif
79 116
117 // Check that the renderer side has read data so that we don't overwrite.
118 // The renderer side sends a signal over the socket each time it has read
119 // data. Here, we read those verifications before writing. We verify that each
120 // buffer index is in sequence.
121 ++write_count_;
tommi (sloooow) - chröme 2015/09/03 14:55:13 here we increment write_count_ without having actu
Henrik Grunell 2015/09/03 15:29:51 It actually counts Write() calls, attempted write.
122
123 // Read verifications from other side as long as there is any.
124 while (true) {
125 if (socket_->Peek() == 0)
126 break;
127
128 uint32 index_read = 0;
129 size_t bytes_received = socket_->ReceiveWithTimeout(
tommi (sloooow) - chröme 2015/09/03 14:55:13 Is it possible to read everything that's in the bu
Henrik Grunell 2015/09/03 15:29:51 That would mean that we have to timeout every time
tommi (sloooow) - chröme 2015/09/03 15:47:52 We can rely on what Peek() tells us as long as we
Henrik Grunell 2015/09/04 11:52:52 Tried this, but both Receive and ReceiveWTO blocks
130 &index_read, sizeof(index_read), base::TimeDelta::FromMilliseconds(5));
131 if (bytes_received != sizeof(index_read)) {
132 // TODO(grunell): This could happen if this thread has bad luck and don't
tommi (sloooow) - chröme 2015/09/03 14:55:13 nit: ...and don't -> ...and doesn't
Henrik Grunell 2015/09/03 15:29:51 Done.
133 // get to run before the timeout dealine. Otherwise it should never
tommi (sloooow) - chröme 2015/09/03 14:55:13 deadline
Henrik Grunell 2015/09/03 15:29:51 Done.
134 // happen. Best would be to have a non-blocking Receive().
135 break;
136 }
137
138 ++next_read_buffer_index_;
139 CHECK_EQ(index_read, next_read_buffer_index_);
140 --number_of_filled_segments_;
141 CHECK_GE(number_of_filled_segments_, 0);
142 }
143
144 // Check that the ring buffer isn't full and if it is, log error and drop the
145 // buffer.
146 if (number_of_filled_segments_ ==
147 static_cast<int>(shared_memory_segment_count_)) {
148 const std::string error_message =
149 "No room in ring buffer to write data to. Dropping the data.";
150 LOG(ERROR) << error_message;
151 AddToNativeLog(error_message);
152 ++write_error_count_;
153 return;
154 }
155
80 // Write audio parameters to shared memory. 156 // Write audio parameters to shared memory.
81 uint8* ptr = static_cast<uint8*>(shared_memory_->memory()); 157 uint8* ptr = shared_memory_;
82 ptr += current_segment_id_ * shared_memory_segment_size_; 158 ptr += current_segment_id_ * shared_memory_segment_size_;
83 media::AudioInputBuffer* buffer = 159 media::AudioInputBuffer* buffer =
84 reinterpret_cast<media::AudioInputBuffer*>(ptr); 160 reinterpret_cast<media::AudioInputBuffer*>(ptr);
85 buffer->params.volume = volume; 161 buffer->params.volume = volume;
86 buffer->params.size = audio_bus_memory_size_; 162 buffer->params.size = audio_bus_memory_size_;
87 buffer->params.key_pressed = key_pressed; 163 buffer->params.key_pressed = key_pressed;
88 buffer->params.hardware_delay_bytes = hardware_delay_bytes; 164 buffer->params.hardware_delay_bytes = hardware_delay_bytes;
89 buffer->params.id = next_buffer_id_++; 165 buffer->params.id = next_buffer_id_++;
90 166
91 // Copy data from the native audio layer into shared memory using pre- 167 // Copy data from the native audio layer into shared memory using pre-
92 // allocated audio buses. 168 // allocated audio buses.
93 media::AudioBus* audio_bus = audio_buses_[current_segment_id_]; 169 media::AudioBus* audio_bus = audio_buses_[current_segment_id_];
94 data->CopyTo(audio_bus); 170 data->CopyTo(audio_bus);
95 171
96 socket_->Send(&current_segment_id_, sizeof(current_segment_id_)); 172 socket_->Send(&current_segment_id_, sizeof(current_segment_id_));
97 173
98 if (++current_segment_id_ >= shared_memory_segment_count_) 174 if (++current_segment_id_ >= shared_memory_segment_count_)
99 current_segment_id_ = 0; 175 current_segment_id_ = 0;
176
177 ++number_of_filled_segments_;
178 CHECK_LE(number_of_filled_segments_,
179 static_cast<int>(shared_memory_segment_count_));
100 } 180 }
101 181
102 void AudioInputSyncWriter::Close() { 182 void AudioInputSyncWriter::Close() {
103 socket_->Close(); 183 socket_->Close();
104 } 184 }
105 185
106 bool AudioInputSyncWriter::Init() { 186 bool AudioInputSyncWriter::Init() {
107 socket_.reset(new base::CancelableSyncSocket()); 187 socket_.reset(new base::CancelableSyncSocket());
108 foreign_socket_.reset(new base::CancelableSyncSocket()); 188 foreign_socket_.reset(new base::CancelableSyncSocket());
109 return base::CancelableSyncSocket::CreatePair(socket_.get(), 189 return base::CancelableSyncSocket::CreatePair(socket_.get(),
110 foreign_socket_.get()); 190 foreign_socket_.get());
111 } 191 }
112 192
113 bool AudioInputSyncWriter::PrepareForeignSocket( 193 bool AudioInputSyncWriter::PrepareForeignSocket(
114 base::ProcessHandle process_handle, 194 base::ProcessHandle process_handle,
115 base::SyncSocket::TransitDescriptor* descriptor) { 195 base::SyncSocket::TransitDescriptor* descriptor) {
116 return foreign_socket_->PrepareTransitDescriptor(process_handle, descriptor); 196 return foreign_socket_->PrepareTransitDescriptor(process_handle, descriptor);
117 } 197 }
118 198
199 void AudioInputSyncWriter::AddToNativeLog(const std::string& message) {
200 MediaStreamManager::SendMessageToNativeLog(message);
201 }
119 202
120 } // namespace content 203 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698