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 <list> | 8 #include <list> |
9 #include <map> | 9 #include <map> |
10 #include <string> | 10 #include <string> |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 // WebKit::WebUserMediaClient implementation | 96 // WebKit::WebUserMediaClient implementation |
97 virtual void requestUserMedia( | 97 virtual void requestUserMedia( |
98 const WebKit::WebUserMediaRequest& user_media_request, | 98 const WebKit::WebUserMediaRequest& user_media_request, |
99 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources, | 99 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources, |
100 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) | 100 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) |
101 OVERRIDE; | 101 OVERRIDE; |
102 virtual void cancelUserMediaRequest( | 102 virtual void cancelUserMediaRequest( |
103 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; | 103 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; |
104 | 104 |
105 // webkit_media::MediaStreamClient implementation. | 105 // webkit_media::MediaStreamClient implementation. |
| 106 virtual bool IsMediaStream(const WebKit::WebURL url); |
| 107 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider( |
| 108 const GURL& url, const base::Closure& paint_cb); |
106 virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder( | 109 virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder( |
107 const GURL& url, | 110 const GURL& url, |
108 media::MessageLoopFactory* message_loop_factory) OVERRIDE; | 111 media::MessageLoopFactory* message_loop_factory) OVERRIDE; |
109 | 112 |
110 // MediaStreamDispatcherEventHandler implementation. | 113 // MediaStreamDispatcherEventHandler implementation. |
111 virtual void OnStreamGenerated( | 114 virtual void OnStreamGenerated( |
112 int request_id, | 115 int request_id, |
113 const std::string& label, | 116 const std::string& label, |
114 const media_stream::StreamDeviceInfoArray& audio_array, | 117 const media_stream::StreamDeviceInfoArray& audio_array, |
115 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; | 118 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 // PeerConnection threads. signaling_thread_ is created from the | 236 // PeerConnection threads. signaling_thread_ is created from the |
234 // "current" chrome thread. | 237 // "current" chrome thread. |
235 talk_base::Thread* signaling_thread_; | 238 talk_base::Thread* signaling_thread_; |
236 talk_base::Thread* worker_thread_; | 239 talk_base::Thread* worker_thread_; |
237 base::Thread chrome_worker_thread_; | 240 base::Thread chrome_worker_thread_; |
238 | 241 |
239 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); | 242 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); |
240 }; | 243 }; |
241 | 244 |
242 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ | 245 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ |
OLD | NEW |