[Spice-commits] server/dcc.c server/display-channel.c

[GitLab Mirror]

 server/dcc.c             |    2 ++
 server/display-channel.c |    2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 4000846c0157a787b786a9bf7f36f0b6a73dfbf8
Author: Kevin Pouget <kpouget at redhat.com>
Date:   Thu Jul 4 10:08:41 2019 +0200

    streaming: Restart streams on video-codec changes
    
    Interrupt the video streams when the user changes the preferred
    video-codecs (dcc_handle_preferred_video_codec_type) or when the host
    admin updates the list of video-codecs allowed
    (display_channel_set_video_codecs).
    
    The video streaming will be automatically restarted by spice
    video-detection rules.
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/dcc.c b/server/dcc.c
index b364a8e1..21e8598e 100644
--- a/server/dcc.c
+++ b/server/dcc.c
@@ -1193,6 +1193,8 @@ static int dcc_handle_preferred_video_codec_type(DisplayChannelClient *dcc,
 
     /* New client preference */
     dcc_update_preferred_video_codecs(dcc);
+    video_stream_detach_and_stop(DCC_TO_DC(dcc));
+
     return TRUE;
 }
 
diff --git a/server/display-channel.c b/server/display-channel.c
index 4677c261..75266598 100644
--- a/server/display-channel.c
+++ b/server/display-channel.c
@@ -255,6 +255,8 @@ void display_channel_set_video_codecs(DisplayChannel *display, GArray *video_cod
     g_clear_pointer(&display->priv->video_codecs, g_array_unref);
     display->priv->video_codecs = g_array_ref(video_codecs);
     g_object_notify(G_OBJECT(display), "video-codecs");
+
+    video_stream_detach_and_stop(display);
 }
 
 GArray *display_channel_get_video_codecs(DisplayChannel *display)