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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 12388039: Use base::MessageLoopProxy instead of MessageLoop* in webkit/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | Annotate | Revision Log
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 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" 65 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"
66 #include "webkit/media/crypto/key_systems.h" 66 #include "webkit/media/crypto/key_systems.h"
67 #include "webkit/media/crypto/proxy_decryptor.h" 67 #include "webkit/media/crypto/proxy_decryptor.h"
68 68
69 class RenderAudioSourceProvider; 69 class RenderAudioSourceProvider;
70 70
71 namespace WebKit { 71 namespace WebKit {
72 class WebFrame; 72 class WebFrame;
73 } 73 }
74 74
75 namespace base {
76 class MessageLoopProxy;
77 }
78
75 namespace media { 79 namespace media {
76 class ChunkDemuxer; 80 class ChunkDemuxer;
77 class MediaLog; 81 class MediaLog;
78 } 82 }
79 83
80 namespace webkit_media { 84 namespace webkit_media {
81 85
82 class MediaStreamClient; 86 class MediaStreamClient;
83 class WebAudioSourceProviderImpl; 87 class WebAudioSourceProviderImpl;
84 class WebMediaPlayerDelegate; 88 class WebMediaPlayerDelegate;
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 279
276 WebKit::WebFrame* frame_; 280 WebKit::WebFrame* frame_;
277 281
278 // TODO(hclam): get rid of these members and read from the pipeline directly. 282 // TODO(hclam): get rid of these members and read from the pipeline directly.
279 WebKit::WebMediaPlayer::NetworkState network_state_; 283 WebKit::WebMediaPlayer::NetworkState network_state_;
280 WebKit::WebMediaPlayer::ReadyState ready_state_; 284 WebKit::WebMediaPlayer::ReadyState ready_state_;
281 285
282 // Keep a list of buffered time ranges. 286 // Keep a list of buffered time ranges.
283 WebKit::WebTimeRanges buffered_; 287 WebKit::WebTimeRanges buffered_;
284 288
285 // Message loops for posting tasks between Chrome's main thread. Also used 289 // Message loops for posting tasks on Chrome's main thread. Also used
286 // for DCHECKs so methods calls won't execute in the wrong thread. 290 // for DCHECKs so methods calls won't execute in the wrong thread.
287 MessageLoop* main_loop_; 291 scoped_refptr<base::MessageLoopProxy> main_loop_;
288 292
289 scoped_ptr<media::FilterCollection> filter_collection_; 293 scoped_ptr<media::FilterCollection> filter_collection_;
290 scoped_refptr<media::Pipeline> pipeline_; 294 scoped_refptr<media::Pipeline> pipeline_;
291 base::Thread media_thread_; 295 base::Thread media_thread_;
292 296
293 // The currently selected key system. Empty string means that no key system 297 // The currently selected key system. Empty string means that no key system
294 // has been selected. 298 // has been selected.
295 WebKit::WebString current_key_system_; 299 WebKit::WebString current_key_system_;
296 300
297 // Playback state. 301 // Playback state.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 // Temporary for EME v0.1. In the future the init data type should be passed 352 // Temporary for EME v0.1. In the future the init data type should be passed
349 // through GenerateKeyRequest() directly from WebKit. 353 // through GenerateKeyRequest() directly from WebKit.
350 std::string init_data_type_; 354 std::string init_data_type_;
351 355
352 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 356 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
353 }; 357 };
354 358
355 } // namespace webkit_media 359 } // namespace webkit_media
356 360
357 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 361 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698