<div dir="ltr">ack </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Apr 30, 2013 at 8:50 PM, Yonit Halperin <<a href="mailto:yhalperi@redhat.com" target="_blank">yhalperi@redhat.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This bug results in the client dropping all the video frames after migration in case that (1) the hosts involved in migration have different mm-time; and that (2) there is no audio playback. This is relvant only for the client that was connected during the migration. rhbz#958276 --- server/reds.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/server/reds.c b/server/reds.c index c3b5518..b8db905 100644 --- a/server/reds.c +++ b/server/reds.c @@ -172,6 +172,7 @@ static void reds_mig_cleanup_wait_disconnect(void); static void reds_mig_remove_wait_disconnect_client(RedClient *client); static void reds_char_device_add_state(SpiceCharDeviceState *st); static void reds_char_device_remove_state(SpiceCharDeviceState *st); +static void reds_send_mm_time(void); static ChannelSecurityOptions *channels_security = NULL; static int default_channel_security = @@ -1360,6 +1361,14 @@ int reds_handle_migrate_data(MainChannelClient *mcc, SpiceMigrateDataMain *mig_d { VDIPortState *agent_state = &reds->agent_state; + /* + * Now that the client has switched to the target server, if main_channel + * controls the mm-time, we update the client's mm-time. + * (MSG_MAIN_INIT is not sent for a migrating connection) + */ + if (reds->mm_timer_enabled) { + reds_send_mm_time(); + } if (mig_data->agent_base.connected) { if (agent_state->base) { // agent was attached before migration data has arrived if (!vdagent) { @@ -3033,6 +3042,10 @@ listen: static void reds_send_mm_time(void) { + if (!reds_main_channel_connected()) { + return; + } + spice_debug(NULL); main_channel_push_multi_media_time(reds->main_channel, reds_get_mm_time() - reds->mm_time_latency); } @@ -3483,9 +3496,6 @@ void reds_update_mm_timer(uint32_t mm_time) void reds_enable_mm_timer(void) { core->timer_start(reds->mm_timer, MM_TIMER_GRANULARITY_MS); - if (!reds_main_channel_connected()) { - return; - } reds->mm_timer_enabled = TRUE; reds->mm_time_latency = MM_TIME_DELTA; reds_send_mm_time(); @@ -3927,7 +3937,7 @@ static int do_spice_init(SpiceCoreInterface *core_interface) if (!(reds->mm_timer = core->timer_add(mm_timer_proc, NULL))) { spice_error("mm timer create failed"); } - core->timer_start(reds->mm_timer, MM_TIMER_GRANULARITY_MS); + reds_enable_mm_timer(); if (reds_init_net() < 0) { goto err; -- 1.8.0.1 _______________________________________________ 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> -- Marc-André Lureau </div>