| OLD | NEW |
| 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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 671 // view, for example, by an extension. | 671 // view, for example, by an extension. |
| 672 DCHECK_GE(render_view_id, 0); | 672 DCHECK_GE(render_view_id, 0); |
| 673 | 673 |
| 674 EnsureWebRtcAudioDeviceImpl(); | 674 EnsureWebRtcAudioDeviceImpl(); |
| 675 DCHECK(GetWebRtcAudioDevice()); | 675 DCHECK(GetWebRtcAudioDevice()); |
| 676 return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info, | 676 return WebRtcAudioCapturer::CreateCapturer(render_view_id, device_info, |
| 677 constraints, | 677 constraints, |
| 678 GetWebRtcAudioDevice()); | 678 GetWebRtcAudioDevice()); |
| 679 } | 679 } |
| 680 | 680 |
| 681 void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack( | 681 void MediaStreamDependencyFactory::AddNativeAudioTrackToBlinkTrack( |
| 682 webrtc::MediaStreamTrackInterface* native_track, | 682 webrtc::MediaStreamTrackInterface* native_track, |
| 683 const blink::WebMediaStreamTrack& webkit_track, | 683 const blink::WebMediaStreamTrack& webkit_track, |
| 684 bool is_local_track) { | 684 bool is_local_track) { |
| 685 DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); | 685 DCHECK(!webkit_track.isNull() && !webkit_track.extraData()); |
| 686 DCHECK_EQ(blink::WebMediaStreamSource::TypeAudio, |
| 687 webkit_track.source().type()); |
| 686 blink::WebMediaStreamTrack track = webkit_track; | 688 blink::WebMediaStreamTrack track = webkit_track; |
| 687 | 689 |
| 688 if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) { | 690 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio"; |
| 689 DVLOG(1) << "AddNativeTrackToBlinkTrack() video"; | 691 track.setExtraData( |
| 690 track.setExtraData(new WebRtcMediaStreamVideoTrack( | 692 new MediaStreamTrack( |
| 691 static_cast<webrtc::VideoTrackInterface*>(native_track))); | 693 static_cast<webrtc::AudioTrackInterface*>(native_track), |
| 692 } else { | 694 is_local_track)); |
| 693 DVLOG(1) << "AddNativeTrackToBlinkTrack() audio"; | |
| 694 track.setExtraData( | |
| 695 new MediaStreamTrack( | |
| 696 static_cast<webrtc::AudioTrackInterface*>(native_track), | |
| 697 is_local_track)); | |
| 698 } | |
| 699 } | 695 } |
| 700 | 696 |
| 701 bool MediaStreamDependencyFactory::OnControlMessageReceived( | 697 bool MediaStreamDependencyFactory::OnControlMessageReceived( |
| 702 const IPC::Message& message) { | 698 const IPC::Message& message) { |
| 703 bool handled = true; | 699 bool handled = true; |
| 704 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message) | 700 IPC_BEGIN_MESSAGE_MAP(MediaStreamDependencyFactory, message) |
| 705 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile) | 701 IPC_MESSAGE_HANDLER(MediaStreamMsg_EnableAecDump, OnAecDumpFile) |
| 706 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump) | 702 IPC_MESSAGE_HANDLER(MediaStreamMsg_DisableAecDump, OnDisableAecDump) |
| 707 IPC_MESSAGE_UNHANDLED(handled = false) | 703 IPC_MESSAGE_UNHANDLED(handled = false) |
| 708 IPC_END_MESSAGE_MAP() | 704 IPC_END_MESSAGE_MAP() |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 } | 750 } |
| 755 | 751 |
| 756 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() { | 752 void MediaStreamDependencyFactory::EnsureWebRtcAudioDeviceImpl() { |
| 757 if (audio_device_) | 753 if (audio_device_) |
| 758 return; | 754 return; |
| 759 | 755 |
| 760 audio_device_ = new WebRtcAudioDeviceImpl(); | 756 audio_device_ = new WebRtcAudioDeviceImpl(); |
| 761 } | 757 } |
| 762 | 758 |
| 763 } // namespace content | 759 } // namespace content |
| OLD | NEW |