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

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

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added MediaStreamAudioSource. Created 6 years, 11 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_video_source.cc
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index acdb7dfc9012677655a044d41e43688d08d1cde3..019537295a7c357966d2cfc3e6c51683b79be6d9 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -9,11 +9,22 @@
namespace content {
+MediaStreamVideoSource::MediaStreamVideoSource(
+ MediaStreamDependencyFactory* factory)
+ : factory_(factory) {
+}
+
+MediaStreamVideoSource::~MediaStreamVideoSource() {
+}
+
void MediaStreamVideoSource::AddTrack(
- const blink::WebMediaStreamTrack& track,
- const blink::WebMediaConstraints& constraints) {
- // TODO(ronghuawu): Put |track| in the registered tracks list. Will later
- // deliver frames to it according to |constraints|.
+ const blink::WebMediaStreamTrack& track) {
+ // TODO(perkj): Use the MediaStreamDependencyFactory for now to create the
+ // MediaStreamVideoTrack since creation is currently still depending on
+ // libjingle. The webrtc video track implementation will attach to the
+ // webrtc::VideoSourceInterface returned by GetAdapter() to receive video
+ // frames.
+ factory_->CreateNativeMediaStreamTrack(track);
}
void MediaStreamVideoSource::RemoveTrack(
@@ -33,7 +44,10 @@ void MediaStreamVideoSource::DeliverVideoFrame(
// TODO(ronghuawu): Deliver |frame| to all the registered tracks.
}
-MediaStreamVideoSource::~MediaStreamVideoSource() {
+void MediaStreamVideoSource::SetAdapter(
+ const scoped_refptr<webrtc::VideoSourceInterface>& adapter) {
+ DCHECK(!adapter_);
+ adapter_ = adapter;
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698