content/renderer/media/media_stream_center.cc - Issue 155853002: Chrome MediaStream VideoTrack implementation.

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

Issue 155853002: Chrome MediaStream VideoTrack implementation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: More cleanup. Created 6 years, 10 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

« content/renderer/media/media_stream_audio_source.h ('K') | « content/renderer/media/media_stream_audio_source.cc ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | content/renderer/media/media_stream_dependency_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..595aee2c5525c33396053fc9722f1468dd0d2837 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,22 @@ void CreateNativeVideoMediaStreamTrack(

DCHECK(track.extraData() == NULL);

blink::WebMediaStreamSource source = track.source();

DCHECK_EQ(source.type(), blink::WebMediaStreamSource::TypeVideo);

- if (!source.extraData()) {

+ MediaStreamVideoSource* video_source =

Alpha Left Google 2014/02/28 02:49:22 The set of APIs used in the method does make me co

Ronghua Wu (Left Chromium) 2014/03/01 01:26:04 +1

perkj_chrome 2014/03/02 09:20:44 Done.

+ MediaStreamVideoSource::GetVideoSource(source);

+ if (!video_source) {

// TODO(perkj): Implement support for sources from

// remote MediaStreams.

NOTIMPLEMENTED();

return;

}

- MediaStreamTrack* native_track = new MediaStreamVideoTrack(factory);

+ MediaStreamVideoTrack* native_track = new MediaStreamVideoTrack(video_source,

+ factory);

native_track->SetEnabled(track.isEnabled());

blink::WebMediaStreamTrack writable_track(track);

writable_track.setExtraData(native_track);

+ video_source->AddTrack(writable_track,

+ source.constraints(),

+ MediaStreamVideoSource::ConstraintsCallback());

}

void CreateNativeMediaStreamTrack(const blink::WebMediaStreamTrack& track,