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

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

Issue 14312015: Effects Pepper Plugin and MediaStream Glue. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 7 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/mock_media_stream_dependency_factory.cc
===================================================================
--- content/renderer/media/mock_media_stream_dependency_factory.cc (revision 198365)
+++ content/renderer/media/mock_media_stream_dependency_factory.cc (working copy)
@@ -5,9 +5,11 @@
#include "content/renderer/media/mock_media_stream_dependency_factory.h"
#include "base/logging.h"
+#include "base/utf_string_conversions.h"
#include "content/renderer/media/mock_peer_connection_impl.h"
#include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
+#include "third_party/libjingle/source/talk/media/base/videocapturer.h"
using webrtc::AudioSourceInterface;
using webrtc::AudioTrackInterface;
@@ -153,9 +155,12 @@
MockVideoSource::~MockVideoSource() {}
+void MockVideoSource::SetVideoCapturer(cricket::VideoCapturer* capturer) {
+ capturer_.reset(capturer);
+}
+
cricket::VideoCapturer* MockVideoSource::GetVideoCapturer() {
- NOTIMPLEMENTED();
- return NULL;
+ return capturer_.get();
}
void MockVideoSource::AddSink(cricket::VideoRenderer* output) {
@@ -467,6 +472,19 @@
return track;
}
+scoped_refptr<webrtc::VideoTrackInterface>
+MockMediaStreamDependencyFactory::CreateLocalVideoTrack(
+ const std::string& id,
+ cricket::VideoCapturer* capturer) {
+ DCHECK(mock_pc_factory_created_);
+
+ scoped_refptr<MockVideoSource> source =
+ new talk_base::RefCountedObject<MockVideoSource>();
+ source->SetVideoCapturer(capturer);
+
+ return new talk_base::RefCountedObject<MockLocalVideoTrack>(id, source);
+}
+
scoped_refptr<webrtc::AudioTrackInterface>
MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
const std::string& id,
« no previous file with comments | « content/renderer/media/mock_media_stream_dependency_factory.h ('k') | content/renderer/media/mock_media_stream_registry.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698