diff options
| author | Frediano Ziglio <fziglio@redhat.com> | 2015-10-30 13:08:13 +0000 |
|---|---|---|
| committer | Frediano Ziglio <fziglio@redhat.com> | 2015-11-23 11:07:33 +0000 |
| commit | 454e521b17bc97931eac0046df030d914e1bca51 (patch) | |
| tree | cfd0d3dccc482e69acf0cc494a058c38ca64a147 /server/mjpeg_encoder.c | |
| parent | c5c176a5c7718177f23b07981556b5d460627498 (diff) | |
| download | spice-454e521b17bc97931eac0046df030d914e1bca51.tar.gz spice-454e521b17bc97931eac0046df030d914e1bca51.tar.xz spice-454e521b17bc97931eac0046df030d914e1bca51.zip | |
reuse red_get_monotonic_time function
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Pavel Grunt <pgrunt@redhat.com>
Diffstat (limited to 'server/mjpeg_encoder.c')
| -rw-r--r-- | server/mjpeg_encoder.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server/mjpeg_encoder.c b/server/mjpeg_encoder.c index c8253a71..e5f3cbd7 100644 --- a/server/mjpeg_encoder.c +++ b/server/mjpeg_encoder.c @@ -21,6 +21,7 @@ #include "red_common.h" #include "mjpeg_encoder.h" +#include "utils.h" #include <jerror.h> #include <jpeglib.h> #include <inttypes.h> @@ -714,12 +715,10 @@ static int mjpeg_encoder_start_frame(MJpegEncoder *encoder, if (rate_control_is_active(encoder)) { MJpegEncoderRateControl *rate_control = &encoder->rate_control; - struct timespec time; uint64_t now; uint64_t interval; - clock_gettime(CLOCK_MONOTONIC, &time); - now = ((uint64_t) time.tv_sec) * 1000000000 + time.tv_nsec; + now = red_get_monotonic_time(); if (!rate_control->adjusted_fps_start_time) { rate_control->adjusted_fps_start_time = now; @@ -996,11 +995,9 @@ static void mjpeg_encoder_decrease_bit_rate(MJpegEncoder *encoder) rate_control->client_state.max_video_latency = 0; rate_control->client_state.max_audio_latency = 0; if (rate_control->warmup_start_time) { - struct timespec time; uint64_t now; - clock_gettime(CLOCK_MONOTONIC, &time); - now = ((uint64_t) time.tv_sec) * 1000000000 + time.tv_nsec; + now = red_get_monotonic_time(); if (now - rate_control->warmup_start_time < MJPEG_WARMUP_TIME*1000*1000) { spice_debug("during warmup. ignoring"); return; |