From cfc07c943f4657be3cb55c59e6bb06bf38c0809d Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Tue, 2 Apr 2013 14:55:44 +0000 Subject: [PATCH] Revert of r3747. TBR=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1277005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3752 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc index 2c674b33a4..9a57e4c5a7 100644 --- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc +++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc @@ -226,12 +226,11 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst, config_->g_lag_in_frames = 0; // 0- no frame lagging // Determining number of threads based on the image size - if (codec_.width * codec_.height > 640 * 480 && number_of_cores >= 4) { - config_->g_threads = 4; // 4 threads for qHD/HD. - } else if (codec_.width * codec_.height > 320 * 240 && number_of_cores >= 2) { - config_->g_threads = 2; // 2 threads for HVGA/VGA. + if (codec_.width * codec_.height > 704 * 576 && number_of_cores > 1) { + // 2 threads when larger than 4CIF + config_->g_threads = 2; } else { - config_->g_threads = 1; // 1 thread for QVGA. + config_->g_threads = 1; } // rate control settings