mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: fix video issues

Browse source
This commit is contained in:
Wim Taymans 2019-10-28 18:03:46 +01:00
parent e3e92bb443
commit 42a33a472e
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire-jack.c
View file

@ -1269,7 +1269,7 @@ static int param_enum_format(struct client *c, struct port *p,
break; break;
case 2: case 2:
*param = spa_pod_builder_add_object(b, *param = spa_pod_builder_add_object(b,
SPA_TYPE_OBJECT_Format, SPA_PARAM_Format, SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat,
SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video), SPA_FORMAT_mediaType, SPA_POD_Id(SPA_MEDIA_TYPE_video),
SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw), SPA_FORMAT_mediaSubtype, SPA_POD_Id(SPA_MEDIA_SUBTYPE_raw),
SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_RGBA_F32), SPA_FORMAT_VIDEO_format, SPA_POD_Id(SPA_VIDEO_FORMAT_RGBA_F32),
@ -1420,11 +1420,11 @@ static int port_set_format(struct client *c, struct port *p,
break; break;
case SPA_MEDIA_TYPE_video: case SPA_MEDIA_TYPE_video:
{ {
struct spa_video_info info = { 0 }; struct spa_video_info vinfo = { 0 };
if (info.media_subtype != SPA_MEDIA_SUBTYPE_raw) if (info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
return -EINVAL; return -EINVAL;
if (spa_format_video_raw_parse(param, &info.info.raw) < 0) if (spa_format_video_raw_parse(param, &vinfo.info.raw) < 0)
return -EINVAL; return -EINVAL;
break; break;
} }
@ -1511,9 +1511,12 @@ static int client_node_port_use_buffers(void *object,
pw_log_debug(NAME" %p: port %p %d %d.%d use_buffers %d", c, p, direction, pw_log_debug(NAME" %p: port %p %d %d.%d use_buffers %d", c, p, direction,
port_id, mix_id, n_buffers); port_id, mix_id, n_buffers);
if (p->object->port.type_id == 2 && direction == SPA_DIRECTION_INPUT) {
fl = PW_MEMMAP_FLAG_READ;
} else {
/* some apps write to the input buffer so we want everything readwrite */ /* some apps write to the input buffer so we want everything readwrite */
fl = PW_MEMMAP_FLAG_READWRITE; fl = PW_MEMMAP_FLAG_READWRITE;
}
/* clear previous buffers */ /* clear previous buffers */
clear_buffers(c, mix); clear_buffers(c, mix);