summaryrefslogtreecommitdiffstats
path: root/media/tools/player_wtl/movie.cc
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 22:51:20 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-12 22:51:20 +0000
commit084c8552c42ec8e91788c34ed09548b6cd521811 (patch)
treebc9cd856d089a636393a2a9ccb63493b765da1e6 /media/tools/player_wtl/movie.cc
parentb3a160a9100129239d27eb853dc5f2980b14ec93 (diff)
downloadchromium_src-084c8552c42ec8e91788c34ed09548b6cd521811.zip
chromium_src-084c8552c42ec8e91788c34ed09548b6cd521811.tar.gz
chromium_src-084c8552c42ec8e91788c34ed09548b6cd521811.tar.bz2
Use enum instead of string in MessageLoopFactory::GetMessageLoop*
This reinforces that only certain thread/message_loop can be created, which also makes thread/message_loop access easier and more reliable. Also use scoped_refptr<MessageLoopProxy> instead of raw MessageLoop pointer in various places. BUG=none TEST=media_unittest, content_unittest and normal <video> playback. Review URL: https://chromiumcodereview.appspot.com/10855051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools/player_wtl/movie.cc')
-rw-r--r--media/tools/player_wtl/movie.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 2660b2e..c29f8a0 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -59,8 +59,9 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
message_loop_factory_.reset(new media::MessageLoopFactory());
- MessageLoop* pipeline_loop =
- message_loop_factory_->GetMessageLoop("PipelineThread");
+ scoped_refptr<base::MessageLoopProxy> pipeline_loop =
+ message_loop_factory_->GetMessageLoop(
+ media::MessageLoopFactory::kPipeline);
pipeline_ = new Pipeline(pipeline_loop, new media::MediaLog());
// Open the file.
@@ -76,11 +77,11 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
collection->AddAudioDecoder(new FFmpegAudioDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- "AudioDecoderThread")));
+ media::MessageLoopFactory::kAudioDecoder)));
collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder(
base::Bind(&MessageLoopFactory::GetMessageLoop,
base::Unretained(message_loop_factory_.get()),
- "VideoDecoderThread"),
+ media::MessageLoopFactory::kVideoDecoder),
NULL));
// TODO(vrk): Re-enabled audio. (crbug.com/112159)