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

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

Issue 2323913007: Add constructor taking group ID to MediaStreamDevice and StreamDeviceInfo (Closed)
Patch Set: Fix constructor Created 4 years, 3 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 #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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 struct CONTENT_EXPORT StreamDeviceInfo { 63 struct CONTENT_EXPORT StreamDeviceInfo {
64 static const int kNoId; 64 static const int kNoId;
65 65
66 StreamDeviceInfo(); 66 StreamDeviceInfo();
67 StreamDeviceInfo(MediaStreamType service_param, 67 StreamDeviceInfo(MediaStreamType service_param,
68 const std::string& name_param, 68 const std::string& name_param,
69 const std::string& device_param); 69 const std::string& device_param);
70 StreamDeviceInfo(MediaStreamType service_param, 70 StreamDeviceInfo(MediaStreamType service_param,
71 const std::string& name_param, 71 const std::string& name_param,
72 const std::string& device_param, 72 const std::string& device_param,
73 const std::string& group_param);
74 StreamDeviceInfo(MediaStreamType service_param,
75 const std::string& name_param,
76 const std::string& device_param,
77 const std::string& group_param,
73 int sample_rate, 78 int sample_rate,
74 int channel_layout, 79 int channel_layout,
75 int frames_per_buffer); 80 int frames_per_buffer);
76 static bool IsEqual(const StreamDeviceInfo& first, 81 static bool IsEqual(const StreamDeviceInfo& first,
77 const StreamDeviceInfo& second); 82 const StreamDeviceInfo& second);
78 83
79 MediaStreamDevice device; 84 MediaStreamDevice device;
80 85
81 // Id for this capture session. Unique for all sessions of the same type. 86 // Id for this capture session. Unique for all sessions of the same type.
82 int session_id; 87 int session_id;
83 }; 88 };
84 89
85 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 90 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
86 91
87 } // namespace content 92 } // namespace content
88 93
89 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 94 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/media/media_stream_options.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698