mirror of
https://gitlab.freedesktop.org/pipewire/pipewire.git
synced 2025-11-11 13:30:07 -05:00
rework props with pod
This commit is contained in:
Wim Taymans
parent
f02f93cda9
commit
dbae2e3f96
25 changed files with 232 additions and 472 deletions
|
|
@ -35,9 +35,10 @@ spa_pod_builder_push_format (SpaPODBuilder *builder,
|
|||
uint32_t media_type,
|
||||
uint32_t media_subtype)
|
||||
{
|
||||
const SpaFormat p = { { sizeof (SpaFormatBody), SPA_POD_TYPE_FORMAT },
|
||||
{ media_type, media_subtype } };
|
||||
return spa_pod_builder_push (builder, frame, &p.pod,
|
||||
const SpaFormat p = { { { sizeof (SpaPODObjectBody) + sizeof (SpaFormatBody), SPA_POD_TYPE_OBJECT }, { 0, 0 } },
|
||||
{ { { sizeof (uint32_t), SPA_POD_TYPE_INT }, media_type },
|
||||
{ { sizeof (uint32_t), SPA_POD_TYPE_INT }, media_subtype } } };
|
||||
return spa_pod_builder_push (builder, frame, &p.obj.pod,
|
||||
spa_pod_builder_raw (builder, &p, sizeof(p), false));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -90,8 +90,8 @@ typedef enum {
|
|||
} SpaFormatProps;
|
||||
|
||||
typedef struct {
|
||||
uint32_t media_type;
|
||||
uint32_t media_subtype;
|
||||
SpaPODInt media_type;
|
||||
SpaPODInt media_subtype;
|
||||
/* contents follow, series of SpaPODProp */
|
||||
} SpaFormatBody;
|
||||
|
||||
|
|
@ -102,7 +102,7 @@ typedef struct {
|
|||
* @pod: POD object with properties
|
||||
*/
|
||||
struct _SpaFormat {
|
||||
SpaPOD pod;
|
||||
SpaPODObject obj;
|
||||
SpaFormatBody body;
|
||||
};
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ static inline SpaPODProp *
|
|||
spa_format_find_prop (const SpaFormat *format, uint32_t key)
|
||||
{
|
||||
SpaPODProp *res;
|
||||
SPA_POD_FOREACH (format, res) {
|
||||
SPA_FORMAT_BODY_FOREACH (&format->body, SPA_POD_BODY_SIZE (format), res) {
|
||||
if (res->pod.type == SPA_POD_TYPE_PROP && res->body.key == key)
|
||||
return res;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,8 +47,7 @@ typedef enum {
|
|||
SPA_POD_TYPE_STRUCT,
|
||||
SPA_POD_TYPE_OBJECT,
|
||||
SPA_POD_TYPE_PROP,
|
||||
SPA_POD_TYPE_BYTES,
|
||||
SPA_POD_TYPE_FORMAT
|
||||
SPA_POD_TYPE_BYTES
|
||||
} SpaPODType;
|
||||
|
||||
typedef struct {
|
||||
|
|
|
|||
|
|
@ -24,167 +24,39 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct _SpaProps SpaProps;
|
||||
#include <spa/pod.h>
|
||||
#include <spa/pod-builder.h>
|
||||
|
||||
typedef SpaPODObject SpaProps;
|
||||
|
||||
#define SPA_PROPS_URI "http://spaplug.in/ns/props"
|
||||
#define SPA_PROPS_PREFIX SPA_PROPS_URI "#"
|
||||
|
||||
#include <string.h>
|
||||
#include <spa/defs.h>
|
||||
#include <spa/dict.h>
|
||||
|
||||
/**
|
||||
* SpaPropType:
|
||||
*/
|
||||
typedef enum {
|
||||
SPA_PROP_TYPE_INVALID = 0,
|
||||
SPA_PROP_TYPE_BOOL,
|
||||
SPA_PROP_TYPE_INT8,
|
||||
SPA_PROP_TYPE_UINT8,
|
||||
SPA_PROP_TYPE_INT16,
|
||||
SPA_PROP_TYPE_UINT16,
|
||||
SPA_PROP_TYPE_INT32,
|
||||
SPA_PROP_TYPE_UINT32,
|
||||
SPA_PROP_TYPE_INT64,
|
||||
SPA_PROP_TYPE_UINT64,
|
||||
SPA_PROP_TYPE_INT,
|
||||
SPA_PROP_TYPE_UINT,
|
||||
SPA_PROP_TYPE_FLOAT,
|
||||
SPA_PROP_TYPE_DOUBLE,
|
||||
SPA_PROP_TYPE_STRING,
|
||||
SPA_PROP_TYPE_RECTANGLE,
|
||||
SPA_PROP_TYPE_FRACTION,
|
||||
SPA_PROP_TYPE_BITMASK,
|
||||
SPA_PROP_TYPE_POINTER
|
||||
} SpaPropType;
|
||||
|
||||
/**
|
||||
* SpaPropFlags:
|
||||
* @SPA_PROP_FLAG_NONE: no flags
|
||||
* @SPA_PROP_FLAG_OPTIONAL: the value can be left unset
|
||||
* @SPA_PROP_FLAG_READABLE: property is readable
|
||||
* @SPA_PROP_FLAG_WRITABLE: property is writable
|
||||
* @SPA_PROP_FLAG_READWRITE: property is readable and writable
|
||||
* @SPA_PROP_FLAG_DEPRECATED: property is deprecated and should not be used
|
||||
* @SPA_PROP_FLAG_INFO: property is to get/set the complete structure
|
||||
*/
|
||||
typedef enum {
|
||||
SPA_PROP_FLAG_NONE = 0,
|
||||
SPA_PROP_FLAG_OPTIONAL = (1 << 0),
|
||||
SPA_PROP_FLAG_READABLE = (1 << 1),
|
||||
SPA_PROP_FLAG_WRITABLE = (1 << 2),
|
||||
SPA_PROP_FLAG_READWRITE = SPA_PROP_FLAG_READABLE | SPA_PROP_FLAG_WRITABLE,
|
||||
SPA_PROP_FLAG_DEPRECATED = (1 << 3),
|
||||
SPA_PROP_FLAG_INFO = (1 << 4),
|
||||
} SpaPropFlags;
|
||||
|
||||
/* SpaPropRangeType:
|
||||
* @SPA_PROP_RANGE_TYPE_NONE: no range specified, full range of type applies
|
||||
* @SPA_PROP_RANGE_TYPE_MIN_MAX: range contains 2 values, min and max
|
||||
* @SPA_PROP_RANGE_TYPE_STEP: range contains 3 values, min, max and step
|
||||
* @SPA_PROP_RANGE_TYPE_ENUM: range contains enum of possible values
|
||||
* @SPA_PROP_RANGE_TYPE_FLAGS: range contains flags of possible values
|
||||
*/
|
||||
typedef enum {
|
||||
SPA_PROP_RANGE_TYPE_NONE = 0,
|
||||
SPA_PROP_RANGE_TYPE_MIN_MAX,
|
||||
SPA_PROP_RANGE_TYPE_STEP,
|
||||
SPA_PROP_RANGE_TYPE_ENUM,
|
||||
SPA_PROP_RANGE_TYPE_FLAGS,
|
||||
} SpaPropRangeType;
|
||||
|
||||
/**
|
||||
* SpaPropValue:
|
||||
* @size: the property size
|
||||
* @value: the property value.
|
||||
*
|
||||
* The structure to set and get properties.
|
||||
*/
|
||||
typedef struct {
|
||||
size_t size;
|
||||
const void *value;
|
||||
} SpaPropValue;
|
||||
|
||||
/**
|
||||
* SpaPropRangeInfo:
|
||||
* @name: name of this value
|
||||
* @val: the value
|
||||
*/
|
||||
typedef struct {
|
||||
const char *name;
|
||||
SpaPropValue val;
|
||||
} SpaPropRangeInfo;
|
||||
|
||||
/**
|
||||
* SpaPropInfo:
|
||||
* @id: unique id
|
||||
* @offset: offset in structure with data
|
||||
* @name: human readable name
|
||||
* @flags: property flags
|
||||
* @type: property type
|
||||
* @max_size: maximum size of property value
|
||||
* @range_type: type of the range values
|
||||
* @n_range_values: number of elements in @range_values
|
||||
* @range_values: array of possible values
|
||||
* @extra: extra info
|
||||
*/
|
||||
typedef struct {
|
||||
uint32_t id;
|
||||
size_t offset;
|
||||
const char *name;
|
||||
SpaPropFlags flags;
|
||||
SpaPropType type;
|
||||
size_t maxsize;
|
||||
SpaPropRangeType range_type;
|
||||
unsigned int n_range_values;
|
||||
const SpaPropRangeInfo *range_values;
|
||||
SpaDict *extra;
|
||||
} SpaPropInfo;
|
||||
|
||||
/**
|
||||
* SpaProps:
|
||||
* @n_prop_info: number of elements in @prop_info
|
||||
* @prop_info: array of #SpaPropInfo. Contains info about the
|
||||
* properties. Can be %NULL when unspecified.
|
||||
* @unset_mask: mask of unset properties. For each property in @prop_info there
|
||||
* is a corresponding bit that specifies if the property is currently
|
||||
* unset. When more than 32 properties are present, more uint32_t
|
||||
* fields follow this one.
|
||||
*
|
||||
* Generic propertiers.
|
||||
*/
|
||||
struct _SpaProps {
|
||||
unsigned int n_prop_info;
|
||||
const SpaPropInfo *prop_info;
|
||||
uint32_t unset_mask;
|
||||
};
|
||||
|
||||
#define SPA_PROPS_INDEX_IS_UNSET(p,idx) ((&(p)->unset_mask)[(idx) >> 5] & (1U << ((idx) & 31)))
|
||||
#define SPA_PROPS_INDEX_UNSET(p,idx) ((&(p)->unset_mask)[(idx) >> 5] |= (1U << ((idx) & 31)))
|
||||
#define SPA_PROPS_INDEX_SET(p,idx) ((&(p)->unset_mask)[(idx) >> 5] &= ~(1U << ((idx) & 31)))
|
||||
|
||||
static inline unsigned int
|
||||
spa_props_index_for_id (const SpaProps *props, uint32_t id)
|
||||
static inline off_t
|
||||
spa_pod_builder_push_props (SpaPODBuilder *builder,
|
||||
SpaPODFrame *frame)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
for (i = 0; i < props->n_prop_info; i++) {
|
||||
if (props->prop_info[i].id == id)
|
||||
return i;
|
||||
}
|
||||
return SPA_IDX_INVALID;
|
||||
return spa_pod_builder_push_object (builder, frame, 0, 0);
|
||||
}
|
||||
|
||||
static inline unsigned int
|
||||
spa_props_index_for_name (const SpaProps *props, const char *name)
|
||||
static inline off_t
|
||||
spa_pod_builder_props (SpaPODBuilder *builder,
|
||||
uint32_t propid, ...)
|
||||
{
|
||||
unsigned int i;
|
||||
SpaPODFrame f;
|
||||
va_list args;
|
||||
off_t off;
|
||||
|
||||
for (i = 0; i < props->n_prop_info; i++) {
|
||||
if (strcmp (props->prop_info[i].name, name) == 0)
|
||||
return i;
|
||||
}
|
||||
return SPA_IDX_INVALID;
|
||||
off = spa_pod_builder_push_props (builder, &f);
|
||||
|
||||
va_start (args, propid);
|
||||
spa_pod_builder_propv (builder, propid, args);
|
||||
va_end (args);
|
||||
|
||||
spa_pod_builder_pop (builder, &f);
|
||||
|
||||
return off;
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue