Combine audio decoding and video decoding onto a single thread.

media/tools/player_wtl/movie.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/tools/player_wtl/movie.h"
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
@@ skipping 61 matching lines @@
   if (!data_source->Initialize(url_utf8)) {
     return false;
   }
 
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
   collection->SetDemuxer(new FFmpegDemuxer(pipeline_loop, data_source));
   collection->AddAudioDecoder(new FFmpegAudioDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
-                 media::MessageLoopFactory::kAudioDecoder)));
+                 media::MessageLoopFactory::kDecoder)));
   collection->GetVideoDecoders()->push_back(new FFmpegVideoDecoder(
       base::Bind(&MessageLoopFactory::GetMessageLoop,
                  base::Unretained(message_loop_factory_.get()),
-                 media::MessageLoopFactory::kVideoDecoder),
+                 media::MessageLoopFactory::kDecoder),
       NULL));
 
   // TODO(vrk): Re-enabled audio. (crbug.com/112159)
   collection->AddAudioRenderer(
       new media::AudioRendererImpl(new media::NullAudioSink()));
   collection->AddVideoRenderer(video_renderer);
 
   // Create and start our pipeline.
   media::PipelineStatusNotification note;
   pipeline_->Start(
@@ skipping 87 matching lines @@
 void Movie::Close() {
   if (pipeline_) {
     pipeline_->Stop(base::Closure());
     pipeline_ = NULL;
   }
 
   message_loop_factory_.reset();
 }
 
 }  // namespace media