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

Unified Diff: webrtc/media/engine/fakewebrtccall.cc

Issue 2344923002: Revert of Replace interface VideoCapturerInput with VideoSinkInterface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 3 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
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/engine/fakewebrtccall.cc
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc
index 9437fa0fbaec234ec1d81d6815e0da795a84240f..cb904df66fdcf1275bf722ddb6220968bd0bd8ab 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -103,15 +103,9 @@
: sending_(false),
config_(std::move(config)),
codec_settings_set_(false),
- source_(nullptr),
num_swapped_frames_(0) {
RTC_DCHECK(config.encoder_settings.encoder != NULL);
ReconfigureVideoEncoder(std::move(encoder_config));
-}
-
-FakeVideoSendStream::~FakeVideoSendStream() {
- if (source_)
- source_->RemoveSink(this);
}
const webrtc::VideoSendStream::Config& FakeVideoSendStream::GetConfig() const {
@@ -168,7 +162,8 @@
return last_frame_.render_time_ms();
}
-void FakeVideoSendStream::OnFrame(const webrtc::VideoFrame& frame) {
+void FakeVideoSendStream::IncomingCapturedFrame(
+ const webrtc::VideoFrame& frame) {
++num_swapped_frames_;
last_frame_.ShallowCopy(frame);
}
@@ -209,22 +204,16 @@
++num_encoder_reconfigurations_;
}
+webrtc::VideoCaptureInput* FakeVideoSendStream::Input() {
+ return this;
+}
+
void FakeVideoSendStream::Start() {
sending_ = true;
}
void FakeVideoSendStream::Stop() {
sending_ = false;
-}
-
-void FakeVideoSendStream::SetSource(
- rtc::VideoSourceInterface<webrtc::VideoFrame>* source) {
- RTC_DCHECK(source != source_);
- if (source_)
- source_->RemoveSink(this);
- source_ = source;
- if (source)
- source->AddOrUpdateSink(this, rtc::VideoSinkWants());
}
FakeVideoReceiveStream::FakeVideoReceiveStream(
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698