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

Side by Side Diff: content/renderer/media/webrtc/webrtc_media_stream_adapter.cc

Issue 1514143003: Add support for unmixed audio from remote WebRTC remote tracks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix other include Created 5 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/webrtc/webrtc_media_stream_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/renderer/media/media_stream_audio_source.h" 8 #include "content/renderer/media/media_stream_audio_source.h"
9 #include "content/renderer/media/media_stream_audio_track.h"
9 #include "content/renderer/media/media_stream_track.h" 10 #include "content/renderer/media/media_stream_track.h"
10 #include "content/renderer/media/webrtc/media_stream_video_webrtc_sink.h" 11 #include "content/renderer/media/webrtc/media_stream_video_webrtc_sink.h"
11 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 12 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
12 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 13 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
13 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h" 14 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
14 #include "third_party/WebKit/public/platform/WebString.h" 15 #include "third_party/WebKit/public/platform/WebString.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 WebRtcMediaStreamAdapter::WebRtcMediaStreamAdapter( 19 WebRtcMediaStreamAdapter::WebRtcMediaStreamAdapter(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 71 }
71 } 72 }
72 } 73 }
73 } 74 }
74 75
75 void WebRtcMediaStreamAdapter::CreateAudioTrack( 76 void WebRtcMediaStreamAdapter::CreateAudioTrack(
76 const blink::WebMediaStreamTrack& track) { 77 const blink::WebMediaStreamTrack& track) {
77 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeAudio); 78 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeAudio);
78 // A media stream is connected to a peer connection, enable the 79 // A media stream is connected to a peer connection, enable the
79 // peer connection mode for the sources. 80 // peer connection mode for the sources.
80 MediaStreamTrack* native_track = MediaStreamTrack::GetTrack(track); 81 MediaStreamAudioTrack* native_track = MediaStreamAudioTrack::GetTrack(track);
81 if (!native_track || !native_track->is_local_track()) { 82 if (!native_track || !native_track->is_local_track()) {
82 // We don't support connecting remote audio tracks to PeerConnection yet. 83 // We don't support connecting remote audio tracks to PeerConnection yet.
83 // See issue http://crbug/344303. 84 // See issue http://crbug/344303.
84 // TODO(xians): Remove this after we support connecting remote audio track 85 // TODO(xians): Remove this after we support connecting remote audio track
85 // to PeerConnection. 86 // to PeerConnection.
86 NOTIMPLEMENTED() << "webrtc audio track can not be created from a remote " 87 NOTIMPLEMENTED() << "webrtc audio track can not be created from a remote "
87 << "audio track."; 88 << "audio track.";
88 return; 89 return;
89 } 90 }
90 91
(...skipping 10 matching lines...) Expand all
101 void WebRtcMediaStreamAdapter::CreateVideoTrack( 102 void WebRtcMediaStreamAdapter::CreateVideoTrack(
102 const blink::WebMediaStreamTrack& track) { 103 const blink::WebMediaStreamTrack& track) {
103 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeVideo); 104 DCHECK_EQ(track.source().type(), blink::WebMediaStreamSource::TypeVideo);
104 MediaStreamVideoWebRtcSink* adapter = 105 MediaStreamVideoWebRtcSink* adapter =
105 new MediaStreamVideoWebRtcSink(track, factory_); 106 new MediaStreamVideoWebRtcSink(track, factory_);
106 video_adapters_.push_back(adapter); 107 video_adapters_.push_back(adapter);
107 webrtc_media_stream_->AddTrack(adapter->webrtc_video_track()); 108 webrtc_media_stream_->AddTrack(adapter->webrtc_video_track());
108 } 109 }
109 110
110 } // namespace content 111 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc/media_stream_remote_audio_track.cc ('k') | content/renderer/media/webrtc_audio_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698