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

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

Issue 2634263002: Pass camera facing info to audio client (Closed)
Patch Set: Address comments Created 3 years, 10 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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 DCHECK(audio_input_device_manager_.get()); 454 DCHECK(audio_input_device_manager_.get());
455 return audio_input_device_manager_.get(); 455 return audio_input_device_manager_.get();
456 } 456 }
457 457
458 MediaDevicesManager* MediaStreamManager::media_devices_manager() { 458 MediaDevicesManager* MediaStreamManager::media_devices_manager() {
459 DCHECK_CURRENTLY_ON(BrowserThread::IO); 459 DCHECK_CURRENTLY_ON(BrowserThread::IO);
460 // nullptr might be returned during shutdown. 460 // nullptr might be returned during shutdown.
461 return media_devices_manager_.get(); 461 return media_devices_manager_.get();
462 } 462 }
463 463
464 void MediaStreamManager::SetVideoCaptureObserver(
465 std::unique_ptr<media::VideoCaptureObserver> capture_observer) {
466 if (video_capture_manager_.get() != NULL) {
467 video_capture_manager_->SetVideoCaptureObserver(
468 std::move(capture_observer));
469 }
470 }
471
464 std::string MediaStreamManager::MakeMediaAccessRequest( 472 std::string MediaStreamManager::MakeMediaAccessRequest(
465 int render_process_id, 473 int render_process_id,
466 int render_frame_id, 474 int render_frame_id,
467 int page_request_id, 475 int page_request_id,
468 const StreamControls& controls, 476 const StreamControls& controls,
469 const url::Origin& security_origin, 477 const url::Origin& security_origin,
470 const MediaRequestResponseCallback& callback) { 478 const MediaRequestResponseCallback& callback) {
471 DCHECK_CURRENTLY_ON(BrowserThread::IO); 479 DCHECK_CURRENTLY_ON(BrowserThread::IO);
472 480
473 // TODO(perkj): The argument list with NULL parameters to DeviceRequest 481 // TODO(perkj): The argument list with NULL parameters to DeviceRequest
(...skipping 1269 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 generate_stream_test_callback_ = test_callback; 1751 generate_stream_test_callback_ = test_callback;
1744 } 1752 }
1745 1753
1746 #if defined(OS_WIN) 1754 #if defined(OS_WIN)
1747 void MediaStreamManager::FlushVideoCaptureThreadForTesting() { 1755 void MediaStreamManager::FlushVideoCaptureThreadForTesting() {
1748 video_capture_thread_.FlushForTesting(); 1756 video_capture_thread_.FlushForTesting();
1749 } 1757 }
1750 #endif 1758 #endif
1751 1759
1752 } // namespace content 1760 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698