Index: content/common/media/media_stream_options.cc |
diff --git a/content/common/media/media_stream_options.cc b/content/common/media/media_stream_options.cc |
index 9daa96a54fad4628baa9c6a9c605aa2782b6da97..73cd7b01fd64093642e2a86b1b92a69a30da4a64 100644 |
--- a/content/common/media/media_stream_options.cc |
+++ b/content/common/media/media_stream_options.cc |
@@ -4,13 +4,38 @@ |
#include "content/common/media/media_stream_options.h" |
+#include "base/logging.h" |
+ |
namespace media_stream { |
+StreamOptions::StreamOptions() |
+ : audio_type(content::MEDIA_NO_SERVICE), |
+ video_type(content::MEDIA_NO_SERVICE) {} |
+ |
+StreamOptions::StreamOptions(bool user_audio, bool user_video) |
+ : audio_type(user_audio ? |
+ content::MEDIA_AUDIO_DEVICE_CAPTURE : |
+ content::MEDIA_NO_SERVICE), |
+ video_type(user_video ? |
+ content::MEDIA_VIDEO_DEVICE_CAPTURE : |
+ content::MEDIA_NO_SERVICE) {} |
+ |
+StreamOptions::StreamOptions(MediaStreamType audio_type, |
+ MediaStreamType video_type, |
+ const std::string& opt_device_id) |
+ : audio_type(audio_type), video_type(video_type), |
+ opt_device_id(opt_device_id) { |
+ DCHECK(IsAudioMediaType(audio_type) || |
+ audio_type == content::MEDIA_NO_SERVICE); |
+ DCHECK(IsVideoMediaType(video_type) || |
+ video_type == content::MEDIA_NO_SERVICE); |
+} |
+ |
// static |
const int StreamDeviceInfo::kNoId = -1; |
StreamDeviceInfo::StreamDeviceInfo() |
- : stream_type(content::MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE), |
+ : stream_type(content::MEDIA_NO_SERVICE), |
in_use(false), |
session_id(kNoId) {} |