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

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

Issue 129923002: Implements MediaStreamVideoSource. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.h
diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h
index 2130916b1b9c296813fbb94b9234241a8e916385..b9db9a7b78f0025aea1f8f2f536d207335a437b7 100644
--- a/content/renderer/media/media_stream_video_source.h
+++ b/content/renderer/media/media_stream_video_source.h
@@ -9,6 +9,7 @@
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
#include "content/renderer/media/media_stream_source_extra_data.h"
+#include "content/renderer/media/webrtc/webrtc_video_source_adapter.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
@@ -26,6 +27,8 @@ namespace content {
class CONTENT_EXPORT MediaStreamVideoSource
: public MediaStreamSourceExtraData {
public:
+ MediaStreamVideoSource();
+
// Puts |track| in the registered tracks list. Will later
// deliver frames to it according to |constraints|.
void AddTrack(const blink::WebMediaStreamTrack& track,
@@ -42,7 +45,16 @@ class CONTENT_EXPORT MediaStreamVideoSource
// Delivers |frame| to registered tracks according to their constraints.
virtual void DeliverVideoFrame(const scoped_refptr<media::VideoFrame>& frame);
+ // For testing only.
+ void SetMsFactory(MediaStreamDependencyFactory* factory);
Jói 2014/01/09 11:18:13 If it's only for testing, name it SetMsFactoryForT
+
virtual ~MediaStreamVideoSource();
+
+ private:
Jói 2014/01/09 11:18:13 missing DISALLOW_COPY_AND_ASSIGN
+ typedef std::vector<WebRtcVideoSourceAdapter*> WebRtcVideoSourceAdapters;
+
+ WebRtcVideoSourceAdapters adapters_;
+ MediaStreamDependencyFactory* factory_;
};
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698