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

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

Issue 2868853002: Add ability to retrieve capabilities for audio input devices to MediaDevicesDispatcherHost. (Closed)
Patch Set: rebase Created 3 years, 7 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/media_stream_manager.h" 5 #include "content/browser/renderer_host/media/media_stream_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 DCHECK(audio_input_device_manager_.get()); 456 DCHECK(audio_input_device_manager_.get());
457 return audio_input_device_manager_.get(); 457 return audio_input_device_manager_.get();
458 } 458 }
459 459
460 MediaDevicesManager* MediaStreamManager::media_devices_manager() { 460 MediaDevicesManager* MediaStreamManager::media_devices_manager() {
461 DCHECK_CURRENTLY_ON(BrowserThread::IO); 461 DCHECK_CURRENTLY_ON(BrowserThread::IO);
462 // nullptr might be returned during shutdown. 462 // nullptr might be returned during shutdown.
463 return media_devices_manager_.get(); 463 return media_devices_manager_.get();
464 } 464 }
465 465
466 media::AudioSystem* MediaStreamManager::audio_system() {
467 DCHECK_CURRENTLY_ON(BrowserThread::IO);
468 return audio_system_;
469 }
470
466 void MediaStreamManager::AddVideoCaptureObserver( 471 void MediaStreamManager::AddVideoCaptureObserver(
467 media::VideoCaptureObserver* capture_observer) { 472 media::VideoCaptureObserver* capture_observer) {
468 DCHECK_CURRENTLY_ON(BrowserThread::IO); 473 DCHECK_CURRENTLY_ON(BrowserThread::IO);
469 if (video_capture_manager_) { 474 if (video_capture_manager_) {
470 video_capture_manager_->AddVideoCaptureObserver(capture_observer); 475 video_capture_manager_->AddVideoCaptureObserver(capture_observer);
471 } 476 }
472 } 477 }
473 478
474 void MediaStreamManager::RemoveAllVideoCaptureObservers() { 479 void MediaStreamManager::RemoveAllVideoCaptureObservers() {
475 DCHECK_CURRENTLY_ON(BrowserThread::IO); 480 DCHECK_CURRENTLY_ON(BrowserThread::IO);
(...skipping 1297 matching lines...) Expand 10 before | Expand all | Expand 10 after
1773 request->ui_proxy->OnStarted( 1778 request->ui_proxy->OnStarted(
1774 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser, 1779 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
1775 base::Unretained(this), label), 1780 base::Unretained(this), label),
1776 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId, 1781 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
1777 base::Unretained(this), request->video_type(), 1782 base::Unretained(this), request->video_type(),
1778 request->devices)); 1783 request->devices));
1779 } 1784 }
1780 } 1785 }
1781 1786
1782 } // namespace content 1787 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | content/common/media/media_devices.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698