| Message ID | 20230123083755.1038286-2-vivek.kasireddy@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | spice: Add an option to forward the dmabuf directly to the encoder (v2) | expand |
Il giorno lun 23 gen 2023 alle ore 08:37 Vivek Kasireddy <vivek.kasireddy@intel.com> ha scritto: > > Giving users an option to choose a particular codec will enable > them to make an appropriate decision based on their hardware and > use-case. > > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: Marc-André Lureau <marcandre.lureau@redhat.com> > Cc: Dongwon Kim <dongwon.kim@intel.com> > Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> > --- > qemu-options.hx | 5 +++++ > ui/spice-core.c | 14 ++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/qemu-options.hx b/qemu-options.hx > index 3aa3a2f5a3..aab8df0922 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -2142,6 +2142,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, > " [,streaming-video=[off|all|filter]][,disable-copy-paste=on|off]\n" > " [,disable-agent-file-xfer=on|off][,agent-mouse=[on|off]]\n" > " [,playback-compression=[on|off]][,seamless-migration=[on|off]]\n" > + " [,preferred-codec=<encoder>:<codec>\n" > " [,gl=[on|off]][,rendernode=<file>]\n" > " enable spice\n" > " at least one of {port, tls-port} is mandatory\n", > @@ -2237,6 +2238,10 @@ SRST > ``seamless-migration=[on|off]`` > Enable/disable spice seamless migration. Default is off. > > + ``preferred-codec=<encoder>:<codec>`` > + Provide the preferred codec the Spice server should use. > + Default would be spice:mjpeg. > + > ``gl=[on|off]`` > Enable/disable OpenGL context. Default is off. > > diff --git a/ui/spice-core.c b/ui/spice-core.c > index 72f8f1681c..6e00211e3a 100644 > --- a/ui/spice-core.c > +++ b/ui/spice-core.c > @@ -469,6 +469,9 @@ static QemuOptsList qemu_spice_opts = { > },{ > .name = "streaming-video", > .type = QEMU_OPT_STRING, > + },{ > + .name = "preferred-codec", > + .type = QEMU_OPT_STRING, > },{ > .name = "agent-mouse", > .type = QEMU_OPT_BOOL, > @@ -644,6 +647,7 @@ static void qemu_spice_init(void) > char *x509_key_file = NULL, > *x509_cert_file = NULL, > *x509_cacert_file = NULL; > + const char *preferred_codec = NULL; > int port, tls_port, addr_flags; > spice_image_compression_t compression; > spice_wan_compression_t wan_compr; > @@ -795,6 +799,16 @@ static void qemu_spice_init(void) > spice_server_set_streaming_video(spice_server, SPICE_STREAM_VIDEO_OFF); > } > > + preferred_codec = qemu_opt_get(opts, "preferred-codec"); > + if (preferred_codec) { > + if (spice_server_set_video_codecs(spice_server, preferred_codec)) { > + error_report("Preferred codec name is not valid"); > + exit(1); > + } > + } else { > + spice_server_set_video_codecs(spice_server, "spice:mjpeg"); Why overriding the compiled in Spice default? Apart from that the commit seems good to me. > + } > + > spice_server_set_agent_mouse > (spice_server, qemu_opt_get_bool(opts, "agent-mouse", 1)); > spice_server_set_playback_compression Frediano
diff --git a/qemu-options.hx b/qemu-options.hx index 3aa3a2f5a3..aab8df0922 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2142,6 +2142,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, " [,streaming-video=[off|all|filter]][,disable-copy-paste=on|off]\n" " [,disable-agent-file-xfer=on|off][,agent-mouse=[on|off]]\n" " [,playback-compression=[on|off]][,seamless-migration=[on|off]]\n" + " [,preferred-codec=<encoder>:<codec>\n" " [,gl=[on|off]][,rendernode=<file>]\n" " enable spice\n" " at least one of {port, tls-port} is mandatory\n", @@ -2237,6 +2238,10 @@ SRST ``seamless-migration=[on|off]`` Enable/disable spice seamless migration. Default is off. + ``preferred-codec=<encoder>:<codec>`` + Provide the preferred codec the Spice server should use. + Default would be spice:mjpeg. + ``gl=[on|off]`` Enable/disable OpenGL context. Default is off. diff --git a/ui/spice-core.c b/ui/spice-core.c index 72f8f1681c..6e00211e3a 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -469,6 +469,9 @@ static QemuOptsList qemu_spice_opts = { },{ .name = "streaming-video", .type = QEMU_OPT_STRING, + },{ + .name = "preferred-codec", + .type = QEMU_OPT_STRING, },{ .name = "agent-mouse", .type = QEMU_OPT_BOOL, @@ -644,6 +647,7 @@ static void qemu_spice_init(void) char *x509_key_file = NULL, *x509_cert_file = NULL, *x509_cacert_file = NULL; + const char *preferred_codec = NULL; int port, tls_port, addr_flags; spice_image_compression_t compression; spice_wan_compression_t wan_compr; @@ -795,6 +799,16 @@ static void qemu_spice_init(void) spice_server_set_streaming_video(spice_server, SPICE_STREAM_VIDEO_OFF); } + preferred_codec = qemu_opt_get(opts, "preferred-codec"); + if (preferred_codec) { + if (spice_server_set_video_codecs(spice_server, preferred_codec)) { + error_report("Preferred codec name is not valid"); + exit(1); + } + } else { + spice_server_set_video_codecs(spice_server, "spice:mjpeg"); + } + spice_server_set_agent_mouse (spice_server, qemu_opt_get_bool(opts, "agent-mouse", 1)); spice_server_set_playback_compression
Giving users an option to choose a particular codec will enable them to make an appropriate decision based on their hardware and use-case. Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: Marc-André Lureau <marcandre.lureau@redhat.com> Cc: Dongwon Kim <dongwon.kim@intel.com> Signed-off-by: Vivek Kasireddy <vivek.kasireddy@intel.com> --- qemu-options.hx | 5 +++++ ui/spice-core.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+)