spice: Add an option to forward the dmabuf directly to the encoder
cover spice: Add an option to forward the dmabuf directly to the encoder
This patch series adds options to select a preferred codec and also to forward a dmabuf directly to the encoder module that is part of the Spice server. Currently, gstreamer:h264 is the only combination tested but additional work is ongoing to test other combinations.
Tested with: -device virtio-gpu-pci,max_outputs=1,blob=true,xres=1920,yres=1080
-spice port=3001,gl=on,disable-ticketing=on,dmabuf-encode=on,
preferred-codec=gstreamer:h264
and remote-viewer --spice-debug spice://x.x.x.x:3001 on the client side.
Associated Spice server patches can be found here:
https://lists.freedesktop.org/archives/spice-devel/2023-January/052927.html
Vivek Kasireddy (2):
spice: Add an option for users to provide a preferred codec
spice: Add an option to forward the dmabuf directly to the encoder
include/ui/spice-display.h | 2 + qemu-options.hx | 11 +++- ui/spice-core.c | 36 +++++++++++-- ui/spice-display.c | 106 ++++++++++++++++++++++++++----------- 4 files changed, 120 insertions(+), 35 deletions(-)
Signature · 1 line
2.37.2
RFC 1/2 spice: Add an option for users to provide a preferred codec
Giving users an option to choose a particular codec will enable them to make an appropriate decision based on their hardware and use-case.
--- qemu-options.hx | 5 +++++ ui/spice-core.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+)
qemu-options.hx +5 -0
@@ -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.
ui/spice-core.c +14 -0
@@ -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
Signature · 1 line
2.37.2
RFC 2/2 spice: Add an option to forward the dmabuf directly to the encoder
In reply to Vivek KasireddyThis patch adds support for gl=on and port != 0. In other words, with this option enabled, it should be possible to stream the content associated with the dmabuf without making any additional copies.
The encoder (that is part of Spice Server) extracts the dmabuf fd from the drawable (RedDrawable) which in turn gets it from the scanout. Once the encoder is done encoding the dmabuf, it triggers an async that would indicate to Qemu to unblock the pipeline.
--- include/ui/spice-display.h | 2 + qemu-options.hx | 6 ++- ui/spice-core.c | 22 ++++++-- ui/spice-display.c | 106 ++++++++++++++++++++++++++----------- 4 files changed, 101 insertions(+), 35 deletions(-)
include/ui/spice-display.h +2 -0
@@ -62,6 +62,7 @@ enum {QXL_COOKIE_TYPE_RENDER_UPDATE_AREA ,QXL_COOKIE_TYPE_POST_LOAD_MONITORS_CONFIG ,QXL_COOKIE_TYPE_GL_DRAW_DONE , + QXL_COOKIE_TYPE_DMABUF_ENCODE_DONE, }; typedef struct QXLCookie {
@@ -153,6 +154,7 @@ struct SimpleSpiceCursor { };extern bool spice_opengl; +extern bool spice_dmabuf_encode;int qemu_spice_rect_is_empty (const QXLRect * r);void qemu_spice_rect_union (QXLRect *dest,const QXLRect *r);
qemu-options.hx +5 -1
@@ -2143,7 +2143,7 @@ DEF("spice", HAS_ARG, QEMU_OPTION_spice, " [,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" + " [,gl=[on|off]][,rendernode=<file>][,dmabuf-encode=[on|off]]\n" " enable spice\n" " at least one of {port, tls-port} is mandatory\n", QEMU_ARCH_ALL)
@@ -2248,6 +2248,10 @@ SRST ``rendernode=<file>`` DRM render node for OpenGL rendering. If not specified, it will pick the first available. (Since 2.9) + + ``dmabuf-encode=[on|off]`` + Forward the dmabuf directly to the encoder (Gstreamer). + Default is off. ERST DEF("portrait", 0, QEMU_OPTION_portrait,
ui/spice-core.c +19 -3
@@ -494,6 +494,9 @@ static QemuOptsList qemu_spice_opts = { },{ .name = "rendernode", .type = QEMU_OPT_STRING, + },{ + .name = "dmabuf-encode", + .type = QEMU_OPT_BOOL, #endif }, { /* end of list */ }
@@ -843,11 +846,24 @@ static void qemu_spice_init(void)g_free (password);#ifdef HAVE_SPICE_GL +if (qemu_opt_get_bool (opts,"dmabuf-encode" ,0 )) { + spice_dmabuf_encode =1 ; + }if (qemu_opt_get_bool (opts,"gl" ,0 )) { -if ((port !=0 ) || (tls_port !=0 )) { -error_report ("SPICE GL support is local-only for now and " -"incompatible with -spice port/tls-port" ); +if (((port !=0 ) || (tls_port !=0 )) && !spice_dmabuf_encode) { +error_report ("Add dmabuf-encode=on option to enable GL streaming" );exit (1 ); + }else if (spice_dmabuf_encode) { +if (port ==0 && tls_port ==0 ) { +error_report ("dmabuf-encode=on is only meant to be used for " +"non-local displays" ); +exit (1 ); + } +if (g_strcmp0 (preferred_codec,"gstreamer:h264" )) { +error_report ("dmabuf-encode=on currently only works and tested" +"with gstreamer:h264" ); +exit (1 ); + } }if (egl_rendernode_init (qemu_opt_get (opts,"rendernode" ),DISPLAYGL_MODE_ON ) !=0 ) {
ui/spice-display.c +75 -31
207 lines not on this page · raw message
Signature · 1 line
2.37.2