From c904809e759059b31734d022a421ba1531d86dc5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Sat, 26 Oct 2019 09:49:13 +0200 Subject: [PATCH] param: move param_info to params.h --- spa/include/spa/param/format.h | 1 + spa/include/spa/param/param.h | 16 ++++++++++++---- spa/include/spa/param/type-info.h | 1 + spa/include/spa/utils/defs.h | 13 ------------- 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h index 591e16b5a..b83451ed8 100644 --- a/spa/include/spa/param/format.h +++ b/spa/include/spa/param/format.h @@ -46,6 +46,7 @@ enum spa_media_type { enum spa_media_subtype { SPA_MEDIA_SUBTYPE_unknown, SPA_MEDIA_SUBTYPE_raw, + SPA_MEDIA_SUBTYPE_dsp, SPA_MEDIA_SUBTYPE_START_Audio = 0x10000, SPA_MEDIA_SUBTYPE_mp3, diff --git a/spa/include/spa/param/param.h b/spa/include/spa/param/param.h index 2c6d0a072..a712366f7 100644 --- a/spa/include/spa/param/param.h +++ b/spa/include/spa/param/param.h @@ -47,12 +47,20 @@ enum spa_param_type { SPA_PARAM_PortConfig, /**< port configuration as SPA_TYPE_OBJECT_ParamPortConfig */ }; -/** Properties for SPA_TYPE_OBJECT_ParamList */ -enum spa_param_list { - SPA_PARAM_LIST_START, - SPA_PARAM_LIST_id, /**< id of the supported list param (Id enum spa_param_type) */ +/** information about a parameter */ +struct spa_param_info { + uint32_t id; /**< enum spa_param_type */ +#define SPA_PARAM_INFO_SERIAL (1<<0) /**< bit to signal update even when the + * read/write flags don't change */ +#define SPA_PARAM_INFO_READ (1<<1) +#define SPA_PARAM_INFO_WRITE (1<<2) +#define SPA_PARAM_INFO_READWRITE (SPA_PARAM_INFO_WRITE|SPA_PARAM_INFO_READ) + uint32_t flags; + uint32_t padding[6]; }; +#define SPA_PARAM_INFO(id,flags) (struct spa_param_info){ (id), (flags) } + /** properties for SPA_TYPE_OBJECT_ParamBuffers */ enum spa_param_buffers { SPA_PARAM_BUFFERS_START, diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h index 6065e6c27..eee0fbf3f 100644 --- a/spa/include/spa/param/type-info.h +++ b/spa/include/spa/param/type-info.h @@ -160,6 +160,7 @@ static const struct spa_type_info spa_type_media_subtype[] = { { SPA_MEDIA_SUBTYPE_unknown, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "unknown", NULL }, /* generic subtypes */ { SPA_MEDIA_SUBTYPE_raw, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "raw", NULL }, + { SPA_MEDIA_SUBTYPE_dsp, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "dsp", NULL }, /* audio subtypes */ { SPA_MEDIA_SUBTYPE_mp3, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "mp3", NULL }, { SPA_MEDIA_SUBTYPE_aac, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "aac", NULL }, diff --git a/spa/include/spa/utils/defs.h b/spa/include/spa/utils/defs.h index 8992bcd5d..981cc62a2 100644 --- a/spa/include/spa/utils/defs.h +++ b/spa/include/spa/utils/defs.h @@ -73,19 +73,6 @@ struct spa_fraction { uint32_t denom; }; -struct spa_param_info { - uint32_t id; -#define SPA_PARAM_INFO_SERIAL (1<<0) /**< bit to signal update even when the - * read/write flags don't change */ -#define SPA_PARAM_INFO_READ (1<<1) -#define SPA_PARAM_INFO_WRITE (1<<2) -#define SPA_PARAM_INFO_READWRITE (SPA_PARAM_INFO_WRITE|SPA_PARAM_INFO_READ) - uint32_t flags; - uint32_t padding[6]; -}; - -#define SPA_PARAM_INFO(id,flags) (struct spa_param_info){ (id), (flags) } - #define SPA_N_ELEMENTS(arr) (sizeof(arr) / sizeof((arr)[0])) #define SPA_MIN(a,b) \