From c8d5120ff06747d17f13dcb98cd7a3aea3671eba Mon Sep 17 00:00:00 2001 From: Francois Gouget Date: Sat, 5 Dec 2015 13:06:08 +0100 Subject: server: Define the MJPEG encoder warmup time in nanoseconds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Francois Gouget Acked-by: Fabiano Fidêncio --- server/mjpeg-encoder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/mjpeg-encoder.c b/server/mjpeg-encoder.c index 3f541122..08af1eb9 100644 --- a/server/mjpeg-encoder.c +++ b/server/mjpeg-encoder.c @@ -68,7 +68,7 @@ static const int mjpeg_quality_samples[MJPEG_QUALITY_SAMPLE_NUM] = {20, 30, 40, * are not necessarily related to mis-estimation of the bit rate, and we would * like to wait till the stream stabilizes. */ -#define MJPEG_WARMUP_TIME 3000LL // 3 sec +#define MJPEG_WARMUP_TIME 3000000000LL // 3 sec enum { MJPEG_QUALITY_EVAL_TYPE_SET, @@ -996,7 +996,7 @@ static void mjpeg_encoder_decrease_bit_rate(MJpegEncoder *encoder) uint64_t now; now = red_get_monotonic_time(); - if (now - rate_control->warmup_start_time < MJPEG_WARMUP_TIME*1000*1000) { + if (now - rate_control->warmup_start_time < MJPEG_WARMUP_TIME) { spice_debug("during warmup. ignoring"); return; } else { -- cgit v1.2.3