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

Make media type and subtype properties

Browse source 
This is easier to debug and we only want properties in objects
in the future.
This commit is contained in:
Wim Taymans 2018-08-29 18:08:52 +02:00
parent 514528f2c7
commit ff6a244d8f
45 changed files with 151 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

1
spa/include/spa/buffer/buffer.h
View file

@ -34,6 +34,7 @@ extern "C" {
*/
enum spa_data_type {
SPA_DATA_Invalid,
SPA_DATA_MemPtr, /**< pointer to memory, the data field in
* struct spa_data is set. */
SPA_DATA_MemFd, /**< generic fd, mmap to get to memory */

1
spa/include/spa/buffer/meta.h
View file

@ -31,6 +31,7 @@ extern "C" {
* Metadata contains extra information on a buffer.
*/
enum spa_meta_type {
SPA_META_Invalid,
SPA_META_Header,
SPA_META_VideoCrop,
SPA_META_VideoDamage,

2
spa/include/spa/buffer/type-info.h
View file

@ -40,6 +40,7 @@ extern "C" {
#define SPA_TYPE_DATA_FD_BASE SPA_TYPE_DATA__Fd ":"
static const struct spa_type_info spa_type_data_type[] = {
{ SPA_DATA_Invalid, SPA_TYPE_DATA_BASE "Invalid", SPA_TYPE_Int, },
{ SPA_DATA_MemPtr, SPA_TYPE_DATA_BASE "MemPtr", SPA_TYPE_Int, },
{ SPA_DATA_MemFd, SPA_TYPE_DATA_FD_BASE "MemFd", SPA_TYPE_Int, },
{ SPA_DATA_DmaBuf, SPA_TYPE_DATA_FD_BASE "DmaBuf", SPA_TYPE_Int, },
@ -56,6 +57,7 @@ static const struct spa_type_info spa_type_data_type[] = {
#define SPA_TYPE_META_REGION_ARRAY_BASE SPA_TYPE_META__RegionArray ":"
static const struct spa_type_info spa_type_meta_type[] = {
{ SPA_META_Invalid, SPA_TYPE_META_BASE "Invalid", SPA_TYPE_Pointer },
{ SPA_META_Header, SPA_TYPE_META_BASE "Header", SPA_TYPE_Pointer },
{ SPA_META_VideoCrop, SPA_TYPE_META_REGION_BASE "VideoCrop", SPA_TYPE_Pointer },
{ SPA_META_VideoDamage, SPA_TYPE_META_REGION_ARRAY_BASE "VideoDamage", SPA_TYPE_Pointer },

5
spa/include/spa/control/control.h
View file

@ -33,8 +33,9 @@ extern "C" {
/** Different Control types */
enum spa_control_type {
SPA_CONTROL_properties,
SPA_CONTROL_midi,
SPA_CONTROL_Invalid,
SPA_CONTROL_Properties,
SPA_CONTROL_Midi,
};
#ifdef __cplusplus

14
spa/include/spa/debug/format.h
View file

@ -27,6 +27,7 @@ extern "C" {
#include <spa/pod/parser.h>
#include <spa/debug/types.h>
#include <spa/param/type-info.h>
#include <spa/param/format-utils.h>
static inline int
spa_debug_format_value(const struct spa_type_info *info,
@ -124,16 +125,13 @@ static inline int spa_debug_format(int indent,
if (format == NULL || SPA_POD_TYPE(format) != SPA_TYPE_Object)
return -EINVAL;
if (spa_pod_object_parse(format, "I", &mtype,
"I", &mstype) < 0)
if (spa_format_parse(format, &mtype, &mstype) < 0)
return -EINVAL;
media_type = spa_debug_type_find_name(spa_type_media_type, mtype);
media_subtype = spa_debug_type_find_name(spa_type_media_subtype, mstype);
fprintf(stderr, "%-6s %s/%s\n", "",
fprintf(stderr, "%*s %s/%s\n", indent, "",
media_type ? rindex(media_type, ':') + 1 : "unknown",
media_subtype ? rindex(media_subtype, ':') + 1 : "unknown");
@ -153,10 +151,14 @@ static inline int spa_debug_format(int indent,
(prop->body.flags & SPA_POD_PROP_FLAG_OPTIONAL))
continue;
if (prop->body.key == SPA_FORMAT_mediaType ||
prop->body.key == SPA_FORMAT_mediaSubtype)
continue;
ti = spa_debug_type_find(info, prop->body.key);
key = ti ? ti->name : NULL;
fprintf(stderr, " %20s : (%s) ",
fprintf(stderr, "%*s %16s : (%s) ", indent, "",
key ? rindex(key, ':') + 1 : "unknown",
pod_type_names[prop->body.value.type]);

8
spa/include/spa/monitor/monitor.h
View file

@ -32,6 +32,7 @@ struct spa_monitor;
#include <spa/pod/builder.h>
enum spa_monitor_event {
SPA_MONITOR_EVENT_Invalid,
SPA_MONITOR_EVENT_Added,
SPA_MONITOR_EVENT_Removed,
SPA_MONITOR_EVENT_Changed,
@ -46,9 +47,10 @@ enum spa_monitor_item_flags {
/** The monitor item state */
enum spa_monitor_item_state {
SPA_MONITOR_ITEM_STATE_AVAILABLE, /*< The item is available */
SPA_MONITOR_ITEM_STATE_DISABLED, /*< The item is disabled */
SPA_MONITOR_ITEM_STATE_UNAVAILABLE, /*< The item is unavailable */
SPA_MONITOR_ITEM_STATE_Invalid, /*< The item is available */
SPA_MONITOR_ITEM_STATE_Available, /*< The item is available */
SPA_MONITOR_ITEM_STATE_Disabled, /*< The item is disabled */
SPA_MONITOR_ITEM_STATE_Unavailable, /*< The item is unavailable */
};
/** properties for SPA_TYPE_OBJECT_MonitorItem */

8
spa/include/spa/monitor/type-info.h
View file

@ -54,9 +54,9 @@ static const struct spa_type_info spa_type_monitor_item_flags[] = {
#define SPA_TYPE_MONITOR_ITEM_STATE_BASE SPA_TYPE__MonitorItemState ":"
static const struct spa_type_info spa_type_monitor_item_state[] = {
{ SPA_MONITOR_ITEM_STATE_AVAILABLE, SPA_TYPE_MONITOR_ITEM_STATE_BASE "available", SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_STATE_DISABLED, SPA_TYPE_MONITOR_ITEM_STATE_BASE "disabled", SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_STATE_UNAVAILABLE, SPA_TYPE_MONITOR_ITEM_STATE_BASE "unavailable", SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_STATE_Available, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Available", SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_STATE_Disabled, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Disabled", SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_STATE_Unavailable, SPA_TYPE_MONITOR_ITEM_STATE_BASE "Unavailable", SPA_TYPE_Int, },
{ 0, NULL, },
};
@ -64,7 +64,7 @@ static const struct spa_type_info spa_type_monitor_item_state[] = {
#define SPA_TYPE_MONITOR_ITEM_BASE SPA_TYPE__MonitorItem ":"
static const struct spa_type_info spa_type_monitor_item[] = {
{ SPA_MONITOR_ITEM_START, SPA_TYPE_MONITOR_ITEM_BASE, SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_START, SPA_TYPE_MONITOR_ITEM_BASE, SPA_TYPE_Int, },
{ SPA_MONITOR_ITEM_id, SPA_TYPE_MONITOR_ITEM_BASE "id", SPA_TYPE_String, },
{ SPA_MONITOR_ITEM_flags, SPA_TYPE_MONITOR_ITEM_BASE "flags", SPA_TYPE_Enum,
spa_type_monitor_item_flags },

1
spa/include/spa/node/io.h
View file

@ -35,6 +35,7 @@ extern "C" {
/** Different IO area types */
enum spa_io_type {
SPA_IO_Invalid,
SPA_IO_Buffers,
SPA_IO_Range,
SPA_IO_Clock,

8
spa/include/spa/node/node.h
View file

@ -108,12 +108,10 @@ struct spa_node_callbacks {
};
/** flags that can be passed to set_param and port_set_param functions */
enum spa_node_param_flags {
SPA_NODE_PARAM_FLAG_TEST_ONLY = (1 << 0), /* just check if the param is accepted */
SPA_NODE_PARAM_FLAG_FIXATE = (1 << 1), /* fixate the non-optional unset fields */
SPA_NODE_PARAM_FLAG_NEAREST = (1 << 2), /* allow set fields to be rounded to the
#define SPA_NODE_PARAM_FLAG_TEST_ONLY (1 << 0) /* just check if the param is accepted */
#define SPA_NODE_PARAM_FLAG_FIXATE (1 << 1) /* fixate the non-optional unset fields */
#define SPA_NODE_PARAM_FLAG_NEAREST (1 << 2) /* allow set fields to be rounded to the
* nearest allowed field value. */
};
/**
* A spa_node is a component that can consume and produce buffers.

8
spa/include/spa/node/type-info.h
View file

@ -49,14 +49,14 @@ static const struct spa_type_info spa_type_node_event[] = {
#define SPA_TYPE_NODE_COMMAND_BASE SPA_TYPE__NodeCommand ":"
static const struct spa_type_info spa_type_node_command_id[] = {
{ SPA_NODE_COMMAND_Suspend, SPA_TYPE_NODE_COMMAND_BASE "Suspend", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Suspend, SPA_TYPE_NODE_COMMAND_BASE "Suspend", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Pause, SPA_TYPE_NODE_COMMAND_BASE "Pause", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Start, SPA_TYPE_NODE_COMMAND_BASE "Start", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Enable, SPA_TYPE_NODE_COMMAND_BASE "Enable", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Disable, SPA_TYPE_NODE_COMMAND_BASE "Disable", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Enable, SPA_TYPE_NODE_COMMAND_BASE "Enable", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Disable, SPA_TYPE_NODE_COMMAND_BASE "Disable", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Flush, SPA_TYPE_NODE_COMMAND_BASE "Flush", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Drain, SPA_TYPE_NODE_COMMAND_BASE "Drain", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Marker, SPA_TYPE_NODE_COMMAND_BASE "Marker", SPA_TYPE_Int, },
{ SPA_NODE_COMMAND_Marker, SPA_TYPE_NODE_COMMAND_BASE "Marker", SPA_TYPE_Int, },
{ 0, NULL, },
};

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

@ -47,8 +47,8 @@ spa_format_audio_raw_build(struct spa_pod_builder *builder, uint32_t id, struct
{
return spa_pod_builder_object(builder,
SPA_TYPE_OBJECT_Format, id,
"I", SPA_MEDIA_TYPE_audio,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_audio,
":", SPA_FORMAT_mediaSubtype, "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,

13
spa/include/spa/param/audio/raw.h
View file

@ -122,22 +122,21 @@ enum spa_audio_format {
};
/** Extra audio flags */
enum spa_audio_flags {
SPA_AUDIO_FLAG_NONE = 0, /*< no valid flag */
SPA_AUDIO_FLAG_UNPOSITIONED = (1 << 0), /*< the position array explicitly
#define SPA_AUDIO_FLAG_NONE (0) /*< no valid flag */
#define SPA_AUDIO_FLAG_UNPOSITIONED (1 << 0) /*< the position array explicitly
* contains unpositioned channels. */
};
/** Layout of the audio samples for the different channels. */
enum spa_audio_layout {
SPA_AUDIO_LAYOUT_INTERLEAVED = 0, /*< interleaved audio */
SPA_AUDIO_LAYOUT_NON_INTERLEAVED /*< non-interleaved audio */
SPA_AUDIO_LAYOUT_INVALID,
SPA_AUDIO_LAYOUT_INTERLEAVED, /*< interleaved audio */
SPA_AUDIO_LAYOUT_NON_INTERLEAVED, /*< non-interleaved audio */
};
/** Audio information description */
struct spa_audio_info_raw {
enum spa_audio_format format; /*< format, one of enum spa_audio_format */
enum spa_audio_flags flags; /*< extra flags */
uint32_t flags; /*< extra flags */
enum spa_audio_layout layout; /*< sample layout */
uint32_t rate; /*< sample rate */
uint32_t channels; /*< number of channels */

5
spa/include/spa/param/audio/type-info.h
View file

@ -78,8 +78,9 @@ static const struct spa_type_info spa_type_audio_flags[] = {
#define SPA_TYPE_AUDIO_ENUM_BASE SPA_TYPE__AudioLayout ":"
static const struct spa_type_info spa_type_audio_layout[] = {
{ SPA_AUDIO_LAYOUT_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "interleaved", SPA_TYPE_Int, },
{ SPA_AUDIO_LAYOUT_NON_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "non-interleaved", SPA_TYPE_Int, },
{ SPA_AUDIO_LAYOUT_INVALID, SPA_TYPE_AUDIO_ENUM_BASE "Invalid", SPA_TYPE_Int, },
{ SPA_AUDIO_LAYOUT_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "Interleaved", SPA_TYPE_Int, },
{ SPA_AUDIO_LAYOUT_NON_INTERLEAVED, SPA_TYPE_AUDIO_ENUM_BASE "Non-Interleaved", SPA_TYPE_Int, },
{ 0, NULL, },
};

4
spa/include/spa/param/format-utils.h
View file

@ -32,8 +32,8 @@ 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);
":", SPA_FORMAT_mediaType, "I", media_type,
":", SPA_FORMAT_mediaSubtype, "I", media_subtype, NULL);
}
#ifdef __cplusplus

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

@ -28,7 +28,7 @@ extern "C" {
/** media type for SPA_TYPE_OBJECT_Format */
enum spa_media_type {
SPA_MEDIA_TYPE_START,
SPA_MEDIA_TYPE_unknown,
SPA_MEDIA_TYPE_audio,
SPA_MEDIA_TYPE_video,
SPA_MEDIA_TYPE_image,
@ -38,7 +38,7 @@ enum spa_media_type {
/** media subtype for SPA_TYPE_OBJECT_Format */
enum spa_media_subtype {
SPA_MEDIA_SUBTYPE_START_Generic,
SPA_MEDIA_SUBTYPE_unknown,
SPA_MEDIA_SUBTYPE_raw,
SPA_MEDIA_SUBTYPE_START_Audio = 0x10000,
@ -83,11 +83,11 @@ enum spa_media_subtype {
enum spa_format {
SPA_FORMAT_START, /**< id of the object, one of enum spa_param_type */
SPA_FORMAT_MediaType, /**< first int in object, one of enum spa_media_type */
SPA_FORMAT_MediaSubtype, /**< second int in object, one of enum spa_media_subtype */
SPA_FORMAT_mediaType, /**< one of enum spa_media_type */
SPA_FORMAT_mediaSubtype, /**< one of enum spa_media_subtype */
/* Audio format keys */
SPA_FORMAT_START_AUDIO,
SPA_FORMAT_START_Audio,
SPA_FORMAT_AUDIO_format,
SPA_FORMAT_AUDIO_flags,
SPA_FORMAT_AUDIO_layout,
@ -96,7 +96,7 @@ enum spa_format {
SPA_FORMAT_AUDIO_channelMask,
/* Video Format keys */
SPA_FORMAT_START_VIDEO = 0x10000,
SPA_FORMAT_START_Video = 0x10000,
SPA_FORMAT_VIDEO_format,
SPA_FORMAT_VIDEO_size,
SPA_FORMAT_VIDEO_framerate,
@ -117,11 +117,11 @@ enum spa_format {
SPA_FORMAT_VIDEO_alignment,
/* Image Format keys */
SPA_FORMAT_START_IMAGE = 0x20000,
SPA_FORMAT_START_Image = 0x20000,
/* Binary Format keys */
SPA_FORMAT_START_BINARY = 0x30000,
SPA_FORMAT_START_Binary = 0x30000,
/* Stream Format keys */
SPA_FORMAT_START_STREAM = 0x40000,
SPA_FORMAT_START_Stream = 0x40000,
};
#ifdef __cplusplus

2
spa/include/spa/param/param.h
View file

@ -28,7 +28,7 @@ extern "C" {
/** different parameter types that can be queried */
enum spa_param_type {
SPA_PARAM_START, /**< no value */
SPA_PARAM_Invalid, /**< invalid */
SPA_PARAM_List, /**< available params */
SPA_PARAM_PropInfo, /**< property information */
SPA_PARAM_Props, /**< properties */

20
spa/include/spa/param/type-info.h
View file

@ -34,7 +34,7 @@ extern "C" {
#define SPA_TYPE_PARAM_ID_BASE SPA_TYPE__ParamId ":"
static const struct spa_type_info spa_type_param[] = {
{ SPA_PARAM_START, "undefined", SPA_TYPE_Int, },
{ SPA_PARAM_Invalid, SPA_TYPE_PARAM_ID_BASE "Invalid", SPA_TYPE_Int, },
{ SPA_PARAM_List, SPA_TYPE_PARAM_ID_BASE "List", SPA_TYPE_Int, },
{ SPA_PARAM_PropInfo, SPA_TYPE_PARAM_ID_BASE "PropInfo", SPA_TYPE_Int, },
{ SPA_PARAM_Props, SPA_TYPE_PARAM_ID_BASE "Props", SPA_TYPE_Int, },
@ -56,7 +56,7 @@ static const struct spa_type_info spa_type_param[] = {
static const struct spa_type_info spa_type_param_list[] = {
{ SPA_PARAM_LIST_START, SPA_TYPE_PARAM_LIST_BASE, SPA_TYPE_Enum, spa_type_param },
{ SPA_PARAM_LIST_id, SPA_TYPE_PARAM_LIST_BASE "id", SPA_TYPE_Enum, },
{ SPA_PARAM_LIST_id, SPA_TYPE_PARAM_LIST_BASE "id", SPA_TYPE_Enum, spa_type_param },
{ 0, NULL, },
};
@ -141,11 +141,12 @@ static const struct spa_type_info spa_type_param_io[] = {
#include <spa/param/video/type-info.h>
static const struct spa_type_info spa_type_media_type[] = {
{ SPA_MEDIA_TYPE_audio, SPA_TYPE_MEDIA_TYPE_BASE "audio", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_video, SPA_TYPE_MEDIA_TYPE_BASE "video", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_image, SPA_TYPE_MEDIA_TYPE_BASE "image", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_binary, SPA_TYPE_MEDIA_TYPE_BASE "binary", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_stream, SPA_TYPE_MEDIA_TYPE_BASE "stream", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_unknown, SPA_TYPE_MEDIA_TYPE_BASE "unknown", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_audio, SPA_TYPE_MEDIA_TYPE_BASE "audio", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_video, SPA_TYPE_MEDIA_TYPE_BASE "video", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_image, SPA_TYPE_MEDIA_TYPE_BASE "image", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_binary, SPA_TYPE_MEDIA_TYPE_BASE "binary", SPA_TYPE_Int, },
{ SPA_MEDIA_TYPE_stream, SPA_TYPE_MEDIA_TYPE_BASE "stream", SPA_TYPE_Int, },
{ 0, NULL, },
};
@ -153,6 +154,7 @@ static const struct spa_type_info spa_type_media_type[] = {
#define SPA_TYPE_MEDIA_SUBTYPE_BASE SPA_TYPE__MediaSubtype ":"
static const struct spa_type_info spa_type_media_subtype[] = {
{ SPA_MEDIA_SUBTYPE_unknown, SPA_TYPE_MEDIA_SUBTYPE_BASE "unknown", SPA_TYPE_Int, },
/* generic subtypes */
{ SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_MEDIA_SUBTYPE_BASE "raw", SPA_TYPE_Int, },
/* audio subtypes */
@ -197,9 +199,9 @@ static const struct spa_type_info spa_type_media_subtype[] = {
static const struct spa_type_info spa_type_format[] = {
{ SPA_FORMAT_START, SPA_TYPE_FORMAT_BASE, SPA_TYPE_Enum, spa_type_param, },
{ SPA_FORMAT_MediaType, SPA_TYPE_FORMAT_BASE "mediaType", SPA_TYPE_Enum,
{ SPA_FORMAT_mediaType, SPA_TYPE_FORMAT_BASE "mediaType", SPA_TYPE_Enum,
spa_type_media_type, },
{ SPA_FORMAT_MediaSubtype, SPA_TYPE_FORMAT_BASE "mediaSubtype", SPA_TYPE_Enum,
{ SPA_FORMAT_mediaSubtype, SPA_TYPE_FORMAT_BASE "mediaSubtype", SPA_TYPE_Enum,
spa_type_media_subtype, },
{ SPA_FORMAT_AUDIO_format, SPA_TYPE_FORMAT_AUDIO_BASE "format", SPA_TYPE_Enum,

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

@ -56,8 +56,8 @@ spa_format_video_raw_build(struct spa_pod_builder *builder, uint32_t id,
{
return spa_pod_builder_object(builder,
SPA_TYPE_OBJECT_Format, id,
"I", SPA_MEDIA_TYPE_video,
"I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_mediaType, "I", SPA_MEDIA_TYPE_video,
":", SPA_FORMAT_mediaSubtype, "I", SPA_MEDIA_SUBTYPE_raw,
":", SPA_FORMAT_VIDEO_format, "I", &info->format,
":", SPA_FORMAT_VIDEO_size, "R", &info->size,
":", SPA_FORMAT_VIDEO_framerate, "F", &info->framerate);