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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.cc

Issue 282523003: Deliver video frames on libjingle worker thread to WebRtcVideoCapturerAdapter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed the last round. Created 6 years, 7 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/renderer/media/media_stream_dependency_factory.h" 5 #include "content/renderer/media/media_stream_dependency_factory.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 webkit_track.source().type()); 594 webkit_track.source().type());
595 blink::WebMediaStreamTrack track = webkit_track; 595 blink::WebMediaStreamTrack track = webkit_track;
596 596
597 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio"; 597 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
598 track.setExtraData( 598 track.setExtraData(
599 new MediaStreamTrack( 599 new MediaStreamTrack(
600 static_cast<webrtc::AudioTrackInterface*>(native_track), 600 static_cast<webrtc::AudioTrackInterface*>(native_track),
601 is_local_track)); 601 is_local_track));
602 } 602 }
603 603
604 scoped_refptr<base::MessageLoopProxy>
605 MediaStreamDependencyFactory::GetWebRtcWorkerThread() const {
606 DCHECK(CalledOnValidThread());
607 return chrome_worker_thread_.message_loop_proxy();
608 }
609
604 bool MediaStreamDependencyFactory::OnControlMessageReceived( 610 bool MediaStreamDependencyFactory::OnControlMessageReceived(
605 const IPC::Message& message) { 611 const IPC::Message& message) {
606 bool handled = true; 612 bool handled = true;
607 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message) 613 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message)
608 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile) 614 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile)
609 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump) 615 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump)
610 IPC_MESSAGE_UNHANDLED(handled = false) 616 IPC_MESSAGE_UNHANDLED(handled = false)
611 IPC_END_MESSAGE_MAP() 617 IPC_END_MESSAGE_MAP()
612 return handled; 618 return handled;
613 } 619 }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 } 660 }
655 661
656 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() { 662 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
657 if (audio_device_) 663 if (audio_device_)
658 return; 664 return;
659 665
660 audio_device_ = new WebRtcAudioDeviceImpl(); 666 audio_device_ = new WebRtcAudioDeviceImpl();
661 } 667 }
662 668
663 } // namespace content 669 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698