Fix for frame resolution in encoded frame callback.

Scaled resolution for down scaled frames by the quality scaler is not used.

BUG=webrtc:4966
R=pbos@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1317463005 .

Cr-Commit-Position: refs/heads/master@{#9873}
This commit is contained in:
Asa Persson
2015-09-07 15:03:49 +02:00
parent 7b38f69370
commit 110443c1ec

View File

@ -891,6 +891,11 @@ int VP8EncoderImpl::Encode(const VideoFrame& frame,
int VP8EncoderImpl::UpdateCodecFrameSize(const VideoFrame& input_image) {
codec_.width = input_image.width();
codec_.height = input_image.height();
if (codec_.numberOfSimulcastStreams <= 1) {
// For now scaling is only used for single-layer streams.
codec_.simulcastStream[0].width = input_image.width();
codec_.simulcastStream[0].height = input_image.height();
}
// Update the cpu_speed setting for resolution change.
vpx_codec_control(&(encoders_[0]),
VP8E_SET_CPUUSED,