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

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

Issue 83023005: Add VideoTrackSink interface to content/public (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge error Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/renderer/media_stream_video_sink.cc ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 11ba1650f69f183745e2d2e341cb5f46ca542f2b..6172e06a8e31da352c32b056fc1cf6585ef2dcc6 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -12,6 +12,7 @@
#include "content/public/common/content_switches.h"
#include "content/renderer/media/media_stream_source_extra_data.h"
#include "content/renderer/media/media_stream_track_extra_data.h"
+#include "content/renderer/media/media_stream_video_track.h"
#include "content/renderer/media/peer_connection_identity_service.h"
#include "content/renderer/media/rtc_media_constraints.h"
#include "content/renderer/media/rtc_peer_connection_handler.h"
@@ -926,8 +927,15 @@ void MediaStreamDependencyFactory::AddNativeTrackToBlinkTrack(
bool is_local_track) {
DCHECK(!webkit_track.isNull() && !webkit_track.extraData());
blink::WebMediaStreamTrack track = webkit_track;
- track.setExtraData(new MediaStreamTrackExtraData(native_track,
- is_local_track));
+
+ if (track.source().type() == blink::WebMediaStreamSource::TypeVideo) {
+ track.setExtraData(new MediaStreamVideoTrack(
+ static_cast<webrtc::VideoTrackInterface*>(native_track),
+ is_local_track));
+ } else {
+ track.setExtraData(new MediaStreamTrackExtraData(native_track,
+ is_local_track));
+ }
}
webrtc::MediaStreamInterface*
« no previous file with comments | « content/public/renderer/media_stream_video_sink.cc ('k') | content/renderer/media/media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698