Revert of Make QualityScaler more responsive to downgrades.

webrtc/api/java/jni/androidmediaencoder_jni.cc

Index: webrtc/api/java/jni/androidmediaencoder_jni.cc
diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc
index 35291dfb1e4d43f6eae3986b99a6a30d2ec646d2..b46d82ecd719c3927eb24b17626a714faf2daa4e 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -382,17 +382,15 @@
       const int kLowQpThreshold = 32;
       const int kBadQpThreshold = 92;
       quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
-                           codec_settings->startBitrate, codec_settings->width,
-                           codec_settings->height,
-                           codec_settings->maxFramerate);
+          codec_settings->startBitrate,
+          codec_settings->width, codec_settings->height);
     } else if (codecType_ == kVideoCodecH264) {
       // H264 QP is in the range [0, 51].
       const int kLowQpThreshold = 21;
       const int kBadQpThreshold = 36;
       quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
-                           codec_settings->startBitrate, codec_settings->width,
-                           codec_settings->height,
-                           codec_settings->maxFramerate);
+          codec_settings->startBitrate,
+          codec_settings->width, codec_settings->height);
     } else {
       // When adding codec support to additional hardware codecs, also configure
       // their QP thresholds for scaling.
@@ -400,6 +398,7 @@
       scale_ = false;
     }
     quality_scaler_.SetMinResolution(kMinDimension, kMinDimension);
+    quality_scaler_.ReportFramerate(codec_settings->maxFramerate);
     QualityScaler::Resolution res = quality_scaler_.GetScaledResolution();
     init_width = std::max(res.width, kMinDimension);
     init_height = std::max(res.height, kMinDimension);