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

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

Issue 2764133002: Revert of Add framerate to VideoSinkWants and ability to signal on overuse (Closed)
Patch Set: Created 3 years, 9 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 9ada1b6e11bda30223002bc7111f4063fd08233f..9a05ae67e4a72669a6881fa29b2eebea46d060b5 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -108,7 +108,6 @@
config_(std::move(config)),
codec_settings_set_(false),
resolution_scaling_enabled_(false),
- framerate_scaling_enabled_(false),
source_(nullptr),
num_swapped_frames_(0) {
RTC_DCHECK(config.encoder_settings.encoder != NULL);
@@ -253,24 +252,9 @@
if (source_)
source_->RemoveSink(this);
source_ = source;
- switch (degradation_preference) {
- case DegradationPreference::kMaintainFramerate:
- resolution_scaling_enabled_ = true;
- framerate_scaling_enabled_ = false;
- break;
- case DegradationPreference::kMaintainResolution:
- resolution_scaling_enabled_ = false;
- framerate_scaling_enabled_ = true;
- break;
- case DegradationPreference::kBalanced:
- resolution_scaling_enabled_ = true;
- framerate_scaling_enabled_ = true;
- break;
- case DegradationPreference::kDegradationDisabled:
- resolution_scaling_enabled_ = false;
- framerate_scaling_enabled_ = false;
- break;
- }
+ resolution_scaling_enabled_ =
+ degradation_preference !=
+ webrtc::VideoSendStream::DegradationPreference::kMaintainResolution;
if (source)
source->AddOrUpdateSink(this, resolution_scaling_enabled_
? sink_wants_
@@ -349,9 +333,7 @@
audio_network_state_(webrtc::kNetworkUp),
video_network_state_(webrtc::kNetworkUp),
num_created_send_streams_(0),
- num_created_receive_streams_(0),
- audio_transport_overhead_(0),
- video_transport_overhead_(0) {}
+ num_created_receive_streams_(0) {}
FakeCall::~FakeCall() {
EXPECT_EQ(0u, video_send_streams_.size());
« 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