Add interface to update encoder size

Signed-off-by: jdai12 <[email protected]>
Change-Id: Iab60c9c66c52ee7ac27d29a1f24370f5228a22b2
Reviewed-on: https://git-ccr-1.devtools.intel.com/gerrit/61891
Reviewed-by: Duan, Xiande <[email protected]>
Tested-by: Duan, Xiande <[email protected]>

Author: daijh

webrtc/api/video_codecs/video_encoder.h

@@ -186,6 +186,11 @@ class VideoEncoder {
   virtual int32_t SetPeriodicKeyFrames(bool enable) { return -1; }
   virtual bool SupportsNativeHandle() const { return false; }
   virtual const char* ImplementationName() const { return "unknown"; }
+
+  // Update for dynamic resolution encoding, by Jianhui
+  virtual int32_t SetResolution(uint32_t width, uint32_t height) {
+    return -1;
+  }
 };
 
 }  // namespace webrtc

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc

@@ -500,4 +500,26 @@ VideoEncoder::ScalingSettings H264EncoderImpl::GetScalingSettings() const {
   return VideoEncoder::ScalingSettings(true);
 }
 
+int32_t H264EncoderImpl::SetResolution(uint32_t width, uint32_t height)
+{
+    width_ = width;
+    height_ = height;
+
+    SEncParamExt encoder_params = CreateEncoderParams();
+    if (openh264_encoder_->SetOption(ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, &encoder_params) != 0) {
+        return WEBRTC_VIDEO_CODEC_ERROR;
+    }
+
+    // Initialize encoded image. Default buffer size: size of unencoded data.
+    encoded_image_._size =
+        CalcBufferSize(kI420, width_, height_);
+    encoded_image_._buffer = new uint8_t[encoded_image_._size];
+    encoded_image_buffer_.reset(encoded_image_._buffer);
+    encoded_image_._completeFrame = true;
+    encoded_image_._encodedWidth = 0;
+    encoded_image_._encodedHeight = 0;
+    encoded_image_._length = 0;
+    return WEBRTC_VIDEO_CODEC_OK;
+}
+
 }  // namespace webrtc

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h

@@ -66,6 +66,8 @@ class H264EncoderImpl : public H264Encoder {
     return packetization_mode_;
   }
 
+  int32_t SetResolution(uint32_t width, uint32_t height) override;
+
  private:
   bool IsInitialized() const;
   SEncParamExt CreateEncoderParams() const;

webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

@@ -925,6 +925,11 @@ int VP8EncoderImpl::RegisterEncodeCompleteCallback(
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
+int32_t VP8EncoderImpl::SetResolution(uint32_t width, uint32_t height)
+{
+    return UpdateCodecFrameSize(width, height);
+}
+
 VP8DecoderImpl::VP8DecoderImpl()
     : use_postproc_arm_(webrtc::field_trial::FindFullName(
                             kVp8PostProcArmFieldTrial) == "Enabled"),

webrtc/modules/video_coding/codecs/vp8/vp8_impl.h

@@ -61,6 +61,8 @@ class VP8EncoderImpl : public VP8Encoder {
 
   const char* ImplementationName() const override;
 
+  int32_t SetResolution(uint32_t width, uint32_t height) override;
+
  private:
   void SetupTemporalLayers(int num_streams,
                            int num_temporal_layers,

webrtc/modules/video_coding/codecs/vp9/vp9_impl.cc

@@ -833,6 +833,34 @@ const char* VP9EncoderImpl::ImplementationName() const {
   return "libvpx";
 }
 
+int32_t VP9EncoderImpl::SetResolution(uint32_t width, uint32_t height)
+{
+  codec_.width = width;
+  codec_.height = height;
+  if (codec_.numberOfSimulcastStreams <= 1) {
+    // For now scaling is only used for single-layer streams.
+    codec_.simulcastStream[0].width = width;
+    codec_.simulcastStream[0].height = height;
+  }
+  // Update the cpu_speed setting for resolution change.
+  vpx_codec_control(encoder_, VP8E_SET_CPUUSED,
+                    GetCpuSpeed(codec_.width, codec_.height));
+  raw_->w = codec_.width;
+  raw_->h = codec_.height;
+  raw_->d_w = codec_.width;
+  raw_->d_h = codec_.height;
+  vpx_img_set_rect(raw_, 0, 0, codec_.width, codec_.height);
+
+  // Update encoder context for new frame size.
+  // Change of frame size will automatically trigger a key frame.
+  config_->g_w = codec_.width;
+  config_->g_h = codec_.height;
+  if (vpx_codec_enc_config_set(encoder_, config_)) {
+    return WEBRTC_VIDEO_CODEC_ERROR;
+  }
+  return WEBRTC_VIDEO_CODEC_OK;
+}
+
 bool VP9Decoder::IsSupported() {
   return true;
 }

webrtc/modules/video_coding/codecs/vp9/vp9_impl.h

@@ -65,6 +65,8 @@ class VP9EncoderImpl : public VP9Encoder {
     bool is_keyframe = false;
   };
 
+  int32_t SetResolution(uint32_t width, uint32_t height) override;
+
  private:
   // Determine number of encoder threads to use.
   int NumberOfThreads(int width, int height, int number_of_cores);