mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-14 08:56:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

format: make helper function to parse media type

Browse source
This commit is contained in:
Wim Taymans 2018-08-29 14:50:58 +02:00
parent 5976beb149
commit 80de83f38a
24 changed files with 127 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

15
spa/include/spa/param/audio/format-utils.h
View file

@ -26,7 +26,9 @@ extern "C" {
#include <spa/pod/parser.h>
#include <spa/pod/builder.h>
#include <spa/param/audio/format.h>
#include <spa/param/format-utils.h>
static inline int
spa_format_audio_raw_parse(const struct spa_pod *format, struct spa_audio_info_raw *info)
@ -40,6 +42,19 @@ spa_format_audio_raw_parse(const struct spa_pod *format, struct spa_audio_info_r
":", SPA_FORMAT_AUDIO_channelMask, "?i", &info->channel_mask, NULL);
}
static inline struct spa_pod *
spa_format_audio_raw_build(struct spa_pod_builder *builder, uint32_t id, struct spa_audio_info_raw *info)
{
return spa_pod_builder_object(builder,
SPA_TYPE_OBJECT_Format, id,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", info->format,
":", SPA_FORMAT_AUDIO_layout, "I", info->layout,
":", SPA_FORMAT_AUDIO_rate, "i", info->rate,
":", SPA_FORMAT_AUDIO_channels, "i", info->channels);
}
#ifdef __cplusplus
} /* extern "C" */
#endif

43
spa/include/spa/param/format-utils.h Normal file
View file

@ -0,0 +1,43 @@
/* Simple Plugin API
* Copyright (C) 2016 Wim Taymans <wim.taymans@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __SPA_PARAM_FORMAT_UTILS_H__
#define __SPA_PARAM_FORMAT_UTILS_H__
#ifdef __cplusplus
extern "C" {
#endif
#include <spa/pod/parser.h>
#include <spa/param/format.h>
static inline int
spa_format_parse(const struct spa_pod *format, uint32_t *media_type, uint32_t *media_subtype)
{
return spa_pod_object_parse(format,
"I", media_type,
"I", media_subtype, NULL);
}
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif /* __SPA_PARAM_FORMAT_UTILS */

1
spa/include/spa/param/format.h
View file

@ -28,6 +28,7 @@ extern "C" {
/** media type for SPA_TYPE_OBJECT_Format */
enum spa_media_type {
SPA_MEDIA_TYPE_START,
SPA_MEDIA_TYPE_audio,
SPA_MEDIA_TYPE_video,
SPA_MEDIA_TYPE_image,

1
spa/include/spa/param/video/format-utils.h
View file

@ -26,6 +26,7 @@ extern "C" {
#include <spa/pod/parser.h>
#include <spa/param/video/format.h>
#include <spa/param/format-utils.h>
static inline int
spa_format_video_raw_parse(const struct spa_pod *format,

13
spa/plugins/alsa/alsa-sink.c
View file

@ -342,14 +342,7 @@ impl_node_port_enum_params(struct spa_node *node,
if (*index > 0)
return 0;
param = spa_pod_builder_object(&b,
SPA_TYPE_OBJECT_Format, id,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", this->current_format.info.raw.format,
":", SPA_FORMAT_AUDIO_layout, "I", this->current_format.info.raw.layout,
":", SPA_FORMAT_AUDIO_rate, "i", this->current_format.info.raw.rate,
":", SPA_FORMAT_AUDIO_channels, "i", this->current_format.info.raw.channels);
param = spa_format_audio_raw_build(&b, id, &this->current_format.info.raw);
break;
case SPA_PARAM_Buffers:
@ -450,9 +443,7 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
if ((err = spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype)) < 0)
if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return err;
if (info.media_type != SPA_MEDIA_TYPE_audio ||

39
spa/plugins/alsa/alsa-source.c
View file

@ -305,31 +305,6 @@ static void recycle_buffer(struct state *this, uint32_t buffer_id)
}
}
static int port_get_format(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
uint32_t *index,
struct spa_pod **param,
struct spa_pod_builder *builder)
{
struct state *this = SPA_CONTAINER_OF(node, struct state, node);
if (!this->have_format)
return -EIO;
if (*index > 0)
return 0;
*param = spa_pod_builder_object(builder,
SPA_TYPE_OBJECT_Format, SPA_PARAM_Format,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_AUDIO_format, "I", this->current_format.info.raw.format,
":", SPA_FORMAT_AUDIO_layout, "I", this->current_format.info.raw.layout,
":", SPA_FORMAT_AUDIO_rate, "i", this->current_format.info.raw.rate,
":", SPA_FORMAT_AUDIO_channels, "i", this->current_format.info.raw.channels);
return 1;
}
static int
impl_node_port_enum_params(struct spa_node *node,
enum spa_direction direction, uint32_t port_id,
@ -342,7 +317,6 @@ impl_node_port_enum_params(struct spa_node *node,
struct spa_pod *param;
struct spa_pod_builder b = { 0 };
uint8_t buffer[1024];
int res;
spa_return_val_if_fail(node != NULL, -EINVAL);
spa_return_val_if_fail(index != NULL, -EINVAL);
@ -374,8 +348,12 @@ impl_node_port_enum_params(struct spa_node *node,
return spa_alsa_enum_format(this, index, filter, result, builder);
case SPA_PARAM_Format:
if ((res = port_get_format(node, direction, port_id, index, &param, &b)) <= 0)
return res;
if (!this->have_format)
return -EIO;
if (*index > 0)
return 0;
param = spa_format_audio_raw_build(&b, id, &this->current_format.info.raw);
break;
case SPA_PARAM_Buffers:
@ -469,9 +447,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return err;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

5
spa/plugins/audioconvert/channelmix.c
View file

@ -522,9 +522,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

5
spa/plugins/audioconvert/fmtconvert.c
View file

@ -676,9 +676,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

6
spa/plugins/audioconvert/merger.c
View file

@ -587,6 +587,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -602,9 +603,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

5
spa/plugins/audioconvert/resample.c
View file

@ -493,9 +493,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

6
spa/plugins/audioconvert/splitter.c
View file

@ -589,6 +589,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -604,9 +605,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

6
spa/plugins/audiomixer/audiomixer.c
View file

@ -515,6 +515,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -528,9 +529,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

23
spa/plugins/audiotestsrc/audiotestsrc.c
View file

@ -705,6 +705,8 @@ port_set_format(struct impl *this,
uint32_t flags,
const struct spa_pod *format)
{
int res;
if (format == NULL) {
this->have_format = false;
clear_buffers(this);
@ -713,9 +715,8 @@ port_set_format(struct impl *this,
int idx;
int sizes[4] = { 2, 4, 4, 8 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)
@ -724,16 +725,22 @@ port_set_format(struct impl *this,
if (spa_format_audio_raw_parse(format, &info.info.raw) < 0)
return -EINVAL;
if (info.info.raw.format == SPA_AUDIO_FORMAT_S16)
switch (info.info.raw.format) {
case SPA_AUDIO_FORMAT_S16:
idx = 0;
else if (info.info.raw.format == SPA_AUDIO_FORMAT_S32)
break;
case SPA_AUDIO_FORMAT_S32:
idx = 1;
else if (info.info.raw.format == SPA_AUDIO_FORMAT_F32)
break;
case SPA_AUDIO_FORMAT_F32:
idx = 2;
else if (info.info.raw.format == SPA_AUDIO_FORMAT_F64)
break;
case SPA_AUDIO_FORMAT_F64:
idx = 3;
else
break;
default:
return -EINVAL;
}
this->bpf = sizes[idx] * info.info.raw.channels;
this->current_format = info;

4
spa/plugins/bluez5/a2dp-sink.c
View file

@ -1066,9 +1066,7 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
if ((err = spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype)) < 0)
if ((err = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return err;
if (info.media_type != SPA_MEDIA_TYPE_audio ||

6
spa/plugins/ffmpeg/ffmpeg-dec.c
View file

@ -310,6 +310,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this;
struct port *port;
int res;
if (node == NULL || format == NULL)
return -EINVAL;
@ -327,9 +328,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_video_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
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)

6
spa/plugins/ffmpeg/ffmpeg-enc.c
View file

@ -298,6 +298,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -307,9 +308,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_video_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
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)

6
spa/plugins/v4l2/v4l2-source.c
View file

@ -552,6 +552,7 @@ static int port_set_format(struct spa_node *node,
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct spa_video_info info;
struct port *port = GET_PORT(this, direction, port_id);
int res;
if (format == NULL) {
spa_v4l2_stream_off(this);
@ -560,9 +561,8 @@ static int port_set_format(struct spa_node *node,
spa_v4l2_close(this);
return 0;
} else {
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_video) {
spa_log_error(this->log, "media type must be video");

5
spa/plugins/v4l2/v4l2-utils.c
View file

@ -544,9 +544,8 @@ spa_v4l2_enum_format(struct impl *this,
}
if (filter) {
spa_pod_object_parse(filter,
"I", &filter_media_type,
"I", &filter_media_subtype);
if ((res = spa_format_parse(filter, &filter_media_type, &filter_media_subtype)) < 0)
return res;
}
if (false) {

6
spa/plugins/videotestsrc/videotestsrc.c
View file

@ -622,6 +622,7 @@ static int port_set_format(struct spa_node *node,
const struct spa_pod *format)
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
int res;
if (format == NULL) {
this->have_format = false;
@ -629,9 +630,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_video_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
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)

6
spa/plugins/volume/volume.c
View file

@ -499,6 +499,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -508,9 +509,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)

4
src/gst/gstpipewireformat.c
View file

@ -799,8 +799,8 @@ gst_caps_from_format (const struct spa_pod *format)
uint32_t media_type, media_subtype;
struct spa_pod_prop *prop;
spa_pod_object_parse(format, "I", &media_type,
"I", &media_subtype);
if (spa_format_parse(format, &media_type, &media_subtype) < 0)
return res;
if (media_type == SPA_MEDIA_TYPE_video) {
if (media_subtype == SPA_MEDIA_SUBTYPE_raw) {

5
src/modules/module-client-node/client-stream.c
View file

@ -892,9 +892,8 @@ static void client_node_initialized(void *data)
return;
}
spa_pod_object_parse(format,
"I", &media_type,
"I", &media_subtype);
if (spa_format_parse(format, &media_type, &media_subtype) < 0)
return;
pw_log_debug("client-stream %p: %s/%s", &impl->this,
spa_debug_type_find_name(spa_debug_types, media_type),

5
src/modules/module-media-session.c
View file

@ -634,9 +634,8 @@ static int collect_audio_format(void *data, uint32_t id,
uint32_t media_type, media_subtype;
struct spa_audio_info_raw info;
spa_pod_object_parse(param,
"I", &media_type,
"I", &media_subtype);
if (spa_format_parse(param, &media_type, &media_subtype) < 0)
return 0;
if (media_type != SPA_MEDIA_TYPE_audio ||
media_subtype != SPA_MEDIA_SUBTYPE_raw)

6
src/modules/module-media-session/floatmix.c
View file

@ -541,6 +541,7 @@ static int port_set_format(struct spa_node *node,
{
struct impl *this = SPA_CONTAINER_OF(node, struct impl, node);
struct port *port;
int res;
port = GET_PORT(this, direction, port_id);
@ -554,9 +555,8 @@ static int port_set_format(struct spa_node *node,
} else {
struct spa_audio_info info = { 0 };
spa_pod_object_parse(format,
"I", &info.media_type,
"I", &info.media_subtype);
if ((res = spa_format_parse(format, &info.media_type, &info.media_subtype)) < 0)
return res;
if (info.media_type != SPA_MEDIA_TYPE_audio ||
info.media_subtype != SPA_MEDIA_SUBTYPE_raw)