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

Unified 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: Rebased Created 6 years, 8 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
Index: content/renderer/media/media_stream_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index fef5308d6d8f1fa6171fbd89d7314c6455a513e8..70f3d06112c79c43da0c27e773fbf81b66067b83 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -678,24 +678,20 @@ MediaStreamDependencyFactory::CreateAudioCapturer(
GetWebRtcAudioDevice());
}
-void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
+void MediaStreamDependencyFactory::AddNativeAudioTrackToBlinkTrack(
webrtc::MediaStreamTrackInterface* native_track,
const blink::WebMediaStreamTrack& webkit_track,
bool is_local_track) {
DCHECK(!webkit_track.isNull() && !webkit_track.extraData());
+ DCHECK_EQ(blink::WebMediaStreamSource::TypeAudio,
+ webkit_track.source().type());
blink::WebMediaStreamTrack track = webkit_track;
- if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) {
- DVLOG(1) << "AddNativeTrackToBlinkTrack() video";
- track.setExtraData(new WebRtcMediaStreamVideoTrack(
- static_cast<webrtc::VideoTrackInterface*>(native_track)));
- } else {
- DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
- track.setExtraData(
- new MediaStreamTrack(
- static_cast<webrtc::AudioTrackInterface*>(native_track),
- is_local_track));
- }
+ DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
+ track.setExtraData(
+ new MediaStreamTrack(
+ static_cast<webrtc::AudioTrackInterface*>(native_track),
+ is_local_track));
}
bool MediaStreamDependencyFactory::OnControlMessageReceived(
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.h ('k') | content/renderer/media/media_stream_video_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698