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

Side by Side Diff: content/common/media/media_stream_options.h

Issue 7284037: Adding MediaStreamManager. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Changes based on review by wjia Created 9 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 17 matching lines...) Expand all
28 // True if the stream shall contain an audio input stream. 28 // True if the stream shall contain an audio input stream.
29 bool audio; 29 bool audio;
30 30
31 // Describes if a / which type of video capture device is requested. 31 // Describes if a / which type of video capture device is requested.
32 VideoOption video_option; 32 VideoOption video_option;
33 }; 33 };
34 34
35 // Type of media stream. 35 // Type of media stream.
36 enum MediaStreamType { 36 enum MediaStreamType {
37 kNoService = 0, 37 kNoService = 0,
38 kAudioCapture, 38 kAudioCapture = 1,
Leandro Graciá Gil 2011/07/01 11:31:35 Not a problem, but is there any reason of why you'
mflodman1 2011/07/01 14:07:23 It was to explicitly show the number for, kNumMedi
39 kVideoCapture 39 kVideoCapture = 2,
40 kNumMediaStreamTypes = 3
40 }; 41 };
41 42
42 // StreamDeviceInfo describes information about a device. 43 // StreamDeviceInfo describes information about a device.
43 struct StreamDeviceInfo { 44 struct StreamDeviceInfo {
44 StreamDeviceInfo(); 45 StreamDeviceInfo();
45 StreamDeviceInfo(MediaStreamType service_param, 46 StreamDeviceInfo(MediaStreamType service_param,
46 const std::string& name_param, 47 const std::string& name_param,
47 const std::string& device_param, 48 const std::string& device_param,
48 bool opened); 49 bool opened);
49 50
(...skipping 10 matching lines...) Expand all
60 bool in_use; 61 bool in_use;
61 // Id for this capture session. Unique for all sessions of the same type. 62 // Id for this capture session. Unique for all sessions of the same type.
62 int session_id; 63 int session_id;
63 }; 64 };
64 65
65 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 66 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
66 67
67 } // namespace media_stream 68 } // namespace media_stream
68 69
69 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 70 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698