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

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

Issue 231963002: Revert 262050 "Implement a source for remote video tracks." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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: trunk/src/content/renderer/media/mock_media_stream_dependency_factory.cc
===================================================================
--- trunk/src/content/renderer/media/mock_media_stream_dependency_factory.cc (revision 262817)
+++ trunk/src/content/renderer/media/mock_media_stream_dependency_factory.cc (working copy)
@@ -283,64 +283,60 @@
return static_cast<MockRtcVideoCapturer*>(capturer_.get())->GetFrameNum();
}
-MockWebRtcVideoTrack::MockWebRtcVideoTrack(
- std::string id,
- webrtc::VideoSourceInterface* source)
+MockLocalVideoTrack::MockLocalVideoTrack(std::string id,
+ webrtc::VideoSourceInterface* source)
: enabled_(false),
id_(id),
state_(MediaStreamTrackInterface::kLive),
source_(source),
- observer_(NULL),
- renderer_(NULL) {
+ observer_(NULL) {
}
-MockWebRtcVideoTrack::~MockWebRtcVideoTrack() {}
+MockLocalVideoTrack::~MockLocalVideoTrack() {}
-void MockWebRtcVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
- DCHECK(!renderer_);
- renderer_ = renderer;
+void MockLocalVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
+ NOTIMPLEMENTED();
}
-void MockWebRtcVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
- DCHECK_EQ(renderer_, renderer);
- renderer_ = NULL;
+void MockLocalVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
+ NOTIMPLEMENTED();
}
-std::string MockWebRtcVideoTrack::kind() const {
+std::string MockLocalVideoTrack::kind() const {
NOTIMPLEMENTED();
return std::string();
}
-std::string MockWebRtcVideoTrack::id() const { return id_; }
+std::string MockLocalVideoTrack::id() const { return id_; }
-bool MockWebRtcVideoTrack::enabled() const { return enabled_; }
+bool MockLocalVideoTrack::enabled() const { return enabled_; }
-MockWebRtcVideoTrack::TrackState MockWebRtcVideoTrack::state() const {
+MockLocalVideoTrack::TrackState MockLocalVideoTrack::state() const {
return state_;
}
-bool MockWebRtcVideoTrack::set_enabled(bool enable) {
+bool MockLocalVideoTrack::set_enabled(bool enable) {
enabled_ = enable;
return true;
}
-bool MockWebRtcVideoTrack::set_state(TrackState new_state) {
+bool MockLocalVideoTrack::set_state(TrackState new_state) {
state_ = new_state;
if (observer_)
observer_->OnChanged();
return true;
}
-void MockWebRtcVideoTrack::RegisterObserver(ObserverInterface* observer) {
+void MockLocalVideoTrack::RegisterObserver(ObserverInterface* observer) {
observer_ = observer;
}
-void MockWebRtcVideoTrack::UnregisterObserver(ObserverInterface* observer) {
+void MockLocalVideoTrack::UnregisterObserver(ObserverInterface* observer) {
DCHECK(observer_ == observer);
observer_ = NULL;
}
-VideoSourceInterface* MockWebRtcVideoTrack::GetSource() const {
+VideoSourceInterface* MockLocalVideoTrack::GetSource() const {
return source_.get();
}
@@ -484,7 +480,7 @@
const std::string& id,
webrtc::VideoSourceInterface* source) {
scoped_refptr<webrtc::VideoTrackInterface> track(
- new talk_base::RefCountedObject<MockWebRtcVideoTrack>(
+ new talk_base::RefCountedObject<MockLocalVideoTrack>(
id, source));
return track;
}
@@ -497,8 +493,7 @@
new talk_base::RefCountedObject<MockVideoSource>();
source->SetVideoCapturer(capturer);
- return
- new talk_base::RefCountedObject<MockWebRtcVideoTrack>(id, source.get());
+ return new talk_base::RefCountedObject<MockLocalVideoTrack>(id, source.get());
}
SessionDescriptionInterface*

Powered by Google App Engine
This is Rietveld 408576698