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

Side by Side Diff: content/renderer/media/media_stream_impl.h

Issue 23731007: Implicit audio output device selection for getUserMedia. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 webrtc::MediaStreamInterface* stream, 148 webrtc::MediaStreamInterface* stream,
149 const base::Closure& error_cb, 149 const base::Closure& error_cb,
150 const VideoFrameProvider::RepaintCB& repaint_cb); 150 const VideoFrameProvider::RepaintCB& repaint_cb);
151 scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer( 151 scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer(
152 webrtc::MediaStreamInterface* stream); 152 webrtc::MediaStreamInterface* stream);
153 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer( 153 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer(
154 webrtc::MediaStreamInterface* stream); 154 webrtc::MediaStreamInterface* stream);
155 155
156 void StopLocalAudioTrack(const WebKit::WebMediaStream& web_stream); 156 void StopLocalAudioTrack(const WebKit::WebMediaStream& web_stream);
157 157
158 // Returns a valid session id if a single capture device is currently open
159 // (and then the matching session_id), otherwise -1.
160 // This is used to pass on a session id to a webrtc audio renderer (either
161 // local or remote), so that audio will be rendered to a matching output
162 // device, should one exist.
163 // Note that if there are more than one open capture devices
Jói 2013/09/06 14:49:26 This sentence does not
tommi (sloooow) - chröme 2013/09/06 16:56:54 Doh! fixed
164 bool GetAuthorizedInputDeviceSessionIdForAudioRenderer(int* session_id,
Jói 2013/09/06 14:49:26 I think style is either all indent to ( or all ind
tommi (sloooow) - chröme 2013/09/06 16:56:54 Done.
165 int* output_sample_rate, int* output_buffer_size);
166
158 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread. 167 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
159 // It's valid for the lifetime of RenderThread. 168 // It's valid for the lifetime of RenderThread.
160 MediaStreamDependencyFactory* dependency_factory_; 169 MediaStreamDependencyFactory* dependency_factory_;
161 170
162 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's 171 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
163 // valid for the lifetime of RenderView. 172 // valid for the lifetime of RenderView.
164 MediaStreamDispatcher* media_stream_dispatcher_; 173 MediaStreamDispatcher* media_stream_dispatcher_;
165 174
166 UserMediaRequests user_media_requests_; 175 UserMediaRequests user_media_requests_;
167 176
168 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 177 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
169 }; 178 };
170 179
171 } // namespace content 180 } // namespace content
172 181
173 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 182 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698