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

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

Issue 11066101: Tentatively turn on WebMediaPlayerMS by default. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: use static function to check if url is media stream Created 8 years, 2 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
« 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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 public base::SupportsWeakPtr<MediaStreamImpl>, 44 public base::SupportsWeakPtr<MediaStreamImpl>,
45 NON_EXPORTED_BASE(public base::NonThreadSafe) { 45 NON_EXPORTED_BASE(public base::NonThreadSafe) {
46 public: 46 public:
47 MediaStreamImpl( 47 MediaStreamImpl(
48 content::RenderView* render_view, 48 content::RenderView* render_view,
49 MediaStreamDispatcher* media_stream_dispatcher, 49 MediaStreamDispatcher* media_stream_dispatcher,
50 VideoCaptureImplManager* vc_manager, 50 VideoCaptureImplManager* vc_manager,
51 MediaStreamDependencyFactory* dependency_factory); 51 MediaStreamDependencyFactory* dependency_factory);
52 virtual ~MediaStreamImpl(); 52 virtual ~MediaStreamImpl();
53 53
54 // Return true when the |url| is media stream.
55 // This static function has the same functionalilty as IsMediaStream
56 // except that it doesn't require an instance of this class.
57 // This can save some overhead time when the |url| is not media stream.
58 static bool CheckMediaStream(const GURL& url);
59
54 // WebKit::WebUserMediaClient implementation 60 // WebKit::WebUserMediaClient implementation
55 virtual void requestUserMedia( 61 virtual void requestUserMedia(
56 const WebKit::WebUserMediaRequest& user_media_request, 62 const WebKit::WebUserMediaRequest& user_media_request,
57 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources, 63 const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
58 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) 64 const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources)
59 OVERRIDE; 65 OVERRIDE;
60 virtual void cancelUserMediaRequest( 66 virtual void cancelUserMediaRequest(
61 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE; 67 const WebKit::WebUserMediaRequest& user_media_request) OVERRIDE;
62 68
63 // webkit_media::MediaStreamClient implementation. 69 // webkit_media::MediaStreamClient implementation.
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 161
156 scoped_refptr<VideoCaptureImplManager> vc_manager_; 162 scoped_refptr<VideoCaptureImplManager> vc_manager_;
157 163
158 MediaRequestMap user_media_requests_; 164 MediaRequestMap user_media_requests_;
159 LocalNativeStreamMap local_media_streams_; 165 LocalNativeStreamMap local_media_streams_;
160 166
161 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 167 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
162 }; 168 };
163 169
164 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 170 #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