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

Side by Side Diff: content/public/common/media_stream_request.h

Issue 139053003: Chrome OS: avoid suspending on lid close when casting is active. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compile warning of unused functions. Created 6 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_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 MediaStreamDevice( 72 MediaStreamDevice(
73 MediaStreamType type, 73 MediaStreamType type,
74 const std::string& id, 74 const std::string& id,
75 const std::string& name); 75 const std::string& name);
76 76
77 MediaStreamDevice( 77 MediaStreamDevice(
78 MediaStreamType type, 78 MediaStreamType type,
79 const std::string& id, 79 const std::string& id,
80 const std::string& name, 80 const std::string& name,
81 const GURL& security_origin);
82
83 MediaStreamDevice(
84 MediaStreamType type,
85 const std::string& id,
86 const std::string& name,
81 int sample_rate, 87 int sample_rate,
82 int channel_layout, 88 int channel_layout,
83 int frames_per_buffer); 89 int frames_per_buffer);
84 90
85 ~MediaStreamDevice(); 91 ~MediaStreamDevice();
86 92
87 bool IsEqual(const MediaStreamDevice& second) const; 93 bool IsEqual(const MediaStreamDevice& second) const;
88 94
89 // The device's type. 95 // The device's type.
90 MediaStreamType type; 96 MediaStreamType type;
91 97
92 // The device's unique ID. 98 // The device's unique ID.
93 std::string id; 99 std::string id;
94 100
95 // The facing mode for video capture device. 101 // The facing mode for video capture device.
96 VideoFacingMode video_facing; 102 VideoFacingMode video_facing;
97 103
98 // The device id of a matched output device if any (otherwise empty). 104 // The device id of a matched output device if any (otherwise empty).
99 // Only applicable to audio devices. 105 // Only applicable to audio devices.
100 std::string matched_output_device_id; 106 std::string matched_output_device_id;
101 107
102 // The device's "friendly" name. Not guaranteed to be unique. 108 // The device's "friendly" name. Not guaranteed to be unique.
103 std::string name; 109 std::string name;
104 110
111 // The security origin associated with the corresponding MediaStreamRequest.
112 GURL security_origin;
113
105 // Contains properties that match directly with those with the same name 114 // Contains properties that match directly with those with the same name
106 // in media::AudioParameters. 115 // in media::AudioParameters.
107 struct AudioDeviceParameters { 116 struct AudioDeviceParameters {
108 AudioDeviceParameters() 117 AudioDeviceParameters()
109 : sample_rate(), channel_layout(), frames_per_buffer(), effects() { 118 : sample_rate(), channel_layout(), frames_per_buffer(), effects() {
110 } 119 }
111 120
112 AudioDeviceParameters(int sample_rate, int channel_layout, 121 AudioDeviceParameters(int sample_rate, int channel_layout,
113 int frames_per_buffer) 122 int frames_per_buffer)
114 : sample_rate(sample_rate), 123 : sample_rate(sample_rate),
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 }; 232 };
224 233
225 // Callback used return results of media access requests. 234 // Callback used return results of media access requests.
226 typedef base::Callback<void( 235 typedef base::Callback<void(
227 const MediaStreamDevices& devices, 236 const MediaStreamDevices& devices,
228 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback; 237 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
229 238
230 } // namespace content 239 } // namespace content
231 240
232 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 241 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698