commit 3c6eac2860ffea44c193b3e34a6711e8142f8379
author Peter Boström <pbos@webrtc.org> Tue Apr 26 13:37:10 2016 +0200
committer Peter Boström <pbos@webrtc.org> Tue Apr 26 11:37:20 2016 +0000
tree 185612da8a98d3f04db3ca2fb98e3b27dfced6d8
parent d486dc1bd7f1e0eff7118f14b22768067dcd9cef

Remove QualityScaler framerate reduction.

Framerate-reduction code is disabled on all platforms, and this code
adds complexity. It's necessary to react fast, especially on mobile
platforms or other bad network conditions and framerate reduction adds
another step between HD and QVGA.

BUG=webrtc:5678, webrtc:5830
R=jackychen@webrtc.org, mflodman@webrtc.org

Review URL: https://codereview.webrtc.org/1885893002 .

Cr-Commit-Position: refs/heads/master@{#12503}

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 d70af65..a9aa1d9 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -121,8 +121,6 @@
 
   void OnDroppedFrame() override;
 
-  int GetTargetFramerate() override;
-
   bool SupportsNativeHandle() const override { return egl_context_ != nullptr; }
   const char* ImplementationName() const override;
 
@@ -397,7 +395,7 @@
       // 63].
       const int kLowQpThreshold = 29;
       const int kBadQpThreshold = 100;
-      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
+      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold,
                            codec_settings->startBitrate, codec_settings->width,
                            codec_settings->height,
                            codec_settings->maxFramerate);
@@ -405,7 +403,7 @@
       // H264 QP is in the range [0, 51].
       const int kLowQpThreshold = 24;
       const int kBadQpThreshold = 39;
-      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
+      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold,
                            codec_settings->startBitrate, codec_settings->width,
                            codec_settings->height,
                            codec_settings->maxFramerate);
@@ -1176,10 +1174,6 @@
     quality_scaler_.ReportDroppedFrame();
 }
 
-int MediaCodecVideoEncoder::GetTargetFramerate() {
-  return scale_ ? quality_scaler_.GetTargetFramerate() : -1;
-}
-
 const char* MediaCodecVideoEncoder::ImplementationName() const {
   return "MediaCodec";
 }