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

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

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed content_unittests Created 7 years, 11 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) 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 // StreamDeviceInfo describes information about a device. 43 // StreamDeviceInfo describes information about a device.
44 struct CONTENT_EXPORT StreamDeviceInfo { 44 struct CONTENT_EXPORT StreamDeviceInfo {
45 static const int kNoId; 45 static const int kNoId;
46 46
47 StreamDeviceInfo(); 47 StreamDeviceInfo();
48 StreamDeviceInfo(MediaStreamType service_param, 48 StreamDeviceInfo(MediaStreamType service_param,
49 const std::string& name_param, 49 const std::string& name_param,
50 const std::string& device_param, 50 const std::string& device_param,
51 bool opened); 51 bool opened);
52 StreamDeviceInfo(MediaStreamType service_param,
53 const std::string& name_param,
54 const std::string& device_param,
55 int sample_rate,
56 int channel_layout,
57 bool opened);
52 static bool IsEqual(const StreamDeviceInfo& first, 58 static bool IsEqual(const StreamDeviceInfo& first,
53 const StreamDeviceInfo& second); 59 const StreamDeviceInfo& second);
54 60
55 MediaStreamDevice device; 61 MediaStreamDevice device;
56 // Set to true if the device has been opened, false otherwise. 62 // Set to true if the device has been opened, false otherwise.
57 bool in_use; 63 bool in_use;
58 // Id for this capture session. Unique for all sessions of the same type. 64 // Id for this capture session. Unique for all sessions of the same type.
59 int session_id; 65 int session_id;
60 }; 66 };
61 67
62 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 68 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
63 69
64 } // namespace content 70 } // namespace content
65 71
66 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 72 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698