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

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 649543002: Replacing MEDIA_LOOPBACK_AUDIO_CAPTURE with MEDIA_DESKTOP_AUDIO_CAPTURE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase the patchset Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index 0124f21297f8b4a311d4e42bf88b1ee92fe53458..688d04cf3837fd7f70872c43fbb5d08b97cbd705 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -93,7 +93,7 @@ void ParseStreamType(const StreamOptions& options,
if (audio_stream_source == kMediaStreamSourceTab) {
*audio_type = content::MEDIA_TAB_AUDIO_CAPTURE;
} else if (audio_stream_source == kMediaStreamSourceSystem) {
- *audio_type = content::MEDIA_LOOPBACK_AUDIO_CAPTURE;
+ *audio_type = content::MEDIA_DESKTOP_AUDIO_CAPTURE;
}
} else {
// This is normal audio device capture.
@@ -1333,7 +1333,7 @@ bool MediaStreamManager::SetupTabCaptureRequest(DeviceRequest* request) {
}
bool MediaStreamManager::SetupScreenCaptureRequest(DeviceRequest* request) {
- DCHECK(request->audio_type() == MEDIA_LOOPBACK_AUDIO_CAPTURE ||
+ DCHECK(request->audio_type() == MEDIA_DESKTOP_AUDIO_CAPTURE ||
request->video_type() == MEDIA_DESKTOP_VIDEO_CAPTURE);
// For screen capture we only support two valid combinations:
@@ -1341,7 +1341,7 @@ bool MediaStreamManager::SetupScreenCaptureRequest(DeviceRequest* request) {
// (2) screen video capture with loopback audio capture.
if (request->video_type() != MEDIA_DESKTOP_VIDEO_CAPTURE ||
(request->audio_type() != MEDIA_NO_SERVICE &&
- request->audio_type() != MEDIA_LOOPBACK_AUDIO_CAPTURE)) {
+ request->audio_type() != MEDIA_DESKTOP_AUDIO_CAPTURE)) {
LOG(ERROR) << "Invalid screen capture request.";
return false;
}
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698