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

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

Issue 201583003: Implement a source for remote video tracks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 698 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 // view, for example, by an extension. 709 // view, for example, by an extension.
710 DCHECK_GE(render_view_id, 0); 710 DCHECK_GE(render_view_id, 0);
711 711
712 EnsureWebRtcAudioDeviceImpl(); 712 EnsureWebRtcAudioDeviceImpl();
713 DCHECK(GetWebRtcAudioDevice()); 713 DCHECK(GetWebRtcAudioDevice());
714 return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info, 714 return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info,
715 constraints, 715 constraints,
716 GetWebRtcAudioDevice()); 716 GetWebRtcAudioDevice());
717 } 717 }
718 718
719 void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( 719 void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
Ronghua Wu (Left Chromium) 2014/03/17 22:45:35 rename this to indicate audio only?
perkj_chrome 2014/03/19 16:34:48 Done.
720 webrtc::MediaStreamTrackInterface* native_track, 720 webrtc::MediaStreamTrackInterface* native_track,
721 const blink::WebMediaStreamTrack& webkit_track, 721 const blink::WebMediaStreamTrack& webkit_track,
722 bool is_local_track) { 722 bool is_local_track) {
723 DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); 723 DCHECK(!webkit_track.isNull() && !webkit_track.extraData());
724 DCHECK_EQ(blink::WebMediaStreamSource::TypeAudio,
725 webkit_track.source().type());
724 blink::WebMediaStreamTrack track = webkit_track; 726 blink::WebMediaStreamTrack track = webkit_track;
725 727
726 if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) { 728 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
727 DVLOG(1) << "AddNativeTrackToBlinkTrack() video"; 729 track.setExtraData(
728 track.setExtraData(new WebRtcMediaStreamVideoTrack( 730 new MediaStreamTrack(
729 static_cast<webrtc::VideoTrackInterface*>(native_track))); 731 static_cast<webrtc::AudioTrackInterface*>(native_track),
730 } else { 732 is_local_track));
731 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
732 track.setExtraData(
733 new MediaStreamTrack(
734 static_cast<webrtc::AudioTrackInterface*>(native_track),
735 is_local_track));
736 }
737 } 733 }
738 734
739 bool MediaStreamDependencyFactory::OnControlMessageReceived( 735 bool MediaStreamDependencyFactory::OnControlMessageReceived(
740 const IPC::Message& message) { 736 const IPC::Message& message) {
741 bool handled = true; 737 bool handled = true;
742 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message) 738 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message)
743 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile) 739 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile)
744 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump) 740 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump)
745 IPC_MESSAGE_UNHANDLED(handled = false) 741 IPC_MESSAGE_UNHANDLED(handled = false)
746 IPC_END_MESSAGE_MAP() 742 IPC_END_MESSAGE_MAP()
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
792 } 788 }
793 789
794 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() { 790 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
795 if (audio_device_) 791 if (audio_device_)
796 return; 792 return;
797 793
798 audio_device_ = new WebRtcAudioDeviceImpl(); 794 audio_device_ = new WebRtcAudioDeviceImpl();
799 } 795 }
800 796
801 } // namespace content 797 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698