brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen-cast-stream-src: Renegotiate when DMABUF allocation fails

Browse Source 
After negotiation of DMABUF transport mutter will silently allocate SHM
buffers if the allocation in the add_buffer callback fails. It's cleaner
to renegotiate the supported formats without announcing DMABUF
capabilities in this case.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2557>
This commit is contained in:
columbarius 2022-08-06 18:39:19 +02:00
parent 1462eb69a8
commit 9d328001d1
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/backends/meta-screen-cast-stream-src.c
View File

@ -1064,6 +1064,21 @@ build_format_params (MetaScreenCastStreamSrc *src,
return n_params;
}
static void
renegotiate_pipewire_stream (MetaScreenCastStreamSrc *src)
{
MetaScreenCastStreamSrcPrivate *priv =
meta_screen_cast_stream_src_get_instance_private (src);
uint8_t buffer[1024];
struct spa_pod_builder pod_builder;
const struct spa_pod *params[4];
int n_params;
pod_builder = SPA_POD_BUILDER_INIT (buffer, sizeof (buffer));
n_params = build_format_params (src, &pod_builder, params);
pw_stream_update_params (priv->pipewire_stream, params, n_params);
}
static void
on_stream_state_changed (void *data,
enum pw_stream_state old,
@ -1145,9 +1160,10 @@ on_stream_param_changed (void *data,
pod_builder = SPA_POD_BUILDER_INIT (params_buffer, sizeof (params_buffer));
buffer_types = 1 << SPA_DATA_MemFd;
if (spa_pod_find_prop (format, NULL, SPA_FORMAT_VIDEO_modifier))
buffer_types |= 1 << SPA_DATA_DmaBuf;
buffer_types = 1 << SPA_DATA_DmaBuf;
else
buffer_types = 1 << SPA_DATA_MemFd;
params[n_params++] = spa_pod_builder_add_object (
&pod_builder,
@ -1210,34 +1226,23 @@ on_stream_add_buffer (void *data,
if (!cogl_pixel_format_from_spa_video_format (priv->video_format.format,
&cogl_format))
{
cogl_format = DEFAULT_COGL_PIXEL_FORMAT;
}
g_assert_not_reached ();
dmabuf_handle =
meta_screen_cast_create_dma_buf_handle (screen_cast,
cogl_format,
priv->video_format.size.width,
priv->video_format.size.height);
if (!dmabuf_handle && cogl_format != DEFAULT_COGL_PIXEL_FORMAT)
if (!dmabuf_handle)
{
dmabuf_handle =
meta_screen_cast_create_dma_buf_handle (screen_cast,
DEFAULT_COGL_PIXEL_FORMAT,
priv->video_format.size.width,
priv->video_format.size.height);
// TODO: Drop dmabuf support more granular
meta_screen_cast_disable_dma_bufs (screen_cast);
renegotiate_pipewire_stream (src);
return;
}
}
else
{
dmabuf_handle = NULL;
}
priv->uses_dma_bufs = !!dmabuf_handle;
priv->uses_dma_bufs = TRUE;
if (dmabuf_handle)
{
meta_topic (META_DEBUG_SCREEN_CAST,
"Allocating DMA buffer for pw_stream %u",
pw_stream_get_node_id (priv->pipewire_stream));
@ -1257,6 +1262,8 @@ on_stream_add_buffer (void *data,
{
unsigned int seals;
priv->uses_dma_bufs = FALSE;
if (!(spa_data->type & (1 << SPA_DATA_MemFd)))
{
g_critical ("No supported PipeWire stream buffer data type could "