isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 20:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

screen-cast/src: Only allocate DMA buffers if other end supports it

Browse Source 
The other end of the PipeWire stream can set the buffer data type to a
bitmask of supported buffer types. We should respect this, and not
attempt to allocate a DMA buffer if it isn't asked for.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1697>
This commit is contained in:
Jonas Ådahl 2021-02-01 18:33:35 +01:00 committed by Marge Bot
parent ca95ccdef0
commit ca22622517
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -747,10 +747,17 @@ on_stream_add_buffer (void *data,
spa_data[0].maxsize = stride * priv->video_format.size.height; spa_data[0].maxsize = stride * priv->video_format.size.height;
spa_data[0].data = NULL; spa_data[0].data = NULL;
if (spa_data[0].type & (1 << SPA_DATA_DmaBuf))
{
dmabuf_handle = dmabuf_handle =
meta_screen_cast_create_dma_buf_handle (screen_cast, meta_screen_cast_create_dma_buf_handle (screen_cast,
priv->video_format.size.width, priv->video_format.size.width,
priv->video_format.size.height); priv->video_format.size.height);
}
else
{
dmabuf_handle = NULL;
}
if (dmabuf_handle) if (dmabuf_handle)
{ {
@ -766,6 +773,13 @@ on_stream_add_buffer (void *data,
{ {
unsigned int seals; unsigned int seals;
if (!(spa_data[0].type & (1 << SPA_DATA_MemFd)))
{
g_critical ("No supported PipeWire stream buffer data type could "
"be negotiated");
return;
}
/* Fallback to a memfd buffer */ /* Fallback to a memfd buffer */
spa_data[0].type = SPA_DATA_MemFd; spa_data[0].type = SPA_DATA_MemFd;
spa_data[0].flags = SPA_DATA_FLAG_READWRITE; spa_data[0].flags = SPA_DATA_FLAG_READWRITE;