From c4deee49a3ec42b7fe83c82f750539b36aae1d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 3 May 2016 13:59:59 -0400 Subject: [PATCH] Use RC_TIMESTAMP_MODE for OpenH264. Performs rate control based on timestamp deltas instead of announced frame rate. BUG=webrtc:5855 R=hbos@webrtc.org Review URL: https://codereview.webrtc.org/1945763002 . Cr-Commit-Position: refs/heads/master@{#12611} --- .../codecs/h264/h264_encoder_impl.cc | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc index 18eccb25a5..a6325a9070 100644 --- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc +++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc @@ -224,7 +224,7 @@ int32_t H264EncoderImpl::InitEncode(const VideoCodec* codec_settings, init_params.iTargetBitrate = codec_settings_.targetBitrate * 1000; init_params.iMaxBitrate = codec_settings_.maxBitrate * 1000; // Rate Control mode - init_params.iRCMode = RC_BITRATE_MODE; + init_params.iRCMode = RC_TIMESTAMP_MODE; init_params.fMaxFrameRate = static_cast(codec_settings_.maxFramerate); // The following parameters are extension parameters (they're in SEncParamExt, @@ -343,21 +343,13 @@ int32_t H264EncoderImpl::Encode( return WEBRTC_VIDEO_CODEC_ERR_SIZE; } - bool force_key_frame = false; - if (frame_types != nullptr) { - // We only support a single stream. - RTC_DCHECK_EQ(frame_types->size(), static_cast(1)); - // Skip frame? - if ((*frame_types)[0] == kEmptyFrame) { - return WEBRTC_VIDEO_CODEC_OK; - } - // Force key frame? - force_key_frame = (*frame_types)[0] == kVideoFrameKey; - } - if (force_key_frame) { + RTC_DCHECK(frame_types != nullptr); + // We only support a single stream. + RTC_DCHECK_EQ(1u, frame_types->size()); + // Force key frame? + if ((*frame_types)[0] == kVideoFrameKey) { // API doc says ForceIntraFrame(false) does nothing, but calling this // function forces a key frame regardless of the |bIDR| argument's value. - // (If every frame is a key frame we get lag/delays.) openh264_encoder_->ForceIntraFrame(true); }