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

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

Issue 11146008: remove VideoDeviceError and AudioDeviceError for media stream. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
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/media_stream_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
6 6
7 #include "content/browser/browser_main_loop.h" 7 #include "content/browser/browser_main_loop.h"
8 #include "content/common/media/media_stream_messages.h" 8 #include "content/common/media/media_stream_messages.h"
9 #include "content/common/media/media_stream_options.h" 9 #include "content/common/media/media_stream_options.h"
10 #include "googleurl/src/gurl.h" 10 #include "googleurl/src/gurl.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 StreamMap::iterator it = streams_.find(label); 56 StreamMap::iterator it = streams_.find(label);
57 DCHECK(it != streams_.end()); 57 DCHECK(it != streams_.end());
58 StreamRequest request = it->second; 58 StreamRequest request = it->second;
59 streams_.erase(it); 59 streams_.erase(it);
60 60
61 Send(new MediaStreamMsg_StreamGenerationFailed(request.render_view_id, 61 Send(new MediaStreamMsg_StreamGenerationFailed(request.render_view_id,
62 request.page_request_id)); 62 request.page_request_id));
63 } 63 }
64 64
65 void MediaStreamDispatcherHost::AudioDeviceFailed(const std::string& label,
66 int index) {
67 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
68 DVLOG(1) << "MediaStreamDispatcherHost::AudioDeviceFailed("
69 << ", {label = " << label << "})";
70
71 StreamMap::iterator it = streams_.find(label);
72 DCHECK(it != streams_.end());
73 StreamRequest request = it->second;
74 Send(new MediaStreamHostMsg_AudioDeviceFailed(request.render_view_id,
75 label,
76 index));
77 }
78
79 void MediaStreamDispatcherHost::VideoDeviceFailed(const std::string& label,
80 int index) {
81 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
82 DVLOG(1) << "MediaStreamDispatcherHost::VideoDeviceFailed("
83 << ", {label = " << label << "})";
84
85 StreamMap::iterator it = streams_.find(label);
86 DCHECK(it != streams_.end());
87 StreamRequest request = it->second;
88 Send(new MediaStreamHostMsg_VideoDeviceFailed(request.render_view_id,
89 label,
90 index));
91 }
92
93 void MediaStreamDispatcherHost::DevicesEnumerated( 65 void MediaStreamDispatcherHost::DevicesEnumerated(
94 const std::string& label, 66 const std::string& label,
95 const StreamDeviceInfoArray& devices) { 67 const StreamDeviceInfoArray& devices) {
96 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 68 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
97 DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated(" 69 DVLOG(1) << "MediaStreamDispatcherHost::DevicesEnumerated("
98 << ", {label = " << label << "})"; 70 << ", {label = " << label << "})";
99 71
100 StreamMap::iterator it = streams_.find(label); 72 StreamMap::iterator it = streams_.find(label);
101 DCHECK(it != streams_.end()); 73 DCHECK(it != streams_.end());
102 StreamRequest request = it->second; 74 StreamRequest request = it->second;
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 device_id, type, security_origin, &label); 235 device_id, type, security_origin, &label);
264 DCHECK(!label.empty()); 236 DCHECK(!label.empty());
265 streams_[label] = StreamRequest(render_view_id, page_request_id); 237 streams_[label] = StreamRequest(render_view_id, page_request_id);
266 } 238 }
267 239
268 MediaStreamManager* MediaStreamDispatcherHost::GetManager() { 240 MediaStreamManager* MediaStreamDispatcherHost::GetManager() {
269 return BrowserMainLoop::GetMediaStreamManager(); 241 return BrowserMainLoop::GetMediaStreamManager();
270 } 242 }
271 243
272 } // namespace media_stream 244 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698