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

Side by Side Diff: content/public/common/media_stream_request.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 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/public/common/media_stream_request.h" 5 #include "content/public/common/media_stream_request.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 bool IsAudioInputMediaType(MediaStreamType type) { 11 bool IsAudioInputMediaType(MediaStreamType type) {
12 return (type == MEDIA_DEVICE_AUDIO_CAPTURE || 12 return (type == MEDIA_DEVICE_AUDIO_CAPTURE ||
13 type == content::MEDIA_TAB_AUDIO_CAPTURE || 13 type == content::MEDIA_TAB_AUDIO_CAPTURE ||
14 type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE); 14 type == content::MEDIA_DESKTOP_AUDIO_CAPTURE);
15 } 15 }
16 16
17 bool IsVideoMediaType(MediaStreamType type) { 17 bool IsVideoMediaType(MediaStreamType type) {
18 return (type == MEDIA_DEVICE_VIDEO_CAPTURE || 18 return (type == MEDIA_DEVICE_VIDEO_CAPTURE ||
19 type == content::MEDIA_TAB_VIDEO_CAPTURE || 19 type == content::MEDIA_TAB_VIDEO_CAPTURE ||
20 type == content::MEDIA_DESKTOP_VIDEO_CAPTURE); 20 type == content::MEDIA_DESKTOP_VIDEO_CAPTURE);
21 } 21 }
22 22
23 MediaStreamDevice::MediaStreamDevice() 23 MediaStreamDevice::MediaStreamDevice()
24 : type(MEDIA_NO_SERVICE), 24 : type(MEDIA_NO_SERVICE),
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 request_type(request_type), 102 request_type(request_type),
103 requested_audio_device_id(requested_audio_device_id), 103 requested_audio_device_id(requested_audio_device_id),
104 requested_video_device_id(requested_video_device_id), 104 requested_video_device_id(requested_video_device_id),
105 audio_type(audio_type), 105 audio_type(audio_type),
106 video_type(video_type) { 106 video_type(video_type) {
107 } 107 }
108 108
109 MediaStreamRequest::~MediaStreamRequest() {} 109 MediaStreamRequest::~MediaStreamRequest() {}
110 110
111 } // namespace content 111 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/media_stream_request.h ('k') | content/renderer/media/speech_recognition_audio_sink_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698