Combine audio decoding and video decoding onto a single thread.

content/renderer/media/media_stream_impl.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 "content/renderer/media/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 469 matching lines @@
   capability.frame_rate = kVideoCaptureFramePerSecond;
   capability.color = media::VideoCaptureCapability::kI420;
   capability.expected_capture_delay = 0;
   capability.interlaced = false;
 
   DVLOG(1) << "MediaStreamImpl::CreateLocalVideoDecoder video_session_id:"
            << video_session_id;
 
   return new CaptureVideoDecoder(
       message_loop_factory->GetMessageLoop(
-          media::MessageLoopFactory::kVideoDecoder),
+          media::MessageLoopFactory::kDecoder),
       video_session_id,
       vc_manager_.get(),
       capability);
 }
 
 scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateRemoteVideoDecoder(
     webrtc::MediaStreamInterface* stream,
     media::MessageLoopFactory* message_loop_factory) {
   if (!stream->video_tracks() || stream->video_tracks()->count() == 0)
     return NULL;
 
   DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoDecoder label:"
            << stream->label();
 
   return new RTCVideoDecoder(
-      message_loop_factory->GetMessageLoop(
-          media::MessageLoopFactory::kVideoDecoder),
+      message_loop_factory->GetMessageLoop(media::MessageLoopFactory::kDecoder),
       base::MessageLoopProxy::current(),
       stream->video_tracks()->at(0));
 }
 
 talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
 MediaStreamImpl::CreateNativeLocalMediaStream(
     const std::string& label,
     WebKit::WebFrame* frame,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& audio_sources,
     const WebKit::WebVector<WebKit::WebMediaStreamSource>& video_sources) {
@@ skipping 37 matching lines @@
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
 }
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::LocalMediaStreamInterface* local_stream)
     : local_stream_(local_stream) {
 }
 MediaStreamExtraData::~MediaStreamExtraData() {
 }