Index: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
index 41257133c55a8aa898ccce316809f9082ba24822..3eb47eedc01f0d967b7ab05d4e17e481d8fee504 100644 |
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc |
@@ -598,15 +598,13 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, |
} |
rps_.Init(); |
- // Disable both high-QP limits and framedropping. Both are handled by libvpx |
- // internally. |
// QP thresholds are chosen to be high enough to be hit in practice when |
// quality is good, but also low enough to not cause a flip-flop behavior |
// (e.g. going up in resolution shouldn't give so bad quality that we should |
// go back down). |
const int kLowQpThreshold = 29; |
- const int kDisabledBadQpThreshold = 100; |
- quality_scaler_.Init(kLowQpThreshold, kDisabledBadQpThreshold, false, |
+ const int kBadQpThreshold = 100; |
+ quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, |
codec_.startBitrate, codec_.width, codec_.height, |
codec_.maxFramerate); |