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

Side by Side Diff: content/renderer/media/audio_input_message_filter.cc

Issue 2941773002: Added initial muted state to stream creation callback, to avoid races. (Closed)
Patch Set: Added mute information to DoCompleteCreation log message. Created 3 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/renderer/media/audio_input_message_filter.h" 5 #include "content/renderer/media/audio_input_message_filter.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 delegates_.Remove(it.GetCurrentKey()); 121 delegates_.Remove(it.GetCurrentKey());
122 it.Advance(); 122 it.Advance();
123 } 123 }
124 } 124 }
125 125
126 void AudioInputMessageFilter::OnStreamCreated( 126 void AudioInputMessageFilter::OnStreamCreated(
127 int stream_id, 127 int stream_id,
128 base::SharedMemoryHandle handle, 128 base::SharedMemoryHandle handle,
129 base::SyncSocket::TransitDescriptor socket_descriptor, 129 base::SyncSocket::TransitDescriptor socket_descriptor,
130 uint32_t length, 130 uint32_t length,
131 uint32_t total_segments) { 131 uint32_t total_segments,
132 bool initially_muted) {
132 DCHECK(io_task_runner_->BelongsToCurrentThread()); 133 DCHECK(io_task_runner_->BelongsToCurrentThread());
133 LogMessage(stream_id, "OnStreamCreated"); 134 LogMessage(stream_id, "OnStreamCreated");
134 135
135 base::SyncSocket::Handle socket_handle = 136 base::SyncSocket::Handle socket_handle =
136 base::SyncSocket::UnwrapHandle(socket_descriptor); 137 base::SyncSocket::UnwrapHandle(socket_descriptor);
137 media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id); 138 media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id);
138 if (!delegate) { 139 if (!delegate) {
139 DLOG(WARNING) << "Got audio stream event for a non-existent or removed" 140 DLOG(WARNING) << "Got audio stream event for a non-existent or removed"
140 << " audio capturer (stream_id=" << stream_id << ")."; 141 << " audio capturer (stream_id=" << stream_id << ").";
141 base::SharedMemory::CloseHandle(handle); 142 base::SharedMemory::CloseHandle(handle);
142 base::SyncSocket socket(socket_handle); 143 base::SyncSocket socket(socket_handle);
143 return; 144 return;
144 } 145 }
145 // Forward message to the stream delegate. 146 // Forward message to the stream delegate.
146 delegate->OnStreamCreated(handle, socket_handle, length, total_segments); 147 delegate->OnStreamCreated(handle, socket_handle, length, total_segments,
148 initially_muted);
147 } 149 }
148 150
149 void AudioInputMessageFilter::OnStreamError(int stream_id) { 151 void AudioInputMessageFilter::OnStreamError(int stream_id) {
150 DCHECK(io_task_runner_->BelongsToCurrentThread()); 152 DCHECK(io_task_runner_->BelongsToCurrentThread());
151 media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id); 153 media::AudioInputIPCDelegate* delegate = delegates_.Lookup(stream_id);
152 if (!delegate) { 154 if (!delegate) {
153 DLOG(WARNING) << "Got audio stream event for a non-existent or removed" 155 DLOG(WARNING) << "Got audio stream event for a non-existent or removed"
154 << " audio renderer."; 156 << " audio renderer.";
155 return; 157 return;
156 } 158 }
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 void AudioInputMessageFilter::AudioInputIPCImpl::CloseStream() { 225 void AudioInputMessageFilter::AudioInputIPCImpl::CloseStream() {
224 DCHECK(filter_->io_task_runner_->BelongsToCurrentThread()); 226 DCHECK(filter_->io_task_runner_->BelongsToCurrentThread());
225 DCHECK_NE(stream_id_, kStreamIDNotSet); 227 DCHECK_NE(stream_id_, kStreamIDNotSet);
226 LogMessage(stream_id_, "CloseStream"); 228 LogMessage(stream_id_, "CloseStream");
227 filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_)); 229 filter_->Send(new AudioInputHostMsg_CloseStream(stream_id_));
228 filter_->delegates_.Remove(stream_id_); 230 filter_->delegates_.Remove(stream_id_);
229 stream_id_ = kStreamIDNotSet; 231 stream_id_ = kStreamIDNotSet;
230 } 232 }
231 233
232 } // namespace content 234 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/audio_input_message_filter.h ('k') | content/renderer/pepper/pepper_platform_audio_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698