Index: content/renderer/media/media_stream_center.cc |
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc |
index c97851b71af934a1da757d46381c7b5d75036fe1..770498a6b43f58072d03a8629bd872148326c515 100644 |
--- a/content/renderer/media/media_stream_center.cc |
+++ b/content/renderer/media/media_stream_center.cc |
@@ -14,7 +14,9 @@ |
#include "content/renderer/media/media_stream.h" |
#include "content/renderer/media/media_stream_dependency_factory.h" |
#include "content/renderer/media/media_stream_source.h" |
+#include "content/renderer/media/media_stream_video_source.h" |
#include "content/renderer/media/media_stream_video_track.h" |
+#include "third_party/WebKit/public/platform/WebMediaConstraints.h" |
#include "third_party/WebKit/public/platform/WebMediaStream.h" |
#include "third_party/WebKit/public/platform/WebMediaStreamCenterClient.h" |
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h" |
@@ -46,17 +48,19 @@ void CreateNativeVideoMediaStreamTrack( |
DCHECK(track.extraData() == NULL); |
blink::WebMediaStreamSource source = track.source(); |
DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeVideo); |
- |
- if (!source.extraData()) { |
+ MediaStreamVideoSource* native_source = |
+ MediaStreamVideoSource::GetVideoSource(source); |
+ if (!native_source) { |
// TODO(perkj): Implement support for sources from |
// remote MediaStreams. |
NOTIMPLEMENTED(); |
return; |
} |
- MediaStreamTrack* native_track = new MediaStreamVideoTrack(factory); |
- native_track->SetEnabled(track.isEnabled()); |
blink::WebMediaStreamTrack writable_track(track); |
- writable_track.setExtraData(native_track); |
+ writable_track.setExtraData( |
+ new MediaStreamVideoTrack(native_source, source.constraints(), |
+ MediaStreamVideoSource::ConstraintsCallback(), |
+ track.isEnabled(), factory)); |
} |
void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track, |