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

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

Issue 2761273003: Switching MediaStreamsManager from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: passing device descriptions by value Created 3 years, 9 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 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 video_capture_thread_.task_runner()); 1264 video_capture_thread_.task_runner());
1265 #else 1265 #else
1266 video_capture_manager_ = new VideoCaptureManager( 1266 video_capture_manager_ = new VideoCaptureManager(
1267 media::VideoCaptureDeviceFactory::CreateFactory( 1267 media::VideoCaptureDeviceFactory::CreateFactory(
1268 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)), 1268 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)),
1269 audio_system_->GetTaskRunner()); 1269 audio_system_->GetTaskRunner());
1270 #endif 1270 #endif
1271 1271
1272 video_capture_manager_->RegisterListener(this); 1272 video_capture_manager_->RegisterListener(this);
1273 1273
1274 media_devices_manager_.reset(new MediaDevicesManager( 1274 media_devices_manager_.reset(
1275 audio_system_->GetAudioManager(), video_capture_manager_, this)); 1275 new MediaDevicesManager(audio_system_, video_capture_manager_, this));
1276 } 1276 }
1277 1277
1278 void MediaStreamManager::Opened(MediaStreamType stream_type, 1278 void MediaStreamManager::Opened(MediaStreamType stream_type,
1279 int capture_session_id) { 1279 int capture_session_id) {
1280 DCHECK_CURRENTLY_ON(BrowserThread::IO); 1280 DCHECK_CURRENTLY_ON(BrowserThread::IO);
1281 DVLOG(1) << "Opened({stream_type = " << stream_type << "} " 1281 DVLOG(1) << "Opened({stream_type = " << stream_type << "} "
1282 << "{capture_session_id = " << capture_session_id << "})"; 1282 << "{capture_session_id = " << capture_session_id << "})";
1283 // Find the request(s) containing this device and mark it as used. 1283 // Find the request(s) containing this device and mark it as used.
1284 // It can be used in several requests since the same device can be 1284 // It can be used in several requests since the same device can be
1285 // requested from the same web page. 1285 // requested from the same web page.
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1768 request->ui_proxy->OnStarted( 1768 request->ui_proxy->OnStarted(
1769 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser, 1769 base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
1770 base::Unretained(this), label), 1770 base::Unretained(this), label),
1771 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId, 1771 base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
1772 base::Unretained(this), request->video_type(), 1772 base::Unretained(this), request->video_type(),
1773 request->devices)); 1773 request->devices));
1774 } 1774 }
1775 } 1775 }
1776 1776
1777 } // namespace content 1777 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698