Add initial bitrate and frame resolution parameters to quality scaler.

webrtc/api/java/jni/androidmediaencoder_jni.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 27 matching lines @@
 
 using webrtc::CodecSpecificInfo;
 using webrtc::EncodedImage;
 using webrtc::VideoFrame;
 using webrtc::RTPFragmentationHeader;
 using webrtc::VideoCodec;
 using webrtc::VideoCodecType;
 using webrtc::kVideoCodecH264;
 using webrtc::kVideoCodecVP8;
 using webrtc::kVideoCodecVP9;
+using webrtc::QualityScaler;
 
 namespace webrtc_jni {
 
 // H.264 start code length.
 #define H264_SC_LENGTH 4
 // Maximum allowed NALUs in one output frame.
 #define MAX_NALUS_PERFRAME 32
 // Maximum supported HW video encoder resolution.
 #define MAX_VIDEO_WIDTH 1280
 #define MAX_VIDEO_HEIGHT 1280
@@ skipping 177 matching lines @@
   int32_t output_timestamp_;  // Last output frame timestamp from timestamps_ Q.
   int64_t output_render_time_ms_; // Last output frame render time from
                                   // render_times_ms_ queue.
   // Frame size in bytes fed to MediaCodec.
   int yuv_size_;
   // True only when between a callback_->Encoded() call return a positive value
   // and the next Encode() call being ignored.
   bool drop_next_input_frame_;
   // Global references; must be deleted in Release().
   std::vector<jobject> input_buffers_;
-  webrtc::QualityScaler quality_scaler_;
+  QualityScaler quality_scaler_;
   // Dynamic resolution change, off by default.
   bool scale_;
 
   // H264 bitstream parser, used to extract QP from encoded bitstreams.
   webrtc::H264BitstreamParser h264_bitstream_parser_;
 
   // VP9 variables to populate codec specific structure.
   webrtc::GofInfoVP9 gof_; // Contains each frame's temporal information for
                            // non-flexible VP9 mode.
   uint8_t tl0_pic_idx_;
@@ skipping 92 matching lines @@
   srand(time(NULL));
   AllowBlockingCalls();
 }
 
 int32_t MediaCodecVideoEncoder::InitEncode(
     const webrtc::VideoCodec* codec_settings,
     int32_t /* number_of_cores */,
     size_t /* max_payload_size */) {
   const int kMinWidth = 320;
   const int kMinHeight = 180;
-  const int kLowQpThresholdDenominator = 3;
   if (codec_settings == NULL) {
     ALOGE << "NULL VideoCodec instance";
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   // Factory should guard against other codecs being used with us.
   RTC_CHECK(codec_settings->codecType == codecType_)
       << "Unsupported codec " << codec_settings->codecType << " for "
       << codecType_;
 
-  ALOGD << "InitEncode request";
   codec_mode_ = codec_settings->mode;
+  int init_width = codec_settings->width;
+  int init_height = codec_settings->height;
   scale_ = (codecType_ != kVideoCodecVP9) && (webrtc::field_trial::FindFullName(
         "WebRTC-MediaCodecVideoEncoder-AutomaticResize") == "Enabled");
+
+  ALOGD << "InitEncode request: " << init_width << " x " << init_height;
   ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled");
+
   if (scale_) {
     if (codecType_ == kVideoCodecVP8) {
       // QP is obtained from VP8-bitstream for HW, so the QP corresponds to the
       // (internal) range: [0, 127]. And we cannot change QP_max in HW, so it is
       // always = 127. Note that in SW, QP is that of the user-level range [0,
       // 63].
-      const int kMaxQp = 127;
-      const int kBadQpThreshold = 95;
-      quality_scaler_.Init(
-          kMaxQp / kLowQpThresholdDenominator, kBadQpThreshold, false);
+      const int kLowQpThreshold = 32;
+      const int kBadQpThreshold = 92;
+      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
+          codec_settings->startBitrate,
+          codec_settings->width, codec_settings->height);
     } else if (codecType_ == kVideoCodecH264) {
       // H264 QP is in the range [0, 51].
-      const int kMaxQp = 51;
+      const int kLowQpThreshold = 17;
       const int kBadQpThreshold = 40;
-      quality_scaler_.Init(
-          kMaxQp / kLowQpThresholdDenominator, kBadQpThreshold, false);
+      quality_scaler_.Init(kLowQpThreshold, kBadQpThreshold, false,
+          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.
       RTC_NOTREACHED() << "Unsupported codec without configured QP thresholds.";
+      scale_ = false;
     }
     quality_scaler_.SetMinResolution(kMinWidth, kMinHeight);
     quality_scaler_.ReportFramerate(codec_settings->maxFramerate);
+    QualityScaler::Resolution res = quality_scaler_.GetScaledResolution();
+    init_width = std::max(res.width, kMinWidth);
+    init_height = std::max(res.height, kMinHeight);
+    ALOGD << "Scaled resolution: " << init_width << " x " << init_height;
   }
+
   return codec_thread_->Invoke<int32_t>(
       Bind(&MediaCodecVideoEncoder::InitEncodeOnCodecThread,
            this,
-           codec_settings->width,
-           codec_settings->height,
+           init_width,
+           init_height,
            codec_settings->startBitrate,
            codec_settings->maxFramerate,
            false /* use_surface */));
 }
 
 int32_t MediaCodecVideoEncoder::Encode(
     const webrtc::VideoFrame& frame,
     const webrtc::CodecSpecificInfo* /* codec_specific_info */,
     const std::vector<webrtc::FrameType>* frame_types) {
   return codec_thread_->Invoke<int32_t>(Bind(
@@ skipping 836 matching lines @@
 }
 
 void MediaCodecVideoEncoderFactory::DestroyVideoEncoder(
     webrtc::VideoEncoder* encoder) {
   ALOGD << "Destroy video encoder.";
   delete encoder;
 }
 
 }  // namespace webrtc_jni