From cf706c2b92dc7be00d41eea04588be08d13e3a48 Mon Sep 17 00:00:00 2001 From: "marpan@webrtc.org" Date: Tue, 27 Mar 2012 21:04:13 +0000 Subject: [PATCH] Removing the resetting/re-init of encoder from QMVideoSettingsCallback. This is not neeeded anymore as a change of frame size (down-sampling via QM callback) will trigger a new key frame in encoder. Review URL: https://webrtc-codereview.appspot.com/456007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1950 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/video_engine/vie_encoder.cc | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/src/video_engine/vie_encoder.cc b/src/video_engine/vie_encoder.cc index 22895e505..6bcc86e31 100644 --- a/src/video_engine/vie_encoder.cc +++ b/src/video_engine/vie_encoder.cc @@ -851,31 +851,7 @@ WebRtc_Word32 QMVideoSettingsCallback::SetVideoQMSettings( const WebRtc_UWord32 frame_rate, const WebRtc_UWord32 width, const WebRtc_UWord32 height) { - WebRtc_Word32 ret_val = 0; - ret_val = vpm_->SetTargetResolution(width, height, frame_rate); - - if (!ret_val) { - // Get current settings. - VideoCodec current_codec; - vcm_->SendCodec(¤t_codec); - WebRtc_UWord32 current_bit_rate; - if (vcm_->Bitrate(¤t_bit_rate) != 0) { - WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideo, - ViEId(engine_id_, channel_id_), - "Failed to get the current encoder target bitrate."); - } - - // Set the new values. - current_codec.height = static_cast(height); - current_codec.width = static_cast(width); - current_codec.maxFramerate = static_cast(frame_rate); - current_codec.startBitrate = current_bit_rate; - - // Re-register encoder with the updated settings. - ret_val = vcm_->RegisterSendCodec(¤t_codec, num_cores_, - max_payload_length_); - } - return ret_val; + return vpm_->SetTargetResolution(width, height, frame_rate); } void QMVideoSettingsCallback::SetMaxPayloadLength(