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

Side by Side Diff: content/renderer/media/media_stream_impl.h

Issue 12320078: Delete old RTCVideoDecoder code path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add svn revision Created 7 years, 10 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_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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 OVERRIDE; 74 OVERRIDE;
75 virtual void cancelUserMediaRequest( 75 virtual void cancelUserMediaRequest(
76 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; 76 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
77 77
78 // webkit_media::MediaStreamClient implementation. 78 // webkit_media::MediaStreamClient implementation.
79 virtual bool IsMediaStream(const GURL& url) OVERRIDE; 79 virtual bool IsMediaStream(const GURL& url) OVERRIDE;
80 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider( 80 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
81 const GURL& url, 81 const GURL& url,
82 const base::Closure& error_cb, 82 const base::Closure& error_cb,
83 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE; 83 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
84 virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
85 const GURL& url,
86 const scoped_refptr<base::MessageLoopProxy>& message_loop) OVERRIDE;
87 virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer> 84 virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
88 GetAudioRenderer(const GURL& url) OVERRIDE; 85 GetAudioRenderer(const GURL& url) OVERRIDE;
89 86
90 // MediaStreamDispatcherEventHandler implementation. 87 // MediaStreamDispatcherEventHandler implementation.
91 virtual void OnStreamGenerated( 88 virtual void OnStreamGenerated(
92 int request_id, 89 int request_id,
93 const std::string& label, 90 const std::string& label,
94 const StreamDeviceInfoArray& audio_array, 91 const StreamDeviceInfoArray& audio_array,
95 const StreamDeviceInfoArray& video_array) OVERRIDE; 92 const StreamDeviceInfoArray& video_array) OVERRIDE;
96 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; 93 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 UserMediaRequestInfo* FindUserMediaRequestInfo( 159 UserMediaRequestInfo* FindUserMediaRequestInfo(
163 const WebKit::WebUserMediaRequest& request); 160 const WebKit::WebUserMediaRequest& request);
164 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label); 161 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label);
165 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); 162 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request);
166 163
167 scoped_refptr<webkit_media::VideoFrameProvider> 164 scoped_refptr<webkit_media::VideoFrameProvider>
168 CreateVideoFrameProvider( 165 CreateVideoFrameProvider(
169 webrtc::MediaStreamInterface* stream, 166 webrtc::MediaStreamInterface* stream,
170 const base::Closure& error_cb, 167 const base::Closure& error_cb,
171 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb); 168 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb);
172 scoped_refptr<media::VideoDecoder> CreateVideoDecoder(
173 webrtc::MediaStreamInterface* stream,
174 const scoped_refptr<base::MessageLoopProxy>& message_loop);
175 scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer( 169 scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer(
176 webrtc::MediaStreamInterface* stream); 170 webrtc::MediaStreamInterface* stream);
177 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer( 171 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer(
178 webrtc::MediaStreamInterface* stream); 172 webrtc::MediaStreamInterface* stream);
179 173
180 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread. 174 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
181 // It's valid for the lifetime of RenderThread. 175 // It's valid for the lifetime of RenderThread.
182 MediaStreamDependencyFactory* dependency_factory_; 176 MediaStreamDependencyFactory* dependency_factory_;
183 177
184 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's 178 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
185 // valid for the lifetime of RenderView. 179 // valid for the lifetime of RenderView.
186 MediaStreamDispatcher* media_stream_dispatcher_; 180 MediaStreamDispatcher* media_stream_dispatcher_;
187 181
188 scoped_refptr<VideoCaptureImplManager> vc_manager_; 182 scoped_refptr<VideoCaptureImplManager> vc_manager_;
189 183
190 UserMediaRequests user_media_requests_; 184 UserMediaRequests user_media_requests_;
191 185
192 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 186 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
193 }; 187 };
194 188
195 } // namespace content 189 } // namespace content
196 190
197 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 191 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698