| OLD | NEW |
| 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_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ | 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
| 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ | 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 bool request_succeeded); | 121 bool request_succeeded); |
| 122 | 122 |
| 123 // Returns the WebKit representation of a MediaStream given an URL. | 123 // Returns the WebKit representation of a MediaStream given an URL. |
| 124 // This is virtual for test purposes. | 124 // This is virtual for test purposes. |
| 125 virtual WebKit::WebMediaStream GetMediaStream(const GURL& url); | 125 virtual WebKit::WebMediaStream GetMediaStream(const GURL& url); |
| 126 | 126 |
| 127 private: | 127 private: |
| 128 // Structure for storing information about a WebKit request to create a | 128 // Structure for storing information about a WebKit request to create a |
| 129 // MediaStream. | 129 // MediaStream. |
| 130 struct UserMediaRequestInfo { | 130 struct UserMediaRequestInfo { |
| 131 UserMediaRequestInfo() | 131 UserMediaRequestInfo(); |
| 132 : request_id(0), generated(false), frame(NULL), request() { | |
| 133 } | |
| 134 UserMediaRequestInfo(int request_id, | 132 UserMediaRequestInfo(int request_id, |
| 135 WebKit::WebFrame* frame, | 133 WebKit::WebFrame* frame, |
| 136 const WebKit::WebUserMediaRequest& request) | 134 const WebKit::WebUserMediaRequest& request); |
| 137 : request_id(request_id), generated(false), frame(frame), | 135 ~UserMediaRequestInfo(); |
| 138 request(request) { | |
| 139 } | |
| 140 int request_id; | 136 int request_id; |
| 141 // True if MediaStreamDispatcher has generated the stream, see | 137 // True if MediaStreamDispatcher has generated the stream, see |
| 142 // OnStreamGenerated. | 138 // OnStreamGenerated. |
| 143 bool generated; | 139 bool generated; |
| 144 WebKit::WebFrame* frame; // WebFrame that requested the MediaStream. | 140 WebKit::WebFrame* frame; // WebFrame that requested the MediaStream. |
| 145 WebKit::WebMediaStream descriptor; | 141 WebKit::WebMediaStream descriptor; |
| 146 WebKit::WebUserMediaRequest request; | 142 WebKit::WebUserMediaRequest request; |
| 143 WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources; |
| 144 WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources; |
| 147 }; | 145 }; |
| 148 typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests; | 146 typedef ScopedVector<UserMediaRequestInfo> UserMediaRequests; |
| 149 | 147 |
| 150 UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); | 148 UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); |
| 151 UserMediaRequestInfo* FindUserMediaRequestInfo( | 149 UserMediaRequestInfo* FindUserMediaRequestInfo( |
| 152 WebKit::WebMediaStream* descriptor); | 150 WebKit::WebMediaStream* descriptor); |
| 153 UserMediaRequestInfo* FindUserMediaRequestInfo( | 151 UserMediaRequestInfo* FindUserMediaRequestInfo( |
| 154 const WebKit::WebUserMediaRequest& request); | 152 const WebKit::WebUserMediaRequest& request); |
| 155 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label); | 153 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label); |
| 156 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); | 154 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); |
| (...skipping 17 matching lines...) Expand all Loading... |
| 174 MediaStreamDispatcher* media_stream_dispatcher_; | 172 MediaStreamDispatcher* media_stream_dispatcher_; |
| 175 | 173 |
| 176 UserMediaRequests user_media_requests_; | 174 UserMediaRequests user_media_requests_; |
| 177 | 175 |
| 178 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); | 176 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); |
| 179 }; | 177 }; |
| 180 | 178 |
| 181 } // namespace content | 179 } // namespace content |
| 182 | 180 |
| 183 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ | 181 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
| OLD | NEW |