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

Unified Diff: content/renderer/media/media_stream_impl.cc

Issue 10915091: Combine audio decoding and video decoding onto a single thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index c794f05bd4380adef63045076e1a407356d5c527..744f61cb486d0612ebe52626c8ca2d96fdd62471 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -487,7 +487,7 @@ scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateLocalVideoDecoder(
return new CaptureVideoDecoder(
message_loop_factory->GetMessageLoop(
- media::MessageLoopFactory::kVideoDecoder),
+ media::MessageLoopFactory::kDecoder),
video_session_id,
vc_manager_.get(),
capability);
@@ -503,8 +503,7 @@ scoped_refptr<media::VideoDecoder> MediaStreamImpl::CreateRemoteVideoDecoder(
<< 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));
}
« no previous file with comments | « no previous file | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698