pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-26 22:48:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reds: set the video_codecs in a separated function

Browse Source 
Small refactor. As reds_get_video_codecs() returns the video codecs as
GArray, we should match reds_set_video_codecs() to have a GArray as
parameter instead of string.

reds_set_video_codecs_from_string() seems more appropriate for the
previous function.

Signed-off-by: Victor Toso <victortoso@redhat.com>
Acked-by: Frediano Ziglio <fziglio@redhat.com>
This commit is contained in:
Victor Toso 2017-01-06 09:19:00 +01:00 committed by Frediano Ziglio
parent aae324b479
commit ce2ef83df4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/reds.c
View File

@ -80,6 +80,7 @@
static void reds_client_monitors_config(RedsState *reds, VDAgentMonitorsConfig *monitors_config);
static gboolean reds_use_client_monitors_config(RedsState *reds);
static void reds_set_video_codecs(RedsState *reds, GArray *video_codecs);
static SpiceTimer *adapter_timer_add(const SpiceCoreInterfaceInternal *iface, SpiceTimerFunc func, void *opaque)
{
@ -3535,7 +3536,7 @@ static const char* parse_video_codecs(const char *codecs, char **encoder,
return codecs + n;
}
static void reds_set_video_codecs(RedsState *reds, const char *codecs)
static void reds_set_video_codecs_from_string(RedsState *reds, const char *codecs)
{
char *encoder_name, *codec_name;
GArray *video_codecs;
@ -3581,9 +3582,7 @@ static void reds_set_video_codecs(RedsState *reds, const char *codecs)
return;
}
/* The video_codecs array is immutable */
g_array_unref(reds->config->video_codecs);
reds->config->video_codecs = video_codecs;
reds_set_video_codecs(reds, video_codecs);
}
SPICE_GNUC_VISIBLE int spice_server_init(SpiceServer *reds, SpiceCoreInterface *core)
@ -3595,7 +3594,7 @@ SPICE_GNUC_VISIBLE int spice_server_init(SpiceServer *reds, SpiceCoreInterface *
reds_add_renderer(reds, default_renderer);
}
if (reds->config->video_codecs->len == 0) {
reds_set_video_codecs(reds, default_video_codecs);
reds_set_video_codecs_from_string(reds, default_video_codecs);
}
return ret;
}
@ -3923,7 +3922,7 @@ uint32_t reds_get_streaming_video(const RedsState *reds)
SPICE_GNUC_VISIBLE int spice_server_set_video_codecs(SpiceServer *reds, const char *video_codecs)
{
reds_set_video_codecs(reds, video_codecs);
reds_set_video_codecs_from_string(reds, video_codecs);
reds_on_vc_change(reds);
return 0;
}
@ -3933,6 +3932,16 @@ GArray* reds_get_video_codecs(const RedsState *reds)
return reds->config->video_codecs;
}
static void reds_set_video_codecs(RedsState *reds, GArray *video_codecs)
{
/* The video_codecs array is immutable */
g_clear_pointer(&reds->config->video_codecs, g_array_unref);
spice_return_if_fail(video_codecs != NULL);
reds->config->video_codecs = video_codecs;
}
SPICE_GNUC_VISIBLE int spice_server_set_playback_compression(SpiceServer *reds, int enable)
{
reds->config->playback_compression = !!enable;