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

Unified Diff: trunk/src/content/renderer/media/media_stream_dependency_factory.cc

Issue 231963002: Revert 262050 "Implement a source for remote video tracks." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/content/renderer/media/media_stream_dependency_factory.cc
===================================================================
--- trunk/src/content/renderer/media/media_stream_dependency_factory.cc (revision 262817)
+++ trunk/src/content/renderer/media/media_stream_dependency_factory.cc (working copy)
@@ -678,20 +678,24 @@
GetWebRtcAudioDevice());
}
-void MediaStreamDependencyFactory::AddNativeAudioTrackToBlinkTrack(
+void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
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;
- DVLOG(1) << "AddNativeTrackToBlinkTrack() audio";
- track.setExtraData(
- new MediaStreamTrack(
- static_cast<webrtc::AudioTrackInterface*>(native_track),
- is_local_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));
+ }
}
bool MediaStreamDependencyFactory::OnControlMessageReceived(

Powered by Google App Engine
This is Rietveld 408576698