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

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: make the line no longer than 80 chars Created 7 years, 9 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
17 #include "base/threading/non_thread_safe.h" 17 #include "base/threading/non_thread_safe.h"
18 #include "content/common/content_export.h" 18 #include "content/common/content_export.h"
19 #include "content/public/renderer/render_view_observer.h" 19 #include "content/public/renderer/render_view_observer.h"
20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h" 20 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
21 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" 21 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h" 22 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaClient.h"
23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h " 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebUserMediaRequest.h "
24 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 24 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
25 #include "webkit/media/media_stream_client.h" 25 #include "webkit/media/media_stream_client.h"
26 26
27 namespace base{
28 class MessageLoopProxy;
29 }
30
31 namespace webkit_media { 27 namespace webkit_media {
32 class MediaStreamAudioRenderer; 28 class MediaStreamAudioRenderer;
33 } 29 }
34 30
35 namespace content { 31 namespace content {
36 class MediaStreamDependencyFactory; 32 class MediaStreamDependencyFactory;
37 class MediaStreamDispatcher; 33 class MediaStreamDispatcher;
38 class VideoCaptureImplManager; 34 class VideoCaptureImplManager;
39 class WebRtcAudioRenderer; 35 class WebRtcAudioRenderer;
40 class WebRtcLocalAudioRenderer; 36 class WebRtcLocalAudioRenderer;
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 OVERRIDE; 70 OVERRIDE;
75 virtual void cancelUserMediaRequest( 71 virtual void cancelUserMediaRequest(
76 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; 72 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
77 73
78 // webkit_media::MediaStreamClient implementation. 74 // webkit_media::MediaStreamClient implementation.
79 virtual bool IsMediaStream(const GURL& url) OVERRIDE; 75 virtual bool IsMediaStream(const GURL& url) OVERRIDE;
80 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider( 76 virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
81 const GURL& url, 77 const GURL& url,
82 const base::Closure& error_cb, 78 const base::Closure& error_cb,
83 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE; 79 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> 80 virtual scoped_refptr<webkit_media::MediaStreamAudioRenderer>
88 GetAudioRenderer(const GURL& url) OVERRIDE; 81 GetAudioRenderer(const GURL& url) OVERRIDE;
89 82
90 // MediaStreamDispatcherEventHandler implementation. 83 // MediaStreamDispatcherEventHandler implementation.
91 virtual void OnStreamGenerated( 84 virtual void OnStreamGenerated(
92 int request_id, 85 int request_id,
93 const std::string& label, 86 const std::string& label,
94 const StreamDeviceInfoArray& audio_array, 87 const StreamDeviceInfoArray& audio_array,
95 const StreamDeviceInfoArray& video_array) OVERRIDE; 88 const StreamDeviceInfoArray& video_array) OVERRIDE;
96 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; 89 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 UserMediaRequestInfo* FindUserMediaRequestInfo( 155 UserMediaRequestInfo* FindUserMediaRequestInfo(
163 const WebKit::WebUserMediaRequest& request); 156 const WebKit::WebUserMediaRequest& request);
164 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label); 157 UserMediaRequestInfo* FindUserMediaRequestInfo(const std::string& label);
165 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); 158 void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request);
166 159
167 scoped_refptr<webkit_media::VideoFrameProvider> 160 scoped_refptr<webkit_media::VideoFrameProvider>
168 CreateVideoFrameProvider( 161 CreateVideoFrameProvider(
169 webrtc::MediaStreamInterface* stream, 162 webrtc::MediaStreamInterface* stream,
170 const base::Closure& error_cb, 163 const base::Closure& error_cb,
171 const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb); 164 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( 165 scoped_refptr<WebRtcAudioRenderer> CreateRemoteAudioRenderer(
176 webrtc::MediaStreamInterface* stream); 166 webrtc::MediaStreamInterface* stream);
177 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer( 167 scoped_refptr<WebRtcLocalAudioRenderer> CreateLocalAudioRenderer(
178 webrtc::MediaStreamInterface* stream); 168 webrtc::MediaStreamInterface* stream);
179 169
180 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread. 170 // Weak ref to a MediaStreamDependencyFactory, owned by the RenderThread.
181 // It's valid for the lifetime of RenderThread. 171 // It's valid for the lifetime of RenderThread.
182 MediaStreamDependencyFactory* dependency_factory_; 172 MediaStreamDependencyFactory* dependency_factory_;
183 173
184 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's 174 // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
185 // valid for the lifetime of RenderView. 175 // valid for the lifetime of RenderView.
186 MediaStreamDispatcher* media_stream_dispatcher_; 176 MediaStreamDispatcher* media_stream_dispatcher_;
187 177
188 scoped_refptr<VideoCaptureImplManager> vc_manager_; 178 scoped_refptr<VideoCaptureImplManager> vc_manager_;
189 179
190 UserMediaRequests user_media_requests_; 180 UserMediaRequests user_media_requests_;
191 181
192 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 182 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
193 }; 183 };
194 184
195 } // namespace content 185 } // namespace content
196 186
197 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 187 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698