isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-23 08:30:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

screen-cast-stream: Check for a modifier in the format negotiation via pipewire

Browse Source 
Announce SPA_PARAM_BUFFERS_dataType accordingly if the modifier key
exists in the returned SPA_PARAM_Format.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1939>
This commit is contained in:
columbarius 2021-11-13 16:34:40 +01:00 committed by Marge Bot
parent 42047d18b6
commit b34ca56cae
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -772,6 +772,7 @@ on_stream_param_changed (void *data,
struct spa_pod_builder pod_builder; struct spa_pod_builder pod_builder;
const struct spa_pod *params[3]; const struct spa_pod *params[3];
const int bpp = 4; const int bpp = 4;
int buffer_types;
if (!format || id != SPA_PARAM_Format) if (!format || id != SPA_PARAM_Format)
return; return;
@ -788,6 +789,11 @@ on_stream_param_changed (void *data,
pod_builder = SPA_POD_BUILDER_INIT (params_buffer, sizeof (params_buffer)); pod_builder = SPA_POD_BUILDER_INIT (params_buffer, sizeof (params_buffer));
if (!spa_pod_find_prop (format, NULL, SPA_FORMAT_VIDEO_modifier))
buffer_types = 1 << SPA_DATA_MemFd;
else
buffer_types = 1 << SPA_DATA_DmaBuf;
params[0] = spa_pod_builder_add_object ( params[0] = spa_pod_builder_add_object (
&pod_builder, &pod_builder,
SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers,
@ -795,7 +801,8 @@ on_stream_param_changed (void *data,
SPA_PARAM_BUFFERS_blocks, SPA_POD_Int (1), SPA_PARAM_BUFFERS_blocks, SPA_POD_Int (1),
SPA_PARAM_BUFFERS_size, SPA_POD_Int (size), SPA_PARAM_BUFFERS_size, SPA_POD_Int (size),
SPA_PARAM_BUFFERS_stride, SPA_POD_Int (stride), SPA_PARAM_BUFFERS_stride, SPA_POD_Int (stride),
SPA_PARAM_BUFFERS_align, SPA_POD_Int (16)); SPA_PARAM_BUFFERS_align, SPA_POD_Int (16),
SPA_PARAM_BUFFERS_dataType, SPA_POD_CHOICE_FLAGS_Int (buffer_types));
params[1] = spa_pod_builder_add_object ( params[1] = spa_pod_builder_add_object (
&pod_builder, &pod_builder,