<div dir="ltr">Hi <div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Jun 11, 2015 at 7:39 PM, Francois Gouget <<a href="mailto:fgouget@codeweavers.com" target="_blank">fgouget@codeweavers.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Signed-off-by: Francois Gouget <<a href="mailto:fgouget@codeweavers.com">fgouget@codeweavers.com</a>> --- This implements Marc-André Lureau's suggestion: <a href="http://lists.freedesktop.org/archives/spice-devel/2015-June/020202.html" target="_blank">http://lists.freedesktop.org/archives/spice-devel/2015-June/020202.html</a> And supersedes the input-fps rounding patch. <a href="http://lists.freedesktop.org/archives/spice-devel/2015-June/020176.html" target="_blank">http://lists.freedesktop.org/archives/spice-devel/2015-June/020176.html</a> server/red_worker.c | 45 +++++++++++++++------------------------------ 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/server/red_worker.c b/server/red_worker.c index 5deb30b..a07a78a 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -120,7 +120,7 @@ #define RED_STREAM_GRADUAL_FRAMES_START_CONDITION 0.2 #define RED_STREAM_FRAMES_RESET_CONDITION 100 #define RED_STREAM_MIN_SIZE (96 * 96) -#define RED_STREAM_INPUT_FPS_TIMEOUT (5 * 1000) // 5 sec +#define RED_STREAM_INPUT_FPS_TIMEOUT ((uint64_t)5 * 1000 * 1000 * 1000) // 5 sec #define RED_STREAM_CHANNEL_CAPACITY 0.8 /* the client's stream report frequency is the minimum of the 2 values below */ #define RED_STREAM_CLIENT_REPORT_WINDOW 5 // #frames @@ -450,9 +450,8 @@ struct Stream { Stream *next; RingItem link; - SpiceTimer *input_fps_timer; uint32_t num_input_frames; - uint64_t input_fps_timer_start; + uint64_t input_fps_start_time; uint32_t input_fps; }; @@ -2532,9 +2531,6 @@ static int is_same_drawable(RedWorker *worker, Drawable *d1, Drawable *d2) static inline void red_free_stream(RedWorker *worker, Stream *stream) { - if (stream->input_fps_timer) { - spice_timer_remove(stream->input_fps_timer); - } stream->next = worker->free_streams; worker->free_streams = stream; } @@ -2613,7 +2609,17 @@ static void red_attach_stream(RedWorker *worker, Drawable *drawable, Stream *str stream->current = drawable; drawable->stream = stream; stream->last_time = drawable->creation_time; - stream->num_input_frames++; + + uint64_t duration = drawable->creation_time - stream->input_fps_start_time; + if (duration >= RED_STREAM_INPUT_FPS_TIMEOUT) { + /* Round to the nearest integer, for instance 24 for 23.976 */ + stream->input_fps = ((uint64_t)stream->num_input_frames * 1000 * 1000 * 1000 + duration / 2) / duration; + spice_debug("input-fps=%u", stream->input_fps); + stream->num_input_frames = 0; + stream->input_fps_start_time = drawable->creation_time; </blockquote><div> </div><div>Every time RED_STREAM_INPUT_FPS_TIMEOUT elpased and a new frame comes, input_fps is updated. </div><div>Patch looks good to me, I haven't tested it though. </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> + } else { + stream->num_input_frames++; + } WORKER_FOREACH_DCC_SAFE(worker, item, next, dcc) { StreamAgent *agent; @@ -3123,24 +3129,6 @@ static void red_display_create_stream(DisplayChannelClient *dcc, Stream *stream) #endif } -static void red_stream_input_fps_timer_cb(void *opaque) -{ - Stream *stream = opaque; - uint64_t now = red_now(); - double duration_sec; - - spice_assert(opaque); - if (now == stream->input_fps_timer_start) { - spice_warning("timer start and expiry time are equal"); - return; - } - duration_sec = (now - stream->input_fps_timer_start)/(1000.0*1000*1000); - stream->input_fps = stream->num_input_frames / duration_sec; - spice_debug("input-fps=%u", stream->input_fps); - stream->num_input_frames = 0; - stream->input_fps_timer_start = now; -} - static void red_create_stream(RedWorker *worker, Drawable *drawable) { DisplayChannelClient *dcc; @@ -3167,12 +3155,9 @@ static void red_create_stream(RedWorker *worker, Drawable *drawable) SpiceBitmap *bitmap = &drawable->red_drawable->u.copy.src_bitmap->u.bitmap; stream->top_down = !!(bitmap->flags & SPICE_BITMAP_FLAGS_TOP_DOWN); drawable->stream = stream; - stream->input_fps_timer = spice_timer_queue_add(red_stream_input_fps_timer_cb, stream); - spice_assert(stream->input_fps_timer); - spice_timer_set(stream->input_fps_timer, RED_STREAM_INPUT_FPS_TIMEOUT); - stream->num_input_frames = 0; - stream->input_fps_timer_start = red_now(); stream->input_fps = MAX_FPS; + stream->num_input_frames = 0; + stream->input_fps_start_time = drawable->creation_time; worker->streams_size_total += stream->width * stream->height; worker->stream_count++; WORKER_FOREACH_DCC_SAFE(worker, dcc_ring_item, next, dcc) { -- 2.1.4 _______________________________________________ Spice-devel mailing list <a href="mailto:Spice-devel@lists.freedesktop.org">Spice-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/spice-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/spice-devel</a> </blockquote></div> -- <div class="gmail_signature">Marc-André Lureau</div> </div></div></div>