| Index: webrtc/video/vie_encoder.cc
|
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
|
| index 203d1c405a8813d05b627cd464803bb9df39f645..6e48f97e66a369da9956bea64c10a1261bc7e0ee 100644
|
| --- a/webrtc/video/vie_encoder.cc
|
| +++ b/webrtc/video/vie_encoder.cc
|
| @@ -211,7 +211,6 @@ class ViEEncoder::VideoSourceProxy {
|
| // the used degradation_preference.
|
| switch (degradation_preference_) {
|
| case VideoSendStream::DegradationPreference::kBalanced:
|
| - FALLTHROUGH();
|
| case VideoSendStream::DegradationPreference::kMaintainFramerate:
|
| wants.max_framerate_fps = std::numeric_limits<int>::max();
|
| break;
|
| @@ -677,13 +676,14 @@ void ViEEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
|
| int64_t now_ms = clock_->TimeInMilliseconds();
|
| if (pending_encoder_reconfiguration_) {
|
| ReconfigureEncoder();
|
| + last_parameters_update_ms_.emplace(now_ms);
|
| } else if (!last_parameters_update_ms_ ||
|
| now_ms - *last_parameters_update_ms_ >=
|
| vcm::VCMProcessTimer::kDefaultProcessIntervalMs) {
|
| video_sender_.UpdateChannelParemeters(rate_allocator_.get(),
|
| bitrate_observer_);
|
| + last_parameters_update_ms_.emplace(now_ms);
|
| }
|
| - last_parameters_update_ms_.emplace(now_ms);
|
|
|
| if (EncoderPaused()) {
|
| TraceFrameDropStart();
|
| @@ -806,7 +806,6 @@ void ViEEncoder::AdaptDown(AdaptReason reason) {
|
| int max_downgrades = 0;
|
| switch (degradation_preference_) {
|
| case VideoSendStream::DegradationPreference::kBalanced:
|
| - FALLTHROUGH();
|
| case VideoSendStream::DegradationPreference::kMaintainFramerate:
|
| max_downgrades = kMaxCpuResolutionDowngrades;
|
| if (downgrade_requested &&
|
| @@ -842,7 +841,6 @@ void ViEEncoder::AdaptDown(AdaptReason reason) {
|
|
|
| switch (degradation_preference_) {
|
| case VideoSendStream::DegradationPreference::kBalanced:
|
| - FALLTHROUGH();
|
| case VideoSendStream::DegradationPreference::kMaintainFramerate:
|
| // Scale down resolution.
|
| if (!source_proxy_->RequestResolutionLowerThan(
|
| @@ -890,7 +888,6 @@ void ViEEncoder::AdaptUp(AdaptReason reason) {
|
|
|
| switch (degradation_preference_) {
|
| case VideoSendStream::DegradationPreference::kBalanced:
|
| - FALLTHROUGH();
|
| case VideoSendStream::DegradationPreference::kMaintainFramerate:
|
| if (adapt_up_requested &&
|
| adaptation_request.input_pixel_count_ <=
|
| @@ -910,7 +907,6 @@ void ViEEncoder::AdaptUp(AdaptReason reason) {
|
|
|
| switch (degradation_preference_) {
|
| case VideoSendStream::DegradationPreference::kBalanced:
|
| - FALLTHROUGH();
|
| case VideoSendStream::DegradationPreference::kMaintainFramerate: {
|
| // Scale up resolution.
|
| int pixel_count = adaptation_request.input_pixel_count_;
|
|
|