mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

spa: make all format parsing fields optional

Browse source 
Just like the optional build, make all field parsing optional. This
will leave the fields with their default values if they are not parsed
from the param.

We can then remove our custom functions and use the generic ones in
various places.
This commit is contained in:
Wim Taymans 2022-11-03 13:13:07 +01:00
parent 74447acedb
commit 44d743ed95
5 changed files with 41 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

28
spa/plugins/videoconvert/videoadapter.c
View file

@ -562,24 +562,6 @@ static int reconfigure_mode(struct impl *this, bool passthrough,
return 0;
}
static int format_video_raw_parse_opt(const struct spa_pod *format, struct spa_video_info_raw *info)
{
uint32_t media_type, media_subtype;
int res;
if ((res = spa_format_parse(format, &media_type, &media_subtype)) < 0)
return res;
if (media_type != SPA_MEDIA_TYPE_video ||
media_subtype != SPA_MEDIA_SUBTYPE_raw)
return -ENOTSUP;
spa_zero(*info);
res = spa_pod_parse_object(format,
SPA_TYPE_OBJECT_Format, NULL,
SPA_FORMAT_VIDEO_format, SPA_POD_OPT_Id(&info->format),
SPA_FORMAT_VIDEO_size, SPA_POD_OPT_Int(&info->size));
return res;
}
static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
const struct spa_pod *param)
{
@ -628,7 +610,15 @@ static int impl_node_set_param(void *object, uint32_t id, uint32_t flags,
if (format) {
struct spa_video_info info;
if (format_video_raw_parse_opt(format, &info.info.raw) >= 0)
spa_zero(info);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_video ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
return -ENOTSUP;
if (spa_format_video_raw_parse(format, &info.info.raw) >= 0)
this->default_format = info;
}