Reapply the reverted r3747.

https://code.google.com/p/webrtc/source/detail?r=3747

r3747 timed-out on a tsan test. Verified that it passes
the test and reduced the execution time of that test (r3782).

TBR=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/1292006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3807 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@webrtc.org
2013-04-09 21:21:32 +00:00
parent 806dc3b0e6
commit 557e92515d

View File

@ -225,12 +225,12 @@ 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 > 704 * 576 && number_of_cores > 1) {
// 2 threads when larger than 4CIF
config_->g_threads = 2;
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.
} else {
config_->g_threads = 1;
config_->g_threads = 1; // 1 thread for QVGA.
}
// rate control settings