| Index: webrtc/video/vie_encoder.cc
|
| diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
|
| index ecf3a547ee74af7fbb7fad7ad753837c3e4b026f..621697b23536186516989d0ff1d5384b3cc71d76 100644
|
| --- a/webrtc/video/vie_encoder.cc
|
| +++ b/webrtc/video/vie_encoder.cc
|
| @@ -213,9 +213,8 @@ class ViEEncoder::VideoSourceProxy {
|
| // Called on the encoder task queue.
|
| rtc::CritScope lock(&crit_);
|
| if (!IsResolutionScalingEnabledLocked()) {
|
| - // This can happen since |degradation_preference_| is set on
|
| - // libjingle's worker thread but the adaptation is done on the encoder
|
| - // task queue.
|
| + // This can happen since |degradation_preference_| is set on libjingle's
|
| + // worker thread but the adaptation is done on the encoder task queue.
|
| return;
|
| }
|
| // The input video frame size will have a resolution with less than or
|
| @@ -234,9 +233,8 @@ class ViEEncoder::VideoSourceProxy {
|
| // Called on the encoder task queue.
|
| rtc::CritScope lock(&crit_);
|
| if (!IsFramerateScalingEnabledLocked()) {
|
| - // This can happen since |degradation_preference_| is set on
|
| - // libjingle's worker thread but the adaptation is done on the encoder
|
| - // task queue.
|
| + // This can happen since |degradation_preference_| is set on libjingle's
|
| + // worker thread but the adaptation is done on the encoder task queue.
|
| return;
|
| }
|
| // The input video frame rate will be scaled down to 2/3 of input fps,
|
| @@ -251,9 +249,8 @@ class ViEEncoder::VideoSourceProxy {
|
| void RequestHigherResolutionThan(int pixel_count) {
|
| rtc::CritScope lock(&crit_);
|
| if (!IsResolutionScalingEnabledLocked()) {
|
| - // This can happen since |degradation_preference_| is set on
|
| - // libjingle's worker thread but the adaptation is done on the encoder
|
| - // task queue.
|
| + // This can happen since |degradation_preference_| is set on libjingle's
|
| + // worker thread but the adaptation is done on the encoder task queue.
|
| return;
|
| }
|
|
|
| @@ -280,9 +277,8 @@ class ViEEncoder::VideoSourceProxy {
|
| // Called on the encoder task queue.
|
| rtc::CritScope lock(&crit_);
|
| if (!IsFramerateScalingEnabledLocked()) {
|
| - // This can happen since |degradation_preference_| is set on
|
| - // libjingle's worker thread but the adaptation is done on the encoder
|
| - // task queue.
|
| + // This can happen since |degradation_preference_| is set on libjingle's
|
| + // worker thread but the adaptation is done on the encoder task queue.
|
| return;
|
| }
|
| if (framerate_fps == std::numeric_limits<int>::max()) {
|
|
|