mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-05-05 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'libcamera-reenable-dmabuf' into 'master'

Browse source 
Draft: Reapply "libcamera: Implement proper dmabuf negotiation support"

See merge request pipewire/pipewire!2077
This commit is contained in:
Robert Mader 2025-06-26 17:37:46 +02:00
commit bd893d2ec4
1 changed files with 52 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/plugins/libcamera/libcamera-utils.cpp
View file

@ -356,6 +356,10 @@ next_fmt:
} }
port->size_index++; port->size_index++;
for (i = 0; i < 2; i++) {
if (i > 0)
result.index = result.next++;
spa_pod_builder_init(&b, buffer, sizeof(buffer)); spa_pod_builder_init(&b, buffer, sizeof(buffer));
spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat); spa_pod_builder_push_object(&b, &f[0], SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat);
spa_pod_builder_add(&b, spa_pod_builder_add(&b,
@ -367,12 +371,13 @@ next_fmt:
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_format, 0); spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_format, 0);
spa_pod_builder_id(&b, info->format); spa_pod_builder_id(&b, info->format);
} }
if (info->pix.modifier()) {
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_modifier, 0); if (i == 0) {
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_modifier, SPA_POD_PROP_FLAG_MANDATORY);
spa_pod_builder_long(&b, info->pix.modifier()); spa_pod_builder_long(&b, info->pix.modifier());
} }
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_size, 0);
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_size, 0);
if (sizeRange.hStep != 0 && sizeRange.vStep != 0) { if (sizeRange.hStep != 0 && sizeRange.vStep != 0) {
spa_pod_builder_push_choice(&b, &f[1], SPA_CHOICE_Step, 0); spa_pod_builder_push_choice(&b, &f[1], SPA_CHOICE_Step, 0);
spa_pod_builder_frame(&b, &f[1]); spa_pod_builder_frame(&b, &f[1]);
@ -396,10 +401,15 @@ next_fmt:
fmt = (struct spa_pod*) spa_pod_builder_pop(&b, &f[0]); fmt = (struct spa_pod*) spa_pod_builder_pop(&b, &f[0]);
if (spa_pod_filter(&b, &result.param, fmt, filter) < 0) if (spa_pod_filter(&b, &result.param, fmt, filter) < 0) {
if (i == 0)
continue;
else
goto next; goto next;
}
spa_node_emit_result(&impl->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result); spa_node_emit_result(&impl->hooks, seq, 0, SPA_RESULT_TYPE_NODE_PARAMS, &result);
}
if (++count != num) if (++count != num)
goto next; goto next;