generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removing the resetting/re-init of encoder from QMVideoSettingsCallback.

Browse Source 
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
This commit is contained in:
marpan@webrtc.org 2012-03-27 21:04:13 +00:00
parent 952f601405
commit cf706c2b92
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/video_engine/vie_encoder.cc
View File

@ -851,31 +851,7 @@ WebRtc_Word32 QMVideoSettingsCallback::SetVideoQMSettings(
const WebRtc_UWord32 frame_rate, const WebRtc_UWord32 frame_rate,
const WebRtc_UWord32 width, const WebRtc_UWord32 width,
const WebRtc_UWord32 height) { const WebRtc_UWord32 height) {
WebRtc_Word32 ret_val = 0; return vpm_->SetTargetResolution(width, height, frame_rate);
ret_val = vpm_->SetTargetResolution(width, height, frame_rate);
if (!ret_val) {
// Get current settings.
VideoCodec current_codec;
vcm_->SendCodec(&current_codec);
WebRtc_UWord32 current_bit_rate;
if (vcm_->Bitrate(&current_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<WebRtc_UWord16>(height);
current_codec.width = static_cast<WebRtc_UWord16>(width);
current_codec.maxFramerate = static_cast<WebRtc_UWord8>(frame_rate);
current_codec.startBitrate = current_bit_rate;
// Re-register encoder with the updated settings.
ret_val = vcm_->RegisterSendCodec(&current_codec, num_cores_,
max_payload_length_);
}
return ret_val;
} }
void QMVideoSettingsCallback::SetMaxPayloadLength( void QMVideoSettingsCallback::SetMaxPayloadLength(