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 d70af6513aca41ace39c9e1b62169c968c426c29..a9aa1d9531253185cb84f511c91b73f49271537d 100644 |
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc |
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc |
@@ -121,8 +121,6 @@ class MediaCodecVideoEncoder : public webrtc::VideoEncoder, |
void OnDroppedFrame() override; |
- int GetTargetFramerate() override; |
- |
bool SupportsNativeHandle() const override { return egl_context_ != nullptr; } |
const char* ImplementationName() const override; |
@@ -397,7 +395,7 @@ int32_t MediaCodecVideoEncoder::InitEncode( |
// 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 @@ int32_t MediaCodecVideoEncoder::InitEncode( |
// 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 @@ void MediaCodecVideoEncoder::OnDroppedFrame() { |
quality_scaler_.ReportDroppedFrame(); |
} |
-int MediaCodecVideoEncoder::GetTargetFramerate() { |
- return scale_ ? quality_scaler_.GetTargetFramerate() : -1; |
-} |
- |
const char* MediaCodecVideoEncoder::ImplementationName() const { |
return "MediaCodec"; |
} |