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

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

Issue 15993018: Reland: Use a shared thread for media operations (round 3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | « webkit/mocks/test_media_stream_client.cc ('k') | webkit/renderer/media/webmediaplayer_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 WebKit::WebMediaPlayer::ReadyState ready_state_; 280 WebKit::WebMediaPlayer::ReadyState ready_state_;
281 281
282 // Keep a list of buffered time ranges. 282 // Keep a list of buffered time ranges.
283 WebKit::WebTimeRanges buffered_; 283 WebKit::WebTimeRanges buffered_;
284 284
285 // Message loops for posting tasks on Chrome's main thread. Also used 285 // 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. 286 // for DCHECKs so methods calls won't execute in the wrong thread.
287 const scoped_refptr<base::MessageLoopProxy> main_loop_; 287 const scoped_refptr<base::MessageLoopProxy> main_loop_;
288 288
289 scoped_ptr<media::Pipeline> pipeline_; 289 scoped_ptr<media::Pipeline> pipeline_;
290 base::Thread media_thread_; 290 scoped_refptr<base::MessageLoopProxy> media_loop_;
291 291
292 // The currently selected key system. Empty string means that no key system 292 // The currently selected key system. Empty string means that no key system
293 // has been selected. 293 // has been selected.
294 WebKit::WebString current_key_system_; 294 WebKit::WebString current_key_system_;
295 295
296 // Playback state. 296 // Playback state.
297 // 297 //
298 // TODO(scherkus): we have these because Pipeline favours the simplicity of a 298 // TODO(scherkus): we have these because Pipeline favours the simplicity of a
299 // single "playback rate" over worrying about paused/stopped etc... It forces 299 // single "playback rate" over worrying about paused/stopped etc... It forces
300 // all clients to manage the pause+playback rate externally, but is that 300 // all clients to manage the pause+playback rate externally, but is that
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 378
379 // Text track objects get a unique index value when they're created. 379 // Text track objects get a unique index value when they're created.
380 int text_track_index_; 380 int text_track_index_;
381 381
382 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 382 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
383 }; 383 };
384 384
385 } // namespace webkit_media 385 } // namespace webkit_media
386 386
387 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 387 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/mocks/test_media_stream_client.cc ('k') | webkit/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698