diff --git a/pipewire/client/array.h b/pipewire/client/array.h index 4521fe34d..87b83766f 100644 --- a/pipewire/client/array.h +++ b/pipewire/client/array.h @@ -35,17 +35,17 @@ struct pw_array { #define PW_ARRAY_INIT(extend) { NULL, 0, 0, extend } -#define pw_array_get_len_s(a,s) ((a)->size / (s)) -#define pw_array_get_unchecked_s(a,idx,s,t) SPA_MEMBER((a)->data,(idx)*(s),t) -#define pw_array_check_index_s(a,idx,s) ((idx) < pw_array_get_len(a,s)) +#define pw_array_get_len_s(a,s) ((a)->size / (s)) +#define pw_array_get_unchecked_s(a,idx,s,t) SPA_MEMBER((a)->data,(idx)*(s),t) +#define pw_array_check_index_s(a,idx,s) ((idx) < pw_array_get_len(a,s)) -#define pw_array_get_len(a,t) pw_array_get_len_s(a,sizeof(t)) -#define pw_array_get_unchecked(a,idx,t) pw_array_get_unchecked_s(a,idx,sizeof(t),t) -#define pw_array_check_index(a,idx,t) pw_array_check_index_s(a,idx,sizeof(t)) +#define pw_array_get_len(a,t) pw_array_get_len_s(a,sizeof(t)) +#define pw_array_get_unchecked(a,idx,t) pw_array_get_unchecked_s(a,idx,sizeof(t),t) +#define pw_array_check_index(a,idx,t) pw_array_check_index_s(a,idx,sizeof(t)) -#define pw_array_for_each(pos, array) \ - for (pos = (array)->data; \ - (const uint8_t *) pos < ((const uint8_t *) (array)->data + (array)->size); \ +#define pw_array_for_each(pos, array) \ + for (pos = (array)->data; \ + (const uint8_t *) pos < ((const uint8_t *) (array)->data + (array)->size); \ (pos)++) static inline void pw_array_init(struct pw_array *arr, size_t extend) @@ -106,7 +106,7 @@ static inline void *pw_array_add_fixed(struct pw_array *arr, size_t size) return p; } -#define pw_array_add_ptr(a,p) \ +#define pw_array_add_ptr(a,p) \ *((void**) pw_array_add(a, sizeof(void*))) = (p) #ifdef __cplusplus diff --git a/pipewire/client/interfaces.h b/pipewire/client/interfaces.h index 25911fe13..ee642d5a1 100644 --- a/pipewire/client/interfaces.h +++ b/pipewire/client/interfaces.h @@ -32,13 +32,13 @@ extern "C" { #include -#define PW_CORE_METHOD_CLIENT_UPDATE 0 -#define PW_CORE_METHOD_SYNC 1 -#define PW_CORE_METHOD_GET_REGISTRY 2 -#define PW_CORE_METHOD_CREATE_NODE 3 -#define PW_CORE_METHOD_CREATE_CLIENT_NODE 4 -#define PW_CORE_METHOD_UPDATE_TYPES 5 -#define PW_CORE_METHOD_NUM 6 +#define PW_CORE_METHOD_CLIENT_UPDATE 0 +#define PW_CORE_METHOD_SYNC 1 +#define PW_CORE_METHOD_GET_REGISTRY 2 +#define PW_CORE_METHOD_CREATE_NODE 3 +#define PW_CORE_METHOD_CREATE_CLIENT_NODE 4 +#define PW_CORE_METHOD_UPDATE_TYPES 5 +#define PW_CORE_METHOD_NUM 6 struct pw_core_methods { void (*client_update) (void *object, const struct spa_dict * props); diff --git a/spa/include/spa/audio/format.h b/spa/include/spa/audio/format.h index ecb5d2b32..7ca8d08ed 100644 --- a/spa/include/spa/audio/format.h +++ b/spa/include/spa/audio/format.h @@ -27,15 +27,15 @@ extern "C" { #include #include -#define SPA_TYPE_FORMAT__Audio SPA_TYPE_FORMAT_BASE "Audio" -#define SPA_TYPE_FORMAT_AUDIO_BASE SPA_TYPE_FORMAT__Audio ":" +#define SPA_TYPE_FORMAT__Audio SPA_TYPE_FORMAT_BASE "Audio" +#define SPA_TYPE_FORMAT_AUDIO_BASE SPA_TYPE_FORMAT__Audio ":" -#define SPA_TYPE_FORMAT_AUDIO__format SPA_TYPE_FORMAT_AUDIO_BASE "format" -#define SPA_TYPE_FORMAT_AUDIO__flags SPA_TYPE_FORMAT_AUDIO_BASE "flags" -#define SPA_TYPE_FORMAT_AUDIO__layout SPA_TYPE_FORMAT_AUDIO_BASE "layout" -#define SPA_TYPE_FORMAT_AUDIO__rate SPA_TYPE_FORMAT_AUDIO_BASE "rate" -#define SPA_TYPE_FORMAT_AUDIO__channels SPA_TYPE_FORMAT_AUDIO_BASE "channels" -#define SPA_TYPE_FORMAT_AUDIO__channelMask SPA_TYPE_FORMAT_AUDIO_BASE "channel-mask" +#define SPA_TYPE_FORMAT_AUDIO__format SPA_TYPE_FORMAT_AUDIO_BASE "format" +#define SPA_TYPE_FORMAT_AUDIO__flags SPA_TYPE_FORMAT_AUDIO_BASE "flags" +#define SPA_TYPE_FORMAT_AUDIO__layout SPA_TYPE_FORMAT_AUDIO_BASE "layout" +#define SPA_TYPE_FORMAT_AUDIO__rate SPA_TYPE_FORMAT_AUDIO_BASE "rate" +#define SPA_TYPE_FORMAT_AUDIO__channels SPA_TYPE_FORMAT_AUDIO_BASE "channels" +#define SPA_TYPE_FORMAT_AUDIO__channelMask SPA_TYPE_FORMAT_AUDIO_BASE "channel-mask" struct spa_audio_info { uint32_t media_type; diff --git a/spa/include/spa/audio/raw.h b/spa/include/spa/audio/raw.h index b04258e56..a890cb5b3 100644 --- a/spa/include/spa/audio/raw.h +++ b/spa/include/spa/audio/raw.h @@ -26,41 +26,41 @@ extern "C" { #include -#define SPA_TYPE__AudioFormat SPA_TYPE_ENUM_BASE "AudioFormat" -#define SPA_TYPE_AUDIO_FORMAT_BASE SPA_TYPE__AudioFormat ":" +#define SPA_TYPE__AudioFormat SPA_TYPE_ENUM_BASE "AudioFormat" +#define SPA_TYPE_AUDIO_FORMAT_BASE SPA_TYPE__AudioFormat ":" -#define SPA_TYPE_AUDIO_FORMAT__UNKNOWN SPA_TYPE_AUDIO_FORMAT_BASE "UNKNOWN" -#define SPA_TYPE_AUDIO_FORMAT__ENCODED SPA_TYPE_AUDIO_FORMAT_BASE "ENCODED" -#define SPA_TYPE_AUDIO_FORMAT__S8 SPA_TYPE_AUDIO_FORMAT_BASE "S8" -#define SPA_TYPE_AUDIO_FORMAT__U8 SPA_TYPE_AUDIO_FORMAT_BASE "U8" -#define SPA_TYPE_AUDIO_FORMAT__S16LE SPA_TYPE_AUDIO_FORMAT_BASE "S16LE" -#define SPA_TYPE_AUDIO_FORMAT__S16BE SPA_TYPE_AUDIO_FORMAT_BASE "S16BE" -#define SPA_TYPE_AUDIO_FORMAT__U16LE SPA_TYPE_AUDIO_FORMAT_BASE "U16LE" -#define SPA_TYPE_AUDIO_FORMAT__U16BE SPA_TYPE_AUDIO_FORMAT_BASE "U16BE" -#define SPA_TYPE_AUDIO_FORMAT__S24_32LE SPA_TYPE_AUDIO_FORMAT_BASE "S24_32LE" -#define SPA_TYPE_AUDIO_FORMAT__S24_32BE SPA_TYPE_AUDIO_FORMAT_BASE "S24_32BE" -#define SPA_TYPE_AUDIO_FORMAT__U24_32LE SPA_TYPE_AUDIO_FORMAT_BASE "U24_32LE" -#define SPA_TYPE_AUDIO_FORMAT__U24_32BE SPA_TYPE_AUDIO_FORMAT_BASE "U24_32BE" -#define SPA_TYPE_AUDIO_FORMAT__S32LE SPA_TYPE_AUDIO_FORMAT_BASE "S32LE" -#define SPA_TYPE_AUDIO_FORMAT__S32BE SPA_TYPE_AUDIO_FORMAT_BASE "S32BE" -#define SPA_TYPE_AUDIO_FORMAT__U32LE SPA_TYPE_AUDIO_FORMAT_BASE "U32LE" -#define SPA_TYPE_AUDIO_FORMAT__U32BE SPA_TYPE_AUDIO_FORMAT_BASE "U32BE" -#define SPA_TYPE_AUDIO_FORMAT__S24LE SPA_TYPE_AUDIO_FORMAT_BASE "S24LE" -#define SPA_TYPE_AUDIO_FORMAT__S24BE SPA_TYPE_AUDIO_FORMAT_BASE "S24BE" -#define SPA_TYPE_AUDIO_FORMAT__U24LE SPA_TYPE_AUDIO_FORMAT_BASE "U24LE" -#define SPA_TYPE_AUDIO_FORMAT__U24BE SPA_TYPE_AUDIO_FORMAT_BASE "U24BE" -#define SPA_TYPE_AUDIO_FORMAT__S20LE SPA_TYPE_AUDIO_FORMAT_BASE "S20LE" -#define SPA_TYPE_AUDIO_FORMAT__S20BE SPA_TYPE_AUDIO_FORMAT_BASE "S20BE" -#define SPA_TYPE_AUDIO_FORMAT__U20LE SPA_TYPE_AUDIO_FORMAT_BASE "U20LE" -#define SPA_TYPE_AUDIO_FORMAT__U20BE SPA_TYPE_AUDIO_FORMAT_BASE "U20BE" -#define SPA_TYPE_AUDIO_FORMAT__S18LE SPA_TYPE_AUDIO_FORMAT_BASE "S18LE" -#define SPA_TYPE_AUDIO_FORMAT__S18BE SPA_TYPE_AUDIO_FORMAT_BASE "S18BE" -#define SPA_TYPE_AUDIO_FORMAT__U18LE SPA_TYPE_AUDIO_FORMAT_BASE "U18LE" -#define SPA_TYPE_AUDIO_FORMAT__U18BE SPA_TYPE_AUDIO_FORMAT_BASE "U18BE" -#define SPA_TYPE_AUDIO_FORMAT__F32LE SPA_TYPE_AUDIO_FORMAT_BASE "F32LE" -#define SPA_TYPE_AUDIO_FORMAT__F32BE SPA_TYPE_AUDIO_FORMAT_BASE "F32BE" -#define SPA_TYPE_AUDIO_FORMAT__F64LE SPA_TYPE_AUDIO_FORMAT_BASE "F64LE" -#define SPA_TYPE_AUDIO_FORMAT__F64BE SPA_TYPE_AUDIO_FORMAT_BASE "F64BE" +#define SPA_TYPE_AUDIO_FORMAT__UNKNOWN SPA_TYPE_AUDIO_FORMAT_BASE "UNKNOWN" +#define SPA_TYPE_AUDIO_FORMAT__ENCODED SPA_TYPE_AUDIO_FORMAT_BASE "ENCODED" +#define SPA_TYPE_AUDIO_FORMAT__S8 SPA_TYPE_AUDIO_FORMAT_BASE "S8" +#define SPA_TYPE_AUDIO_FORMAT__U8 SPA_TYPE_AUDIO_FORMAT_BASE "U8" +#define SPA_TYPE_AUDIO_FORMAT__S16LE SPA_TYPE_AUDIO_FORMAT_BASE "S16LE" +#define SPA_TYPE_AUDIO_FORMAT__S16BE SPA_TYPE_AUDIO_FORMAT_BASE "S16BE" +#define SPA_TYPE_AUDIO_FORMAT__U16LE SPA_TYPE_AUDIO_FORMAT_BASE "U16LE" +#define SPA_TYPE_AUDIO_FORMAT__U16BE SPA_TYPE_AUDIO_FORMAT_BASE "U16BE" +#define SPA_TYPE_AUDIO_FORMAT__S24_32LE SPA_TYPE_AUDIO_FORMAT_BASE "S24_32LE" +#define SPA_TYPE_AUDIO_FORMAT__S24_32BE SPA_TYPE_AUDIO_FORMAT_BASE "S24_32BE" +#define SPA_TYPE_AUDIO_FORMAT__U24_32LE SPA_TYPE_AUDIO_FORMAT_BASE "U24_32LE" +#define SPA_TYPE_AUDIO_FORMAT__U24_32BE SPA_TYPE_AUDIO_FORMAT_BASE "U24_32BE" +#define SPA_TYPE_AUDIO_FORMAT__S32LE SPA_TYPE_AUDIO_FORMAT_BASE "S32LE" +#define SPA_TYPE_AUDIO_FORMAT__S32BE SPA_TYPE_AUDIO_FORMAT_BASE "S32BE" +#define SPA_TYPE_AUDIO_FORMAT__U32LE SPA_TYPE_AUDIO_FORMAT_BASE "U32LE" +#define SPA_TYPE_AUDIO_FORMAT__U32BE SPA_TYPE_AUDIO_FORMAT_BASE "U32BE" +#define SPA_TYPE_AUDIO_FORMAT__S24LE SPA_TYPE_AUDIO_FORMAT_BASE "S24LE" +#define SPA_TYPE_AUDIO_FORMAT__S24BE SPA_TYPE_AUDIO_FORMAT_BASE "S24BE" +#define SPA_TYPE_AUDIO_FORMAT__U24LE SPA_TYPE_AUDIO_FORMAT_BASE "U24LE" +#define SPA_TYPE_AUDIO_FORMAT__U24BE SPA_TYPE_AUDIO_FORMAT_BASE "U24BE" +#define SPA_TYPE_AUDIO_FORMAT__S20LE SPA_TYPE_AUDIO_FORMAT_BASE "S20LE" +#define SPA_TYPE_AUDIO_FORMAT__S20BE SPA_TYPE_AUDIO_FORMAT_BASE "S20BE" +#define SPA_TYPE_AUDIO_FORMAT__U20LE SPA_TYPE_AUDIO_FORMAT_BASE "U20LE" +#define SPA_TYPE_AUDIO_FORMAT__U20BE SPA_TYPE_AUDIO_FORMAT_BASE "U20BE" +#define SPA_TYPE_AUDIO_FORMAT__S18LE SPA_TYPE_AUDIO_FORMAT_BASE "S18LE" +#define SPA_TYPE_AUDIO_FORMAT__S18BE SPA_TYPE_AUDIO_FORMAT_BASE "S18BE" +#define SPA_TYPE_AUDIO_FORMAT__U18LE SPA_TYPE_AUDIO_FORMAT_BASE "U18LE" +#define SPA_TYPE_AUDIO_FORMAT__U18BE SPA_TYPE_AUDIO_FORMAT_BASE "U18BE" +#define SPA_TYPE_AUDIO_FORMAT__F32LE SPA_TYPE_AUDIO_FORMAT_BASE "F32LE" +#define SPA_TYPE_AUDIO_FORMAT__F32BE SPA_TYPE_AUDIO_FORMAT_BASE "F32BE" +#define SPA_TYPE_AUDIO_FORMAT__F64LE SPA_TYPE_AUDIO_FORMAT_BASE "F64LE" +#define SPA_TYPE_AUDIO_FORMAT__F64BE SPA_TYPE_AUDIO_FORMAT_BASE "F64BE" /** * spa_audio_flags: diff --git a/spa/include/spa/buffer.h b/spa/include/spa/buffer.h index ce63f4dc3..e7ebf8f63 100644 --- a/spa/include/spa/buffer.h +++ b/spa/include/spa/buffer.h @@ -28,16 +28,16 @@ extern "C" { #include #include -#define SPA_TYPE__Buffer SPA_TYPE_POINTER_BASE "Buffer" -#define SPA_TYPE_BUFFER_BASE SPA_TYPE__Buffer ":" +#define SPA_TYPE__Buffer SPA_TYPE_POINTER_BASE "Buffer" +#define SPA_TYPE_BUFFER_BASE SPA_TYPE__Buffer ":" -#define SPA_TYPE__Data SPA_TYPE_ENUM_BASE "DataType" -#define SPA_TYPE_DATA_BASE SPA_TYPE__Data ":" +#define SPA_TYPE__Data SPA_TYPE_ENUM_BASE "DataType" +#define SPA_TYPE_DATA_BASE SPA_TYPE__Data ":" -#define SPA_TYPE_DATA__MemPtr SPA_TYPE_DATA_BASE "MemPtr" -#define SPA_TYPE_DATA__MemFd SPA_TYPE_DATA_BASE "MemFd" -#define SPA_TYPE_DATA__DmaBuf SPA_TYPE_DATA_BASE "DmaBuf" -#define SPA_TYPE_DATA__Id SPA_TYPE_DATA_BASE "Id" +#define SPA_TYPE_DATA__MemPtr SPA_TYPE_DATA_BASE "MemPtr" +#define SPA_TYPE_DATA__MemFd SPA_TYPE_DATA_BASE "MemFd" +#define SPA_TYPE_DATA__DmaBuf SPA_TYPE_DATA_BASE "DmaBuf" +#define SPA_TYPE_DATA__Id SPA_TYPE_DATA_BASE "Id" struct spa_type_data { uint32_t MemPtr; @@ -119,4 +119,4 @@ static inline void *spa_buffer_find_meta(struct spa_buffer *b, uint32_t type) } /* extern "C" */ #endif -#endif /* __SPA_BUFFER_H__ */ +#endif /* __SPA_BUFFER_H__ */ diff --git a/spa/include/spa/clock.h b/spa/include/spa/clock.h index ae91467be..fe12ded72 100644 --- a/spa/include/spa/clock.h +++ b/spa/include/spa/clock.h @@ -24,8 +24,8 @@ extern "C" { #endif -#define SPA_TYPE__Clock SPA_TYPE_INTERFACE_BASE "Clock" -#define SPA_TYPE_CLOCK_BASE SPA_TYPE__Clock ":" +#define SPA_TYPE__Clock SPA_TYPE_INTERFACE_BASE "Clock" +#define SPA_TYPE_CLOCK_BASE SPA_TYPE__Clock ":" /** * spa_clock_state: @@ -109,9 +109,9 @@ struct spa_clock { int64_t *monotonic_time); }; -#define spa_clock_get_props(n,...) (n)->get_props((n),__VA_ARGS__) -#define spa_clock_set_props(n,...) (n)->set_props((n),__VA_ARGS__) -#define spa_clock_get_time(n,...) (n)->get_time((n),__VA_ARGS__) +#define spa_clock_get_props(n,...) (n)->get_props((n),__VA_ARGS__) +#define spa_clock_set_props(n,...) (n)->set_props((n),__VA_ARGS__) +#define spa_clock_get_time(n,...) (n)->get_time((n),__VA_ARGS__) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/command-node.h b/spa/include/spa/command-node.h index d70d37317..d00f0eb4d 100644 --- a/spa/include/spa/command-node.h +++ b/spa/include/spa/command-node.h @@ -27,15 +27,15 @@ extern "C" { #include #include -#define SPA_TYPE_COMMAND__Node SPA_TYPE_COMMAND_BASE "Node" -#define SPA_TYPE_COMMAND_NODE_BASE SPA_TYPE_COMMAND__Node ":" +#define SPA_TYPE_COMMAND__Node SPA_TYPE_COMMAND_BASE "Node" +#define SPA_TYPE_COMMAND_NODE_BASE SPA_TYPE_COMMAND__Node ":" -#define SPA_TYPE_COMMAND_NODE__Pause SPA_TYPE_COMMAND_NODE_BASE "Pause" -#define SPA_TYPE_COMMAND_NODE__Start SPA_TYPE_COMMAND_NODE_BASE "Start" -#define SPA_TYPE_COMMAND_NODE__Flush SPA_TYPE_COMMAND_NODE_BASE "Flush" -#define SPA_TYPE_COMMAND_NODE__Drain SPA_TYPE_COMMAND_NODE_BASE "Drain" -#define SPA_TYPE_COMMAND_NODE__Marker SPA_TYPE_COMMAND_NODE_BASE "Marker" -#define SPA_TYPE_COMMAND_NODE__ClockUpdate SPA_TYPE_COMMAND_NODE_BASE "ClockUpdate" +#define SPA_TYPE_COMMAND_NODE__Pause SPA_TYPE_COMMAND_NODE_BASE "Pause" +#define SPA_TYPE_COMMAND_NODE__Start SPA_TYPE_COMMAND_NODE_BASE "Start" +#define SPA_TYPE_COMMAND_NODE__Flush SPA_TYPE_COMMAND_NODE_BASE "Flush" +#define SPA_TYPE_COMMAND_NODE__Drain SPA_TYPE_COMMAND_NODE_BASE "Drain" +#define SPA_TYPE_COMMAND_NODE__Marker SPA_TYPE_COMMAND_NODE_BASE "Marker" +#define SPA_TYPE_COMMAND_NODE__ClockUpdate SPA_TYPE_COMMAND_NODE_BASE "ClockUpdate" struct spa_type_command_node { uint32_t Pause; @@ -73,10 +73,10 @@ spa_type_command_node_map(struct spa_type_map *map, struct spa_type_command_node */ struct spa_command_node_clock_update_body { struct spa_pod_object_body body; -#define SPA_COMMAND_NODE_CLOCK_UPDATE_TIME (1 << 0) -#define SPA_COMMAND_NODE_CLOCK_UPDATE_SCALE (1 << 1) -#define SPA_COMMAND_NODE_CLOCK_UPDATE_STATE (1 << 2) -#define SPA_COMMAND_NODE_CLOCK_UPDATE_LATENCY (1 << 3) +#define SPA_COMMAND_NODE_CLOCK_UPDATE_TIME (1 << 0) +#define SPA_COMMAND_NODE_CLOCK_UPDATE_SCALE (1 << 1) +#define SPA_COMMAND_NODE_CLOCK_UPDATE_STATE (1 << 2) +#define SPA_COMMAND_NODE_CLOCK_UPDATE_LATENCY (1 << 3) struct spa_pod_int change_mask SPA_ALIGNED(8); struct spa_pod_int rate SPA_ALIGNED(8); struct spa_pod_long ticks SPA_ALIGNED(8); @@ -84,7 +84,7 @@ struct spa_command_node_clock_update_body { struct spa_pod_long offset SPA_ALIGNED(8); struct spa_pod_int scale SPA_ALIGNED(8); struct spa_pod_int state SPA_ALIGNED(8); -#define SPA_COMMAND_NODE_CLOCK_UPDATE_FLAG_LIVE (1 << 0) +#define SPA_COMMAND_NODE_CLOCK_UPDATE_FLAG_LIVE (1 << 0) struct spa_pod_int flags SPA_ALIGNED(8); struct spa_pod_long latency SPA_ALIGNED(8); }; @@ -95,17 +95,17 @@ struct spa_command_node_clock_update { }; #define SPA_COMMAND_NODE_CLOCK_UPDATE_INIT(type,change_mask,rate,ticks,monotonic_time,offset,scale,state,flags,latency) \ - SPA_COMMAND_INIT_COMPLEX(struct spa_command_node_clock_update, \ - sizeof(struct spa_command_node_clock_update_body), type, \ - SPA_POD_INT_INIT(change_mask), \ - SPA_POD_INT_INIT(rate), \ - SPA_POD_LONG_INIT(ticks), \ - SPA_POD_LONG_INIT(monotonic_time), \ - SPA_POD_LONG_INIT(offset), \ - SPA_POD_INT_INIT(scale), \ - SPA_POD_INT_INIT(state), \ - SPA_POD_INT_INIT(flags), \ - SPA_POD_LONG_INIT(latency)) + SPA_COMMAND_INIT_COMPLEX(struct spa_command_node_clock_update, \ + sizeof(struct spa_command_node_clock_update_body), type, \ + SPA_POD_INT_INIT(change_mask), \ + SPA_POD_INT_INIT(rate), \ + SPA_POD_LONG_INIT(ticks), \ + SPA_POD_LONG_INIT(monotonic_time), \ + SPA_POD_LONG_INIT(offset), \ + SPA_POD_INT_INIT(scale), \ + SPA_POD_INT_INIT(state), \ + SPA_POD_INT_INIT(flags), \ + SPA_POD_LONG_INIT(latency)) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/command.h b/spa/include/spa/command.h index ede48eec7..5782d5f5d 100644 --- a/spa/include/spa/command.h +++ b/spa/include/spa/command.h @@ -27,8 +27,8 @@ extern "C" { #include #include -#define SPA_TYPE__Command SPA_TYPE_POD_OBJECT_BASE "Command" -#define SPA_TYPE_COMMAND_BASE SPA_TYPE__Command ":" +#define SPA_TYPE__Command SPA_TYPE_POD_OBJECT_BASE "Command" +#define SPA_TYPE_COMMAND_BASE SPA_TYPE__Command ":" struct spa_command_body { struct spa_pod_object_body body; diff --git a/spa/include/spa/defs.h b/spa/include/spa/defs.h index 1f1192137..be6e8f8ec 100644 --- a/spa/include/spa/defs.h +++ b/spa/include/spa/defs.h @@ -73,15 +73,15 @@ enum { SPA_RESULT_INCOMPATIBLE_PROPS = -36, }; -#define SPA_ASYNC_MASK (3 << 30) -#define SPA_ASYNC_SEQ_MASK (SPA_RESULT_ASYNC - 1) +#define SPA_ASYNC_MASK (3 << 30) +#define SPA_ASYNC_SEQ_MASK (SPA_RESULT_ASYNC - 1) -#define SPA_RESULT_IS_OK(res) ((res) >= 0) -#define SPA_RESULT_IS_ERROR(res) ((res) < 0) -#define SPA_RESULT_IS_ASYNC(res) (((res) & SPA_ASYNC_MASK) == SPA_RESULT_ASYNC) +#define SPA_RESULT_IS_OK(res) ((res) >= 0) +#define SPA_RESULT_IS_ERROR(res) ((res) < 0) +#define SPA_RESULT_IS_ASYNC(res) (((res) & SPA_ASYNC_MASK) == SPA_RESULT_ASYNC) -#define SPA_RESULT_ASYNC_SEQ(res) ((res) & SPA_ASYNC_SEQ_MASK) -#define SPA_RESULT_RETURN_ASYNC(seq) (SPA_RESULT_ASYNC | ((seq) & SPA_ASYNC_SEQ_MASK)) +#define SPA_RESULT_ASYNC_SEQ(res) ((res) & SPA_ASYNC_SEQ_MASK) +#define SPA_RESULT_RETURN_ASYNC(seq) (SPA_RESULT_ASYNC | ((seq) & SPA_ASYNC_SEQ_MASK)) enum spa_direction { SPA_DIRECTION_INPUT = 0, diff --git a/spa/include/spa/dict.h b/spa/include/spa/dict.h index 53dcabb6a..ac36d5d8e 100644 --- a/spa/include/spa/dict.h +++ b/spa/include/spa/dict.h @@ -24,8 +24,8 @@ extern "C" { #endif -#define SPA_TYPE__Dict SPA_TYPE_POINTER_BASE "Dict" -#define SPA_TYPE_DICT_BASE SPA_TYPE__Dict ":" +#define SPA_TYPE__Dict SPA_TYPE_POINTER_BASE "Dict" +#define SPA_TYPE_DICT_BASE SPA_TYPE__Dict ":" #include diff --git a/spa/include/spa/event-node.h b/spa/include/spa/event-node.h index 1f4541dfa..505dfbd06 100644 --- a/spa/include/spa/event-node.h +++ b/spa/include/spa/event-node.h @@ -29,14 +29,14 @@ extern "C" { #include #include -#define SPA_TYPE_EVENT__Node SPA_TYPE_EVENT_BASE "Node" -#define SPA_TYPE_EVENT_NODE_BASE SPA_TYPE_EVENT__Node ":" +#define SPA_TYPE_EVENT__Node SPA_TYPE_EVENT_BASE "Node" +#define SPA_TYPE_EVENT_NODE_BASE SPA_TYPE_EVENT__Node ":" -#define SPA_TYPE_EVENT_NODE__AsyncComplete SPA_TYPE_EVENT_NODE_BASE "AsyncComplete" -#define SPA_TYPE_EVENT_NODE__Error SPA_TYPE_EVENT_NODE_BASE "Error" -#define SPA_TYPE_EVENT_NODE__Buffering SPA_TYPE_EVENT_NODE_BASE "Buffering" -#define SPA_TYPE_EVENT_NODE__RequestRefresh SPA_TYPE_EVENT_NODE_BASE "RequestRefresh" -#define SPA_TYPE_EVENT_NODE__RequestClockUpdate SPA_TYPE_EVENT_NODE_BASE "RequestClockUpdate" +#define SPA_TYPE_EVENT_NODE__AsyncComplete SPA_TYPE_EVENT_NODE_BASE "AsyncComplete" +#define SPA_TYPE_EVENT_NODE__Error SPA_TYPE_EVENT_NODE_BASE "Error" +#define SPA_TYPE_EVENT_NODE__Buffering SPA_TYPE_EVENT_NODE_BASE "Buffering" +#define SPA_TYPE_EVENT_NODE__RequestRefresh SPA_TYPE_EVENT_NODE_BASE "RequestRefresh" +#define SPA_TYPE_EVENT_NODE__RequestClockUpdate SPA_TYPE_EVENT_NODE_BASE "RequestClockUpdate" struct spa_type_event_node { uint32_t AsyncComplete; @@ -77,9 +77,9 @@ struct spa_event_node_async_complete { struct spa_event_node_request_clock_update_body { struct spa_pod_object_body body; -#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_TIME (1 << 0) -#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_SCALE (1 << 1) -#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_STATE (1 << 2) +#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_TIME (1 << 0) +#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_SCALE (1 << 1) +#define SPA_EVENT_NODE_REQUEST_CLOCK_UPDATE_STATE (1 << 2) struct spa_pod_int update_mask SPA_ALIGNED(8); struct spa_pod_long timestamp SPA_ALIGNED(8); struct spa_pod_long offset SPA_ALIGNED(8); diff --git a/spa/include/spa/event.h b/spa/include/spa/event.h index 7a6e4dcbd..d804061c8 100644 --- a/spa/include/spa/event.h +++ b/spa/include/spa/event.h @@ -27,8 +27,8 @@ extern "C" { #include #include -#define SPA_TYPE__Event SPA_TYPE_POD_OBJECT_BASE "Event" -#define SPA_TYPE_EVENT_BASE SPA_TYPE__Event ":" +#define SPA_TYPE__Event SPA_TYPE_POD_OBJECT_BASE "Event" +#define SPA_TYPE_EVENT_BASE SPA_TYPE__Event ":" struct spa_event_body { struct spa_pod_object_body body; diff --git a/spa/include/spa/format-utils.h b/spa/include/spa/format-utils.h index 2ef95d834..a5c76ede8 100644 --- a/spa/include/spa/format-utils.h +++ b/spa/include/spa/format-utils.h @@ -150,8 +150,8 @@ spa_type_media_subtype_audio_map(struct spa_type_map *map, #define SPA_FORMAT_FOREACH(format, iter) \ SPA_FORMAT_BODY_FOREACH(&format->body, SPA_POD_BODY_SIZE(format), iter) -#define SPA_FORMAT_MEDIA_TYPE(f) SPA_POD_VALUE(struct spa_pod_id, &f->body.media_type) -#define SPA_FORMAT_MEDIA_SUBTYPE(f) SPA_POD_VALUE(struct spa_pod_id, &f->body.media_subtype) +#define SPA_FORMAT_MEDIA_TYPE(f) SPA_POD_VALUE(struct spa_pod_id, &f->body.media_type) +#define SPA_FORMAT_MEDIA_SUBTYPE(f) SPA_POD_VALUE(struct spa_pod_id, &f->body.media_subtype) static inline struct spa_pod_prop *spa_format_find_prop(const struct spa_format *format, uint32_t key) diff --git a/spa/include/spa/format.h b/spa/include/spa/format.h index 64041a2ae..cf1780130 100644 --- a/spa/include/spa/format.h +++ b/spa/include/spa/format.h @@ -25,56 +25,56 @@ extern "C" { #endif struct spa_format; -#define SPA_TYPE__Format SPA_TYPE_POD_OBJECT_BASE "Format" -#define SPA_TYPE_FORMAT_BASE SPA_TYPE__Format ":" +#define SPA_TYPE__Format SPA_TYPE_POD_OBJECT_BASE "Format" +#define SPA_TYPE_FORMAT_BASE SPA_TYPE__Format ":" #include #include -#define SPA_TYPE__MediaType SPA_TYPE_ENUM_BASE "MediaType" -#define SPA_TYPE_MEDIA_TYPE_BASE SPA_TYPE__MediaType ":" +#define SPA_TYPE__MediaType SPA_TYPE_ENUM_BASE "MediaType" +#define SPA_TYPE_MEDIA_TYPE_BASE SPA_TYPE__MediaType ":" -#define SPA_TYPE_MEDIA_TYPE__audio SPA_TYPE_MEDIA_TYPE_BASE "audio" -#define SPA_TYPE_MEDIA_TYPE__video SPA_TYPE_MEDIA_TYPE_BASE "video" -#define SPA_TYPE_MEDIA_TYPE__image SPA_TYPE_MEDIA_TYPE_BASE "image" -#define SPA_TYPE_MEDIA_TYPE__binary SPA_TYPE_MEDIA_TYPE_BASE "binary" -#define SPA_TYPE_MEDIA_TYPE__stream SPA_TYPE_MEDIA_TYPE_BASE "stream" +#define SPA_TYPE_MEDIA_TYPE__audio SPA_TYPE_MEDIA_TYPE_BASE "audio" +#define SPA_TYPE_MEDIA_TYPE__video SPA_TYPE_MEDIA_TYPE_BASE "video" +#define SPA_TYPE_MEDIA_TYPE__image SPA_TYPE_MEDIA_TYPE_BASE "image" +#define SPA_TYPE_MEDIA_TYPE__binary SPA_TYPE_MEDIA_TYPE_BASE "binary" +#define SPA_TYPE_MEDIA_TYPE__stream SPA_TYPE_MEDIA_TYPE_BASE "stream" -#define SPA_TYPE__MediaSubtype SPA_TYPE_ENUM_BASE "MediaSubtype" -#define SPA_TYPE_MEDIA_SUBTYPE_BASE SPA_TYPE__MediaSubtype ":" +#define SPA_TYPE__MediaSubtype SPA_TYPE_ENUM_BASE "MediaSubtype" +#define SPA_TYPE_MEDIA_SUBTYPE_BASE SPA_TYPE__MediaSubtype ":" /* generic subtypes */ -#define SPA_TYPE_MEDIA_SUBTYPE__raw SPA_TYPE_MEDIA_SUBTYPE_BASE "raw" +#define SPA_TYPE_MEDIA_SUBTYPE__raw SPA_TYPE_MEDIA_SUBTYPE_BASE "raw" /* video subtypes */ -#define SPA_TYPE_MEDIA_SUBTYPE__h264 SPA_TYPE_MEDIA_SUBTYPE_BASE "h264" -#define SPA_TYPE_MEDIA_SUBTYPE__mjpg SPA_TYPE_MEDIA_SUBTYPE_BASE "mjpg" -#define SPA_TYPE_MEDIA_SUBTYPE__dv SPA_TYPE_MEDIA_SUBTYPE_BASE "dv" -#define SPA_TYPE_MEDIA_SUBTYPE__mpegts SPA_TYPE_MEDIA_SUBTYPE_BASE "mpegts" -#define SPA_TYPE_MEDIA_SUBTYPE__h263 SPA_TYPE_MEDIA_SUBTYPE_BASE "h263" -#define SPA_TYPE_MEDIA_SUBTYPE__mpeg1 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg1" -#define SPA_TYPE_MEDIA_SUBTYPE__mpeg2 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg2" -#define SPA_TYPE_MEDIA_SUBTYPE__mpeg4 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg4" -#define SPA_TYPE_MEDIA_SUBTYPE__xvid SPA_TYPE_MEDIA_SUBTYPE_BASE "xvid" -#define SPA_TYPE_MEDIA_SUBTYPE__vc1 SPA_TYPE_MEDIA_SUBTYPE_BASE "vc1" -#define SPA_TYPE_MEDIA_SUBTYPE__vp8 SPA_TYPE_MEDIA_SUBTYPE_BASE "vp8" -#define SPA_TYPE_MEDIA_SUBTYPE__vp9 SPA_TYPE_MEDIA_SUBTYPE_BASE "vp9" -#define SPA_TYPE_MEDIA_SUBTYPE__jpeg SPA_TYPE_MEDIA_SUBTYPE_BASE "jpeg" -#define SPA_TYPE_MEDIA_SUBTYPE__bayer SPA_TYPE_MEDIA_SUBTYPE_BASE "bayer" +#define SPA_TYPE_MEDIA_SUBTYPE__h264 SPA_TYPE_MEDIA_SUBTYPE_BASE "h264" +#define SPA_TYPE_MEDIA_SUBTYPE__mjpg SPA_TYPE_MEDIA_SUBTYPE_BASE "mjpg" +#define SPA_TYPE_MEDIA_SUBTYPE__dv SPA_TYPE_MEDIA_SUBTYPE_BASE "dv" +#define SPA_TYPE_MEDIA_SUBTYPE__mpegts SPA_TYPE_MEDIA_SUBTYPE_BASE "mpegts" +#define SPA_TYPE_MEDIA_SUBTYPE__h263 SPA_TYPE_MEDIA_SUBTYPE_BASE "h263" +#define SPA_TYPE_MEDIA_SUBTYPE__mpeg1 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg1" +#define SPA_TYPE_MEDIA_SUBTYPE__mpeg2 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg2" +#define SPA_TYPE_MEDIA_SUBTYPE__mpeg4 SPA_TYPE_MEDIA_SUBTYPE_BASE "mpeg4" +#define SPA_TYPE_MEDIA_SUBTYPE__xvid SPA_TYPE_MEDIA_SUBTYPE_BASE "xvid" +#define SPA_TYPE_MEDIA_SUBTYPE__vc1 SPA_TYPE_MEDIA_SUBTYPE_BASE "vc1" +#define SPA_TYPE_MEDIA_SUBTYPE__vp8 SPA_TYPE_MEDIA_SUBTYPE_BASE "vp8" +#define SPA_TYPE_MEDIA_SUBTYPE__vp9 SPA_TYPE_MEDIA_SUBTYPE_BASE "vp9" +#define SPA_TYPE_MEDIA_SUBTYPE__jpeg SPA_TYPE_MEDIA_SUBTYPE_BASE "jpeg" +#define SPA_TYPE_MEDIA_SUBTYPE__bayer SPA_TYPE_MEDIA_SUBTYPE_BASE "bayer" /* audio subtypes */ -#define SPA_TYPE_MEDIA_SUBTYPE__mp3 SPA_TYPE_MEDIA_SUBTYPE_BASE "mp3" -#define SPA_TYPE_MEDIA_SUBTYPE__aac SPA_TYPE_MEDIA_SUBTYPE_BASE "aac" -#define SPA_TYPE_MEDIA_SUBTYPE__vorbis SPA_TYPE_MEDIA_SUBTYPE_BASE "vorbis" -#define SPA_TYPE_MEDIA_SUBTYPE__wma SPA_TYPE_MEDIA_SUBTYPE_BASE "wma" -#define SPA_TYPE_MEDIA_SUBTYPE__ra SPA_TYPE_MEDIA_SUBTYPE_BASE "ra" -#define SPA_TYPE_MEDIA_SUBTYPE__sbc SPA_TYPE_MEDIA_SUBTYPE_BASE "sbc" -#define SPA_TYPE_MEDIA_SUBTYPE__adpcm SPA_TYPE_MEDIA_SUBTYPE_BASE "adpcm" -#define SPA_TYPE_MEDIA_SUBTYPE__g723 SPA_TYPE_MEDIA_SUBTYPE_BASE "g723" -#define SPA_TYPE_MEDIA_SUBTYPE__g726 SPA_TYPE_MEDIA_SUBTYPE_BASE "g726" -#define SPA_TYPE_MEDIA_SUBTYPE__g729 SPA_TYPE_MEDIA_SUBTYPE_BASE "g729" -#define SPA_TYPE_MEDIA_SUBTYPE__amr SPA_TYPE_MEDIA_SUBTYPE_BASE "amr" -#define SPA_TYPE_MEDIA_SUBTYPE__gsm SPA_TYPE_MEDIA_SUBTYPE_BASE "gsm" +#define SPA_TYPE_MEDIA_SUBTYPE__mp3 SPA_TYPE_MEDIA_SUBTYPE_BASE "mp3" +#define SPA_TYPE_MEDIA_SUBTYPE__aac SPA_TYPE_MEDIA_SUBTYPE_BASE "aac" +#define SPA_TYPE_MEDIA_SUBTYPE__vorbis SPA_TYPE_MEDIA_SUBTYPE_BASE "vorbis" +#define SPA_TYPE_MEDIA_SUBTYPE__wma SPA_TYPE_MEDIA_SUBTYPE_BASE "wma" +#define SPA_TYPE_MEDIA_SUBTYPE__ra SPA_TYPE_MEDIA_SUBTYPE_BASE "ra" +#define SPA_TYPE_MEDIA_SUBTYPE__sbc SPA_TYPE_MEDIA_SUBTYPE_BASE "sbc" +#define SPA_TYPE_MEDIA_SUBTYPE__adpcm SPA_TYPE_MEDIA_SUBTYPE_BASE "adpcm" +#define SPA_TYPE_MEDIA_SUBTYPE__g723 SPA_TYPE_MEDIA_SUBTYPE_BASE "g723" +#define SPA_TYPE_MEDIA_SUBTYPE__g726 SPA_TYPE_MEDIA_SUBTYPE_BASE "g726" +#define SPA_TYPE_MEDIA_SUBTYPE__g729 SPA_TYPE_MEDIA_SUBTYPE_BASE "g729" +#define SPA_TYPE_MEDIA_SUBTYPE__amr SPA_TYPE_MEDIA_SUBTYPE_BASE "amr" +#define SPA_TYPE_MEDIA_SUBTYPE__gsm SPA_TYPE_MEDIA_SUBTYPE_BASE "gsm" struct spa_format_body { struct spa_pod_object_body obj_body; diff --git a/spa/include/spa/log.h b/spa/include/spa/log.h index f637480ba..c141ace5c 100644 --- a/spa/include/spa/log.h +++ b/spa/include/spa/log.h @@ -24,8 +24,8 @@ extern "C" { #endif -#define SPA_TYPE__Log SPA_TYPE_INTERFACE_BASE "Log" -#define SPA_TYPE_LOG_BASE SPA_TYPE__Log ":" +#define SPA_TYPE__Log SPA_TYPE_INTERFACE_BASE "Log" +#define SPA_TYPE_LOG_BASE SPA_TYPE__Log ":" #include diff --git a/spa/include/spa/loop.h b/spa/include/spa/loop.h index bc3869c80..c6c880352 100644 --- a/spa/include/spa/loop.h +++ b/spa/include/spa/loop.h @@ -25,16 +25,16 @@ extern "C" { #endif struct spa_loop; -#define SPA_TYPE__Loop SPA_TYPE_INTERFACE_BASE "Loop" -#define SPA_TYPE_LOOP_BASE SPA_TYPE__Loop ":" +#define SPA_TYPE__Loop SPA_TYPE_INTERFACE_BASE "Loop" +#define SPA_TYPE_LOOP_BASE SPA_TYPE__Loop ":" struct spa_loop_control; -#define SPA_TYPE__LoopControl SPA_TYPE_INTERFACE_BASE "LoopControl" +#define SPA_TYPE__LoopControl SPA_TYPE_INTERFACE_BASE "LoopControl" struct spa_loop_utils; -#define SPA_TYPE__LoopUtils SPA_TYPE_INTERFACE_BASE "LoopUtils" +#define SPA_TYPE__LoopUtils SPA_TYPE_INTERFACE_BASE "LoopUtils" -#define SPA_TYPE_LOOP__MainLoop SPA_TYPE_LOOP_BASE "MainLoop" -#define SPA_TYPE_LOOP__DataLoop SPA_TYPE_LOOP_BASE "DataLoop" +#define SPA_TYPE_LOOP__MainLoop SPA_TYPE_LOOP_BASE "MainLoop" +#define SPA_TYPE_LOOP__DataLoop SPA_TYPE_LOOP_BASE "DataLoop" #include @@ -89,10 +89,10 @@ struct spa_loop { void *user_data); }; -#define spa_loop_add_source(l,...) (l)->add_source((l),__VA_ARGS__) -#define spa_loop_update_source(l,...) (l)->update_source(__VA_ARGS__) -#define spa_loop_remove_source(l,...) (l)->remove_source(__VA_ARGS__) -#define spa_loop_invoke(l,...) (l)->invoke((l),__VA_ARGS__) +#define spa_loop_add_source(l,...) (l)->add_source((l),__VA_ARGS__) +#define spa_loop_update_source(l,...) (l)->update_source(__VA_ARGS__) +#define spa_loop_remove_source(l,...) (l)->remove_source(__VA_ARGS__) +#define spa_loop_invoke(l,...) (l)->invoke((l),__VA_ARGS__) typedef void (*spa_loop_hook_t) (struct spa_loop_control * ctrl, void *data); @@ -119,11 +119,11 @@ struct spa_loop_control { int (*iterate) (struct spa_loop_control *ctrl, int timeout); }; -#define spa_loop_control_get_fd(l) (l)->get_fd(l) -#define spa_loop_control_set_hooks(l,...) (l)->set_hooks((l),__VA_ARGS__) -#define spa_loop_control_enter(l) (l)->enter(l) -#define spa_loop_control_iterate(l,...) (l)->iterate((l),__VA_ARGS__) -#define spa_loop_control_leave(l) (l)->leave(l) +#define spa_loop_control_get_fd(l) (l)->get_fd(l) +#define spa_loop_control_set_hooks(l,...) (l)->set_hooks((l),__VA_ARGS__) +#define spa_loop_control_enter(l) (l)->enter(l) +#define spa_loop_control_iterate(l,...) (l)->iterate((l),__VA_ARGS__) +#define spa_loop_control_leave(l) (l)->leave(l) typedef void (*spa_source_io_func_t) (struct spa_loop_utils * utils, @@ -179,16 +179,16 @@ struct spa_loop_utils { void (*destroy_source) (struct spa_source * source); }; -#define spa_loop_utils_add_io(l,...) (l)->add_io(l,__VA_ARGS__) -#define spa_loop_utils_update_io(l,...) (l)->update_io(__VA_ARGS__) -#define spa_loop_utils_add_idle(l,...) (l)->add_idle(l,__VA_ARGS__) -#define spa_loop_utils_enable_idle(l,...) (l)->enable_idle(__VA_ARGS__) -#define spa_loop_utils_add_event(l,...) (l)->add_event(l,__VA_ARGS__) -#define spa_loop_utils_signal_event(l,...) (l)->signal_event(__VA_ARGS__) -#define spa_loop_utils_add_timer(l,...) (l)->add_timer(l,__VA_ARGS__) -#define spa_loop_utils_update_timer(l,...) (l)->update_timer(__VA_ARGS__) -#define spa_loop_utils_add_signal(l,...) (l)->add_signal(l,__VA_ARGS__) -#define spa_loop_utils_destroy_source(l,...) (l)->destroy_source(__VA_ARGS__) +#define spa_loop_utils_add_io(l,...) (l)->add_io(l,__VA_ARGS__) +#define spa_loop_utils_update_io(l,...) (l)->update_io(__VA_ARGS__) +#define spa_loop_utils_add_idle(l,...) (l)->add_idle(l,__VA_ARGS__) +#define spa_loop_utils_enable_idle(l,...) (l)->enable_idle(__VA_ARGS__) +#define spa_loop_utils_add_event(l,...) (l)->add_event(l,__VA_ARGS__) +#define spa_loop_utils_signal_event(l,...) (l)->signal_event(__VA_ARGS__) +#define spa_loop_utils_add_timer(l,...) (l)->add_timer(l,__VA_ARGS__) +#define spa_loop_utils_update_timer(l,...) (l)->update_timer(__VA_ARGS__) +#define spa_loop_utils_add_signal(l,...) (l)->add_signal(l,__VA_ARGS__) +#define spa_loop_utils_destroy_source(l,...) (l)->destroy_source(__VA_ARGS__) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/meta.h b/spa/include/spa/meta.h index d3c41088e..6b30fc69c 100644 --- a/spa/include/spa/meta.h +++ b/spa/include/spa/meta.h @@ -28,14 +28,14 @@ extern "C" { #include #include -#define SPA_TYPE__Meta SPA_TYPE_POINTER_BASE "Meta" -#define SPA_TYPE_META_BASE SPA_TYPE__Meta ":" +#define SPA_TYPE__Meta SPA_TYPE_POINTER_BASE "Meta" +#define SPA_TYPE_META_BASE SPA_TYPE__Meta ":" -#define SPA_TYPE_META__Header SPA_TYPE_META_BASE "Header" -#define SPA_TYPE_META__Pointer SPA_TYPE_META_BASE "Pointer" -#define SPA_TYPE_META__VideoCrop SPA_TYPE_META_BASE "VideoCrop" -#define SPA_TYPE_META__Ringbuffer SPA_TYPE_META_BASE "Ringbuffer" -#define SPA_TYPE_META__Shared SPA_TYPE_META_BASE "Shared" +#define SPA_TYPE_META__Header SPA_TYPE_META_BASE "Header" +#define SPA_TYPE_META__Pointer SPA_TYPE_META_BASE "Pointer" +#define SPA_TYPE_META__VideoCrop SPA_TYPE_META_BASE "VideoCrop" +#define SPA_TYPE_META__Ringbuffer SPA_TYPE_META_BASE "Ringbuffer" +#define SPA_TYPE_META__Shared SPA_TYPE_META_BASE "Shared" struct spa_type_meta { uint32_t Header; @@ -65,12 +65,12 @@ static inline void spa_type_meta_map(struct spa_type_map *map, struct spa_type_m * @dts_offset: offset relative to @pts to start decoding this buffer. */ struct spa_meta_header { -#define SPA_META_HEADER_FLAG_DISCONT (1 << 0) /* data is not continous with previous buffer */ -#define SPA_META_HEADER_FLAG_CORRUPTED (1 << 1) /* data might be corrupted */ -#define SPA_META_HEADER_FLAG_MARKER (1 << 2) /* media specific marker */ -#define SPA_META_HEADER_FLAG_HEADER (1 << 3) /* data contains a codec specific header */ -#define SPA_META_HEADER_FLAG_GAP (1 << 4) /* data contains media neutral data */ -#define SPA_META_HEADER_FLAG_DELTA_UNIT (1 << 5) /* cannot be decoded independently */ +#define SPA_META_HEADER_FLAG_DISCONT (1 << 0) /* data is not continous with previous buffer */ +#define SPA_META_HEADER_FLAG_CORRUPTED (1 << 1) /* data might be corrupted */ +#define SPA_META_HEADER_FLAG_MARKER (1 << 2) /* media specific marker */ +#define SPA_META_HEADER_FLAG_HEADER (1 << 3) /* data contains a codec specific header */ +#define SPA_META_HEADER_FLAG_GAP (1 << 4) /* data contains media neutral data */ +#define SPA_META_HEADER_FLAG_DELTA_UNIT (1 << 5) /* cannot be decoded independently */ uint32_t flags; uint32_t seq; int64_t pts; diff --git a/spa/include/spa/monitor.h b/spa/include/spa/monitor.h index 98f4ce2a9..45424f1e8 100644 --- a/spa/include/spa/monitor.h +++ b/spa/include/spa/monitor.h @@ -25,33 +25,33 @@ extern "C" { #endif struct spa_monitor; -#define SPA_TYPE__Monitor SPA_TYPE_INTERFACE_BASE "Monitor" -#define SPA_TYPE_MONITOR_BASE SPA_TYPE__Monitor ":" +#define SPA_TYPE__Monitor SPA_TYPE_INTERFACE_BASE "Monitor" +#define SPA_TYPE_MONITOR_BASE SPA_TYPE__Monitor ":" #include #include #include -#define SPA_TYPE_EVENT__Monitor SPA_TYPE_EVENT_BASE "Monitor" -#define SPA_TYPE_EVENT_MONITOR_BASE SPA_TYPE_EVENT__Monitor ":" +#define SPA_TYPE_EVENT__Monitor SPA_TYPE_EVENT_BASE "Monitor" +#define SPA_TYPE_EVENT_MONITOR_BASE SPA_TYPE_EVENT__Monitor ":" -#define SPA_TYPE_EVENT_MONITOR__Added SPA_TYPE_EVENT_MONITOR_BASE "Added" -#define SPA_TYPE_EVENT_MONITOR__Removed SPA_TYPE_EVENT_MONITOR_BASE "Removed" -#define SPA_TYPE_EVENT_MONITOR__Changed SPA_TYPE_EVENT_MONITOR_BASE "Changed" +#define SPA_TYPE_EVENT_MONITOR__Added SPA_TYPE_EVENT_MONITOR_BASE "Added" +#define SPA_TYPE_EVENT_MONITOR__Removed SPA_TYPE_EVENT_MONITOR_BASE "Removed" +#define SPA_TYPE_EVENT_MONITOR__Changed SPA_TYPE_EVENT_MONITOR_BASE "Changed" struct spa_monitor_item { struct spa_pod_object object; }; -#define SPA_TYPE__MonitorItem SPA_TYPE_POD_OBJECT_BASE "MonitorItem" -#define SPA_TYPE_MONITOR_ITEM_BASE SPA_TYPE__MonitorItem ":" +#define SPA_TYPE__MonitorItem SPA_TYPE_POD_OBJECT_BASE "MonitorItem" +#define SPA_TYPE_MONITOR_ITEM_BASE SPA_TYPE__MonitorItem ":" -#define SPA_TYPE_MONITOR_ITEM__id SPA_TYPE_MONITOR_ITEM_BASE "id" -#define SPA_TYPE_MONITOR_ITEM__flags SPA_TYPE_MONITOR_ITEM_BASE "flags" -#define SPA_TYPE_MONITOR_ITEM__state SPA_TYPE_MONITOR_ITEM_BASE "state" -#define SPA_TYPE_MONITOR_ITEM__name SPA_TYPE_MONITOR_ITEM_BASE "name" -#define SPA_TYPE_MONITOR_ITEM__class SPA_TYPE_MONITOR_ITEM_BASE "class" -#define SPA_TYPE_MONITOR_ITEM__info SPA_TYPE_MONITOR_ITEM_BASE "info" -#define SPA_TYPE_MONITOR_ITEM__factory SPA_TYPE_MONITOR_ITEM_BASE "factory" +#define SPA_TYPE_MONITOR_ITEM__id SPA_TYPE_MONITOR_ITEM_BASE "id" +#define SPA_TYPE_MONITOR_ITEM__flags SPA_TYPE_MONITOR_ITEM_BASE "flags" +#define SPA_TYPE_MONITOR_ITEM__state SPA_TYPE_MONITOR_ITEM_BASE "state" +#define SPA_TYPE_MONITOR_ITEM__name SPA_TYPE_MONITOR_ITEM_BASE "name" +#define SPA_TYPE_MONITOR_ITEM__class SPA_TYPE_MONITOR_ITEM_BASE "class" +#define SPA_TYPE_MONITOR_ITEM__info SPA_TYPE_MONITOR_ITEM_BASE "info" +#define SPA_TYPE_MONITOR_ITEM__factory SPA_TYPE_MONITOR_ITEM_BASE "factory" struct spa_type_monitor { uint32_t Monitor; @@ -148,8 +148,8 @@ struct spa_monitor { }; -#define spa_monitor_set_callbacks(m,...) (m)->set_callbacks((m),__VA_ARGS__) -#define spa_monitor_enum_items(m,...) (m)->enum_items((m),__VA_ARGS__) +#define spa_monitor_set_callbacks(m,...) (m)->set_callbacks((m),__VA_ARGS__) +#define spa_monitor_enum_items(m,...) (m)->enum_items((m),__VA_ARGS__) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/node.h b/spa/include/spa/node.h index 067effc84..a00a3a57e 100644 --- a/spa/include/spa/node.h +++ b/spa/include/spa/node.h @@ -24,8 +24,8 @@ extern "C" { #endif -#define SPA_TYPE__Node SPA_TYPE_INTERFACE_BASE "Node" -#define SPA_TYPE_NODE_BASE SPA_TYPE__Node ":" +#define SPA_TYPE__Node SPA_TYPE_INTERFACE_BASE "Node" +#define SPA_TYPE_NODE_BASE SPA_TYPE__Node ":" struct spa_node; @@ -67,14 +67,14 @@ struct spa_port_io { * @rate: rate of sequence number increment per second of media data */ struct spa_port_info { -#define SPA_PORT_INFO_FLAG_REMOVABLE (1<<0) /* port can be removed */ -#define SPA_PORT_INFO_FLAG_OPTIONAL (1<<1) /* processing on port is optional */ -#define SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS (1<<2) /* the port can allocate buffer data */ -#define SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS (1<<3) /* the port can use a provided buffer */ -#define SPA_PORT_INFO_FLAG_IN_PLACE (1<<4) /* the port can process data in-place and will need +#define SPA_PORT_INFO_FLAG_REMOVABLE (1<<0) /* port can be removed */ +#define SPA_PORT_INFO_FLAG_OPTIONAL (1<<1) /* processing on port is optional */ +#define SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS (1<<2) /* the port can allocate buffer data */ +#define SPA_PORT_INFO_FLAG_CAN_USE_BUFFERS (1<<3) /* the port can use a provided buffer */ +#define SPA_PORT_INFO_FLAG_IN_PLACE (1<<4) /* the port can process data in-place and will need * a writable input buffer */ -#define SPA_PORT_INFO_FLAG_NO_REF (1<<5) /* the port does not keep a ref on the buffer */ -#define SPA_PORT_INFO_FLAG_LIVE (1<<6) /* output buffers from this port are timestamped against +#define SPA_PORT_INFO_FLAG_NO_REF (1<<5) /* the port does not keep a ref on the buffer */ +#define SPA_PORT_INFO_FLAG_LIVE (1<<6) /* output buffers from this port are timestamped against * a live clock. */ uint32_t flags; uint32_t rate; @@ -360,9 +360,9 @@ struct spa_node { * is not correct. * #SPA_RESULT_ASYNC the function is executed asynchronously */ -#define SPA_PORT_FORMAT_FLAG_TEST_ONLY (1 << 0) /* just check if the format is accepted */ -#define SPA_PORT_FORMAT_FLAG_FIXATE (1 << 1) /* fixate the non-optional unset fields */ -#define SPA_PORT_FORMAT_FLAG_NEAREST (1 << 2) /* allow set fields to be rounded to the +#define SPA_PORT_FORMAT_FLAG_TEST_ONLY (1 << 0) /* just check if the format is accepted */ +#define SPA_PORT_FORMAT_FLAG_FIXATE (1 << 1) /* fixate the non-optional unset fields */ +#define SPA_PORT_FORMAT_FLAG_NEAREST (1 << 2) /* allow set fields to be rounded to the * nearest allowed field value. */ int (*port_set_format) (struct spa_node * node, enum spa_direction direction, @@ -597,27 +597,27 @@ struct spa_node { int (*process_output) (struct spa_node * node); }; -#define spa_node_get_props(n,...) (n)->get_props((n),__VA_ARGS__) -#define spa_node_set_props(n,...) (n)->set_props((n),__VA_ARGS__) -#define spa_node_send_command(n,...) (n)->send_command((n),__VA_ARGS__) -#define spa_node_set_callbacks(n,...) (n)->set_callbacks((n),__VA_ARGS__) -#define spa_node_get_n_ports(n,...) (n)->get_n_ports((n),__VA_ARGS__) -#define spa_node_get_port_ids(n,...) (n)->get_port_ids((n),__VA_ARGS__) -#define spa_node_add_port(n,...) (n)->add_port((n),__VA_ARGS__) -#define spa_node_remove_port(n,...) (n)->remove_port((n),__VA_ARGS__) -#define spa_node_port_enum_formats(n,...) (n)->port_enum_formats((n),__VA_ARGS__) -#define spa_node_port_set_format(n,...) (n)->port_set_format((n),__VA_ARGS__) -#define spa_node_port_get_format(n,...) (n)->port_get_format((n),__VA_ARGS__) -#define spa_node_port_get_info(n,...) (n)->port_get_info((n),__VA_ARGS__) -#define spa_node_port_enum_params(n,...) (n)->port_enum_params((n),__VA_ARGS__) -#define spa_node_port_set_param(n,...) (n)->port_set_param((n),__VA_ARGS__) -#define spa_node_port_use_buffers(n,...) (n)->port_use_buffers((n),__VA_ARGS__) -#define spa_node_port_alloc_buffers(n,...) (n)->port_alloc_buffers((n),__VA_ARGS__) -#define spa_node_port_set_io(n,...) (n)->port_set_io((n),__VA_ARGS__) -#define spa_node_port_reuse_buffer(n,...) (n)->port_reuse_buffer((n),__VA_ARGS__) -#define spa_node_port_send_command(n,...) (n)->port_send_command((n),__VA_ARGS__) -#define spa_node_process_input(n) (n)->process_input((n)) -#define spa_node_process_output(n) (n)->process_output((n)) +#define spa_node_get_props(n,...) (n)->get_props((n),__VA_ARGS__) +#define spa_node_set_props(n,...) (n)->set_props((n),__VA_ARGS__) +#define spa_node_send_command(n,...) (n)->send_command((n),__VA_ARGS__) +#define spa_node_set_callbacks(n,...) (n)->set_callbacks((n),__VA_ARGS__) +#define spa_node_get_n_ports(n,...) (n)->get_n_ports((n),__VA_ARGS__) +#define spa_node_get_port_ids(n,...) (n)->get_port_ids((n),__VA_ARGS__) +#define spa_node_add_port(n,...) (n)->add_port((n),__VA_ARGS__) +#define spa_node_remove_port(n,...) (n)->remove_port((n),__VA_ARGS__) +#define spa_node_port_enum_formats(n,...) (n)->port_enum_formats((n),__VA_ARGS__) +#define spa_node_port_set_format(n,...) (n)->port_set_format((n),__VA_ARGS__) +#define spa_node_port_get_format(n,...) (n)->port_get_format((n),__VA_ARGS__) +#define spa_node_port_get_info(n,...) (n)->port_get_info((n),__VA_ARGS__) +#define spa_node_port_enum_params(n,...) (n)->port_enum_params((n),__VA_ARGS__) +#define spa_node_port_set_param(n,...) (n)->port_set_param((n),__VA_ARGS__) +#define spa_node_port_use_buffers(n,...) (n)->port_use_buffers((n),__VA_ARGS__) +#define spa_node_port_alloc_buffers(n,...) (n)->port_alloc_buffers((n),__VA_ARGS__) +#define spa_node_port_set_io(n,...) (n)->port_set_io((n),__VA_ARGS__) +#define spa_node_port_reuse_buffer(n,...) (n)->port_reuse_buffer((n),__VA_ARGS__) +#define spa_node_port_send_command(n,...) (n)->port_send_command((n),__VA_ARGS__) +#define spa_node_process_input(n) (n)->process_input((n)) +#define spa_node_process_output(n) (n)->process_output((n)) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/param-alloc.h b/spa/include/spa/param-alloc.h index 9a86a8190..9b4252d14 100644 --- a/spa/include/spa/param-alloc.h +++ b/spa/include/spa/param-alloc.h @@ -28,16 +28,16 @@ extern "C" { #include #include -#define SPA_TYPE__ParamAlloc SPA_TYPE_PARAM_BASE "Alloc" -#define SPA_TYPE_PARAM_ALLOC_BASE SPA_TYPE__ParamAlloc ":" +#define SPA_TYPE__ParamAlloc SPA_TYPE_PARAM_BASE "Alloc" +#define SPA_TYPE_PARAM_ALLOC_BASE SPA_TYPE__ParamAlloc ":" -#define SPA_TYPE_PARAM_ALLOC__Buffers SPA_TYPE_PARAM_ALLOC_BASE "Buffers" -#define SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE SPA_TYPE_PARAM_ALLOC__Buffers ":" +#define SPA_TYPE_PARAM_ALLOC__Buffers SPA_TYPE_PARAM_ALLOC_BASE "Buffers" +#define SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE SPA_TYPE_PARAM_ALLOC__Buffers ":" -#define SPA_TYPE_PARAM_ALLOC_BUFFERS__size SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "size" -#define SPA_TYPE_PARAM_ALLOC_BUFFERS__stride SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "stride" -#define SPA_TYPE_PARAM_ALLOC_BUFFERS__buffers SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "buffers" -#define SPA_TYPE_PARAM_ALLOC_BUFFERS__align SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "align" +#define SPA_TYPE_PARAM_ALLOC_BUFFERS__size SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "size" +#define SPA_TYPE_PARAM_ALLOC_BUFFERS__stride SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "stride" +#define SPA_TYPE_PARAM_ALLOC_BUFFERS__buffers SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "buffers" +#define SPA_TYPE_PARAM_ALLOC_BUFFERS__align SPA_TYPE_PARAM_ALLOC_BUFFERS_BASE "align" struct spa_type_param_alloc_buffers { uint32_t Buffers; @@ -60,15 +60,15 @@ spa_type_param_alloc_buffers_map(struct spa_type_map *map, } } -#define SPA_TYPE_PARAM_ALLOC__MetaEnable SPA_TYPE_PARAM_ALLOC_BASE "MetaEnable" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE SPA_TYPE_PARAM_ALLOC__MetaEnable ":" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__type SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "type" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__size SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "size" +#define SPA_TYPE_PARAM_ALLOC__MetaEnable SPA_TYPE_PARAM_ALLOC_BASE "MetaEnable" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE SPA_TYPE_PARAM_ALLOC__MetaEnable ":" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__type SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "type" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__size SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "size" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferSize SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferSize" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferStride SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferStride" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferBlocks SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferBlocks" -#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferAlign SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferAlign" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferSize SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferSize" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferStride SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferStride" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferBlocks SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferBlocks" +#define SPA_TYPE_PARAM_ALLOC_META_ENABLE__ringbufferAlign SPA_TYPE_PARAM_ALLOC_META_ENABLE_BASE "ringbufferAlign" struct spa_type_param_alloc_meta_enable { uint32_t MetaEnable; @@ -95,17 +95,17 @@ spa_type_param_alloc_meta_enable_map(struct spa_type_map *map, } } -#define SPA_TYPE_PARAM_ALLOC__VideoPadding SPA_TYPE_PARAM_ALLOC_BASE "VideoPadding" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE SPA_TYPE_PARAM_ALLOC__VideoPadding ":" +#define SPA_TYPE_PARAM_ALLOC__VideoPadding SPA_TYPE_PARAM_ALLOC_BASE "VideoPadding" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE SPA_TYPE_PARAM_ALLOC__VideoPadding ":" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__top SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "top" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__bottom SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "bottom" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__left SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "left" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__right SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "right" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign0 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign0" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign1 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign1" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign2 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign2" -#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign3 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign3" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__top SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "top" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__bottom SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "bottom" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__left SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "left" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__right SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "right" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign0 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign0" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign1 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign1" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign2 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign2" +#define SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING__strideAlign3 SPA_TYPE_PARAM_ALLOC_VIDEO_PADDING_BASE "strideAlign3" struct spa_type_param_alloc_video_padding { uint32_t VideoPadding; diff --git a/spa/include/spa/param.h b/spa/include/spa/param.h index 2918a815c..538b0d4b2 100644 --- a/spa/include/spa/param.h +++ b/spa/include/spa/param.h @@ -28,8 +28,8 @@ extern "C" { #include struct spa_param; -#define SPA_TYPE__Param SPA_TYPE_POD_OBJECT_BASE "Param" -#define SPA_TYPE_PARAM_BASE SPA_TYPE__Param ":" +#define SPA_TYPE__Param SPA_TYPE_POD_OBJECT_BASE "Param" +#define SPA_TYPE_PARAM_BASE SPA_TYPE__Param ":" struct spa_param { struct spa_pod_object object; diff --git a/spa/include/spa/plugin.h b/spa/include/spa/plugin.h index 5aee64a5c..723e6cf96 100644 --- a/spa/include/spa/plugin.h +++ b/spa/include/spa/plugin.h @@ -27,8 +27,8 @@ extern "C" { #include #include -#define SPA_TYPE__Handle SPA_TYPE_INTERFACE_BASE "Handle" -#define SPA_TYPE__HandleFactory SPA_TYPE_INTERFACE_BASE "HandleFactory" +#define SPA_TYPE__Handle SPA_TYPE_INTERFACE_BASE "Handle" +#define SPA_TYPE__HandleFactory SPA_TYPE_INTERFACE_BASE "HandleFactory" struct spa_handle { /* user_data that can be set by the application */ @@ -58,8 +58,8 @@ struct spa_handle { int (*clear) (struct spa_handle * handle); }; -#define spa_handle_get_interface(h,...) (h)->get_interface((h),__VA_ARGS__) -#define spa_handle_clear(h) (h)->clear((h)) +#define spa_handle_get_interface(h,...) (h)->get_interface((h),__VA_ARGS__) +#define spa_handle_clear(h) (h)->clear((h)) /** * struct spa_interface_info: @@ -148,8 +148,8 @@ struct spa_handle_factory { uint32_t index); }; -#define spa_handle_factory_init(h,...) (h)->init((h),__VA_ARGS__) -#define spa_handle_factory_enum_interface_info(h,...) (h)->enum_interface_info((h),__VA_ARGS__) +#define spa_handle_factory_init(h,...) (h)->init((h),__VA_ARGS__) +#define spa_handle_factory_enum_interface_info(h,...) (h)->enum_interface_info((h),__VA_ARGS__) /** * spa_handle_factory_enum_func_t: diff --git a/spa/include/spa/pod-utils.h b/spa/include/spa/pod-utils.h index e913b6f3e..3dd6a7ba4 100644 --- a/spa/include/spa/pod-utils.h +++ b/spa/include/spa/pod-utils.h @@ -28,19 +28,19 @@ extern "C" { #include #include -#define SPA_POD_BODY_SIZE(pod) (((struct spa_pod*)(pod))->size) -#define SPA_POD_TYPE(pod) (((struct spa_pod*)(pod))->type) -#define SPA_POD_SIZE(pod) (sizeof(struct spa_pod) + SPA_POD_BODY_SIZE(pod)) -#define SPA_POD_CONTENTS_SIZE(type,pod) (SPA_POD_SIZE(pod)-sizeof(type)) +#define SPA_POD_BODY_SIZE(pod) (((struct spa_pod*)(pod))->size) +#define SPA_POD_TYPE(pod) (((struct spa_pod*)(pod))->type) +#define SPA_POD_SIZE(pod) (sizeof(struct spa_pod) + SPA_POD_BODY_SIZE(pod)) +#define SPA_POD_CONTENTS_SIZE(type,pod) (SPA_POD_SIZE(pod)-sizeof(type)) -#define SPA_POD_CONTENTS(type,pod) SPA_MEMBER((pod),sizeof(type),void) -#define SPA_POD_CONTENTS_CONST(type,pod) SPA_MEMBER((pod),sizeof(type),const void) -#define SPA_POD_BODY(pod) SPA_MEMBER((pod),sizeof(struct spa_pod),void) -#define SPA_POD_BODY_CONST(pod) SPA_MEMBER((pod),sizeof(struct spa_pod),const void) +#define SPA_POD_CONTENTS(type,pod) SPA_MEMBER((pod),sizeof(type),void) +#define SPA_POD_CONTENTS_CONST(type,pod) SPA_MEMBER((pod),sizeof(type),const void) +#define SPA_POD_BODY(pod) SPA_MEMBER((pod),sizeof(struct spa_pod),void) +#define SPA_POD_BODY_CONST(pod) SPA_MEMBER((pod),sizeof(struct spa_pod),const void) -#define SPA_POD_VALUE(type,pod) (((type*)pod)->value) +#define SPA_POD_VALUE(type,pod) (((type*)pod)->value) -#define SPA_POD_PROP_N_VALUES(prop) (((prop)->pod.size - sizeof(struct spa_pod_prop_body)) / (prop)->body.value.size) +#define SPA_POD_PROP_N_VALUES(prop) (((prop)->pod.size - sizeof(struct spa_pod_prop_body)) / (prop)->body.value.size) static inline bool spa_pod_is_object_type(struct spa_pod *pod, uint32_t type) { diff --git a/spa/include/spa/pod.h b/spa/include/spa/pod.h index 929fb231e..10883e1ae 100644 --- a/spa/include/spa/pod.h +++ b/spa/include/spa/pod.h @@ -28,14 +28,14 @@ extern "C" { #include -#define SPA_TYPE__POD SPA_TYPE_BASE "POD" -#define SPA_TYPE_POD_BASE SPA_TYPE__POD ":" +#define SPA_TYPE__POD SPA_TYPE_BASE "POD" +#define SPA_TYPE_POD_BASE SPA_TYPE__POD ":" -#define SPA_TYPE_POD__Object SPA_TYPE_POD_BASE "Object" -#define SPA_TYPE_POD_OBJECT_BASE SPA_TYPE_POD__Object ":" +#define SPA_TYPE_POD__Object SPA_TYPE_POD_BASE "Object" +#define SPA_TYPE_POD_OBJECT_BASE SPA_TYPE_POD__Object ":" -#define SPA_TYPE_POD__Struct SPA_TYPE_POD_BASE "Struct" -#define SPA_TYPE_POD_STRUCT_BASE SPA_TYPE_POD__Struct ":" +#define SPA_TYPE_POD__Struct SPA_TYPE_POD_BASE "Struct" +#define SPA_TYPE_POD_STRUCT_BASE SPA_TYPE_POD__Struct ":" /** * spa_pod_type: @@ -152,16 +152,16 @@ struct spa_pod_struct { struct spa_pod_prop_body { uint32_t key; -#define SPA_POD_PROP_RANGE_NONE 0 -#define SPA_POD_PROP_RANGE_MIN_MAX 1 -#define SPA_POD_PROP_RANGE_STEP 2 -#define SPA_POD_PROP_RANGE_ENUM 3 -#define SPA_POD_PROP_RANGE_FLAGS 4 -#define SPA_POD_PROP_RANGE_MASK 0xf -#define SPA_POD_PROP_FLAG_UNSET (1 << 4) -#define SPA_POD_PROP_FLAG_OPTIONAL (1 << 5) -#define SPA_POD_PROP_FLAG_READONLY (1 << 6) -#define SPA_POD_PROP_FLAG_DEPRECATED (1 << 7) +#define SPA_POD_PROP_RANGE_NONE 0 +#define SPA_POD_PROP_RANGE_MIN_MAX 1 +#define SPA_POD_PROP_RANGE_STEP 2 +#define SPA_POD_PROP_RANGE_ENUM 3 +#define SPA_POD_PROP_RANGE_FLAGS 4 +#define SPA_POD_PROP_RANGE_MASK 0xf +#define SPA_POD_PROP_FLAG_UNSET (1 << 4) +#define SPA_POD_PROP_FLAG_OPTIONAL (1 << 5) +#define SPA_POD_PROP_FLAG_READONLY (1 << 6) +#define SPA_POD_PROP_FLAG_DEPRECATED (1 << 7) uint32_t flags; struct spa_pod value; /* array with elements of value.size follows, diff --git a/spa/include/spa/props.h b/spa/include/spa/props.h index 0a85b8271..f961e9d96 100644 --- a/spa/include/spa/props.h +++ b/spa/include/spa/props.h @@ -31,24 +31,24 @@ struct spa_props { struct spa_pod_object object; }; -#define SPA_TYPE__Props SPA_TYPE_POD_OBJECT_BASE "Props" -#define SPA_TYPE_PROPS_BASE SPA_TYPE__Props ":" +#define SPA_TYPE__Props SPA_TYPE_POD_OBJECT_BASE "Props" +#define SPA_TYPE_PROPS_BASE SPA_TYPE__Props ":" -#define SPA_TYPE_PROPS__device SPA_TYPE_PROPS_BASE "device" -#define SPA_TYPE_PROPS__deviceName SPA_TYPE_PROPS_BASE "deviceName" -#define SPA_TYPE_PROPS__deviceFd SPA_TYPE_PROPS_BASE "deviceFd" -#define SPA_TYPE_PROPS__card SPA_TYPE_PROPS_BASE "card" -#define SPA_TYPE_PROPS__cardName SPA_TYPE_PROPS_BASE "cardName" -#define SPA_TYPE_PROPS__minLatency SPA_TYPE_PROPS_BASE "minLatency" -#define SPA_TYPE_PROPS__periods SPA_TYPE_PROPS_BASE "periods" -#define SPA_TYPE_PROPS__periodSize SPA_TYPE_PROPS_BASE "periodSize" -#define SPA_TYPE_PROPS__periodEvent SPA_TYPE_PROPS_BASE "periodEvent" -#define SPA_TYPE_PROPS__live SPA_TYPE_PROPS_BASE "live" -#define SPA_TYPE_PROPS__waveType SPA_TYPE_PROPS_BASE "waveType" -#define SPA_TYPE_PROPS__frequency SPA_TYPE_PROPS_BASE "frequency" -#define SPA_TYPE_PROPS__volume SPA_TYPE_PROPS_BASE "volume" -#define SPA_TYPE_PROPS__mute SPA_TYPE_PROPS_BASE "mute" -#define SPA_TYPE_PROPS__patternType SPA_TYPE_PROPS_BASE "patternType" +#define SPA_TYPE_PROPS__device SPA_TYPE_PROPS_BASE "device" +#define SPA_TYPE_PROPS__deviceName SPA_TYPE_PROPS_BASE "deviceName" +#define SPA_TYPE_PROPS__deviceFd SPA_TYPE_PROPS_BASE "deviceFd" +#define SPA_TYPE_PROPS__card SPA_TYPE_PROPS_BASE "card" +#define SPA_TYPE_PROPS__cardName SPA_TYPE_PROPS_BASE "cardName" +#define SPA_TYPE_PROPS__minLatency SPA_TYPE_PROPS_BASE "minLatency" +#define SPA_TYPE_PROPS__periods SPA_TYPE_PROPS_BASE "periods" +#define SPA_TYPE_PROPS__periodSize SPA_TYPE_PROPS_BASE "periodSize" +#define SPA_TYPE_PROPS__periodEvent SPA_TYPE_PROPS_BASE "periodEvent" +#define SPA_TYPE_PROPS__live SPA_TYPE_PROPS_BASE "live" +#define SPA_TYPE_PROPS__waveType SPA_TYPE_PROPS_BASE "waveType" +#define SPA_TYPE_PROPS__frequency SPA_TYPE_PROPS_BASE "frequency" +#define SPA_TYPE_PROPS__volume SPA_TYPE_PROPS_BASE "volume" +#define SPA_TYPE_PROPS__mute SPA_TYPE_PROPS_BASE "mute" +#define SPA_TYPE_PROPS__patternType SPA_TYPE_PROPS_BASE "patternType" static inline uint32_t spa_pod_builder_push_props(struct spa_pod_builder *builder, @@ -58,7 +58,7 @@ spa_pod_builder_push_props(struct spa_pod_builder *builder, return spa_pod_builder_push_object(builder, frame, 0, props_type); } -#define spa_pod_builder_props(b,f,props_type,...) \ +#define spa_pod_builder_props(b,f,props_type,...) \ spa_pod_builder_object(b, f, 0, props_type,__VA_ARGS__) static inline uint32_t spa_props_query(const struct spa_props *props, uint32_t key, ...) diff --git a/spa/include/spa/ringbuffer.h b/spa/include/spa/ringbuffer.h index 0c3c843ba..4b37ff944 100644 --- a/spa/include/spa/ringbuffer.h +++ b/spa/include/spa/ringbuffer.h @@ -25,8 +25,8 @@ extern "C" { #endif struct spa_ringbuffer; -#define SPA_TYPE__RingBuffer SPA_TYPE_INTERFACE_BASE "RingBuffer" -#define SPA_TYPE_RINGBUFFER_BASE SPA_TYPE__RingBuffer ":" +#define SPA_TYPE__RingBuffer SPA_TYPE_INTERFACE_BASE "RingBuffer" +#define SPA_TYPE_RINGBUFFER_BASE SPA_TYPE__RingBuffer ":" #include diff --git a/spa/include/spa/type-map.h b/spa/include/spa/type-map.h index b64c75897..f99e83c29 100644 --- a/spa/include/spa/type-map.h +++ b/spa/include/spa/type-map.h @@ -28,7 +28,7 @@ extern "C" { #include #include -#define SPA_TYPE__TypeMap SPA_TYPE_INTERFACE_BASE "TypeMap" +#define SPA_TYPE__TypeMap SPA_TYPE_INTERFACE_BASE "TypeMap" /** * spa_type_map: @@ -53,9 +53,9 @@ struct spa_type_map { size_t (*get_size) (const struct spa_type_map * map); }; -#define spa_type_map_get_id(n,...) (n)->get_id((n),__VA_ARGS__) -#define spa_type_map_get_type(n,...) (n)->get_type((n),__VA_ARGS__) -#define spa_type_map_get_size(n) (n)->get_size(n) +#define spa_type_map_get_id(n,...) (n)->get_id((n),__VA_ARGS__) +#define spa_type_map_get_type(n,...) (n)->get_type((n),__VA_ARGS__) +#define spa_type_map_get_size(n) (n)->get_size(n) #ifdef __cplusplus } /* extern "C" */ diff --git a/spa/include/spa/type.h b/spa/include/spa/type.h index b0c458c5a..06ddd36d0 100644 --- a/spa/include/spa/type.h +++ b/spa/include/spa/type.h @@ -26,19 +26,19 @@ extern "C" { #include -#define SPA_TYPE_BASE "Spa:" +#define SPA_TYPE_BASE "Spa:" -#define SPA_TYPE__Enum SPA_TYPE_BASE "Enum" -#define SPA_TYPE_ENUM_BASE SPA_TYPE__Enum ":" +#define SPA_TYPE__Enum SPA_TYPE_BASE "Enum" +#define SPA_TYPE_ENUM_BASE SPA_TYPE__Enum ":" -#define SPA_TYPE__Pointer SPA_TYPE_BASE "Pointer" -#define SPA_TYPE_POINTER_BASE SPA_TYPE__Pointer ":" +#define SPA_TYPE__Pointer SPA_TYPE_BASE "Pointer" +#define SPA_TYPE_POINTER_BASE SPA_TYPE__Pointer ":" -#define SPA_TYPE__Interface SPA_TYPE_BASE "Interface" -#define SPA_TYPE_INTERFACE_BASE SPA_TYPE__Interface ":" +#define SPA_TYPE__Interface SPA_TYPE_BASE "Interface" +#define SPA_TYPE_INTERFACE_BASE SPA_TYPE__Interface ":" -#define SPA_TYPE__Object SPA_TYPE_BASE "Object" -#define SPA_TYPE_OBJECT_BASE SPA_TYPE__Object ":" +#define SPA_TYPE__Object SPA_TYPE_BASE "Object" +#define SPA_TYPE_OBJECT_BASE SPA_TYPE__Object ":" static inline bool spa_type_is_a(const char *type, const char *parent) { diff --git a/spa/include/spa/video/format.h b/spa/include/spa/video/format.h index 300c35b1c..53554687b 100644 --- a/spa/include/spa/video/format.h +++ b/spa/include/spa/video/format.h @@ -28,27 +28,27 @@ extern "C" { #include #include -#define SPA_TYPE_FORMAT__Video SPA_TYPE_FORMAT_BASE "Video" -#define SPA_TYPE_FORMAT_VIDEO_BASE SPA_TYPE_FORMAT__Video ":" +#define SPA_TYPE_FORMAT__Video SPA_TYPE_FORMAT_BASE "Video" +#define SPA_TYPE_FORMAT_VIDEO_BASE SPA_TYPE_FORMAT__Video ":" -#define SPA_TYPE_FORMAT_VIDEO__format SPA_TYPE_FORMAT_VIDEO_BASE "format" -#define SPA_TYPE_FORMAT_VIDEO__size SPA_TYPE_FORMAT_VIDEO_BASE "size" -#define SPA_TYPE_FORMAT_VIDEO__framerate SPA_TYPE_FORMAT_VIDEO_BASE "framerate" -#define SPA_TYPE_FORMAT_VIDEO__maxFramerate SPA_TYPE_FORMAT_VIDEO_BASE "max-framerate" -#define SPA_TYPE_FORMAT_VIDEO__views SPA_TYPE_FORMAT_VIDEO_BASE "views" -#define SPA_TYPE_FORMAT_VIDEO__interlaceMode SPA_TYPE_FORMAT_VIDEO_BASE "interlace-mode" -#define SPA_TYPE_FORMAT_VIDEO__pixelAspectRatio SPA_TYPE_FORMAT_VIDEO_BASE "pixel-aspect-ratio" -#define SPA_TYPE_FORMAT_VIDEO__multiviewMode SPA_TYPE_FORMAT_VIDEO_BASE "multiview-mode" -#define SPA_TYPE_FORMAT_VIDEO__multiviewFlags SPA_TYPE_FORMAT_VIDEO_BASE "multiview-flags" -#define SPA_TYPE_FORMAT_VIDEO__chromaSite SPA_TYPE_FORMAT_VIDEO_BASE "chroma-site" -#define SPA_TYPE_FORMAT_VIDEO__colorRange SPA_TYPE_FORMAT_VIDEO_BASE "color-range" -#define SPA_TYPE_FORMAT_VIDEO__colorMatrix SPA_TYPE_FORMAT_VIDEO_BASE "color-matrix" -#define SPA_TYPE_FORMAT_VIDEO__transferFunction SPA_TYPE_FORMAT_VIDEO_BASE "transfer-function" -#define SPA_TYPE_FORMAT_VIDEO__colorPrimaries SPA_TYPE_FORMAT_VIDEO_BASE "color-primaries" -#define SPA_TYPE_FORMAT_VIDEO__profile SPA_TYPE_FORMAT_VIDEO_BASE "profile" -#define SPA_TYPE_FORMAT_VIDEO__level SPA_TYPE_FORMAT_VIDEO_BASE "level" -#define SPA_TYPE_FORMAT_VIDEO__streamFormat SPA_TYPE_FORMAT_VIDEO_BASE "stream-format" -#define SPA_TYPE_FORMAT_VIDEO__alignment SPA_TYPE_FORMAT_VIDEO_BASE "alignment" +#define SPA_TYPE_FORMAT_VIDEO__format SPA_TYPE_FORMAT_VIDEO_BASE "format" +#define SPA_TYPE_FORMAT_VIDEO__size SPA_TYPE_FORMAT_VIDEO_BASE "size" +#define SPA_TYPE_FORMAT_VIDEO__framerate SPA_TYPE_FORMAT_VIDEO_BASE "framerate" +#define SPA_TYPE_FORMAT_VIDEO__maxFramerate SPA_TYPE_FORMAT_VIDEO_BASE "max-framerate" +#define SPA_TYPE_FORMAT_VIDEO__views SPA_TYPE_FORMAT_VIDEO_BASE "views" +#define SPA_TYPE_FORMAT_VIDEO__interlaceMode SPA_TYPE_FORMAT_VIDEO_BASE "interlace-mode" +#define SPA_TYPE_FORMAT_VIDEO__pixelAspectRatio SPA_TYPE_FORMAT_VIDEO_BASE "pixel-aspect-ratio" +#define SPA_TYPE_FORMAT_VIDEO__multiviewMode SPA_TYPE_FORMAT_VIDEO_BASE "multiview-mode" +#define SPA_TYPE_FORMAT_VIDEO__multiviewFlags SPA_TYPE_FORMAT_VIDEO_BASE "multiview-flags" +#define SPA_TYPE_FORMAT_VIDEO__chromaSite SPA_TYPE_FORMAT_VIDEO_BASE "chroma-site" +#define SPA_TYPE_FORMAT_VIDEO__colorRange SPA_TYPE_FORMAT_VIDEO_BASE "color-range" +#define SPA_TYPE_FORMAT_VIDEO__colorMatrix SPA_TYPE_FORMAT_VIDEO_BASE "color-matrix" +#define SPA_TYPE_FORMAT_VIDEO__transferFunction SPA_TYPE_FORMAT_VIDEO_BASE "transfer-function" +#define SPA_TYPE_FORMAT_VIDEO__colorPrimaries SPA_TYPE_FORMAT_VIDEO_BASE "color-primaries" +#define SPA_TYPE_FORMAT_VIDEO__profile SPA_TYPE_FORMAT_VIDEO_BASE "profile" +#define SPA_TYPE_FORMAT_VIDEO__level SPA_TYPE_FORMAT_VIDEO_BASE "level" +#define SPA_TYPE_FORMAT_VIDEO__streamFormat SPA_TYPE_FORMAT_VIDEO_BASE "stream-format" +#define SPA_TYPE_FORMAT_VIDEO__alignment SPA_TYPE_FORMAT_VIDEO_BASE "alignment" struct spa_video_info { uint32_t media_type; diff --git a/spa/include/spa/video/raw.h b/spa/include/spa/video/raw.h index e38a780ae..aa158aa56 100644 --- a/spa/include/spa/video/raw.h +++ b/spa/include/spa/video/raw.h @@ -32,86 +32,86 @@ extern "C" { #define SPA_VIDEO_MAX_PLANES 4 #define SPA_VIDEO_MAX_COMPONENTS 4 -#define SPA_TYPE__VideoFormat SPA_TYPE_ENUM_BASE "VideoFormat" -#define SPA_TYPE_VIDEO_FORMAT_BASE SPA_TYPE__VideoFormat ":" +#define SPA_TYPE__VideoFormat SPA_TYPE_ENUM_BASE "VideoFormat" +#define SPA_TYPE_VIDEO_FORMAT_BASE SPA_TYPE__VideoFormat ":" -#define SPA_TYPE_VIDEO_FORMAT__ENCODED SPA_TYPE_VIDEO_FORMAT_BASE "encoded" -#define SPA_TYPE_VIDEO_FORMAT__I420 SPA_TYPE_VIDEO_FORMAT_BASE "I420" -#define SPA_TYPE_VIDEO_FORMAT__YV12 SPA_TYPE_VIDEO_FORMAT_BASE "YV12" -#define SPA_TYPE_VIDEO_FORMAT__YUY2 SPA_TYPE_VIDEO_FORMAT_BASE "YUY2" -#define SPA_TYPE_VIDEO_FORMAT__UYVY SPA_TYPE_VIDEO_FORMAT_BASE "UYVY" -#define SPA_TYPE_VIDEO_FORMAT__AYUV SPA_TYPE_VIDEO_FORMAT_BASE "AYUV" -#define SPA_TYPE_VIDEO_FORMAT__RGBx SPA_TYPE_VIDEO_FORMAT_BASE "RGBx" -#define SPA_TYPE_VIDEO_FORMAT__BGRx SPA_TYPE_VIDEO_FORMAT_BASE "BGRx" -#define SPA_TYPE_VIDEO_FORMAT__xRGB SPA_TYPE_VIDEO_FORMAT_BASE "xRGB" -#define SPA_TYPE_VIDEO_FORMAT__xBGR SPA_TYPE_VIDEO_FORMAT_BASE "xBGR" -#define SPA_TYPE_VIDEO_FORMAT__RGBA SPA_TYPE_VIDEO_FORMAT_BASE "RGBA" -#define SPA_TYPE_VIDEO_FORMAT__BGRA SPA_TYPE_VIDEO_FORMAT_BASE "BGRA" -#define SPA_TYPE_VIDEO_FORMAT__ARGB SPA_TYPE_VIDEO_FORMAT_BASE "ARGB" -#define SPA_TYPE_VIDEO_FORMAT__ABGR SPA_TYPE_VIDEO_FORMAT_BASE "ABGR" -#define SPA_TYPE_VIDEO_FORMAT__RGB SPA_TYPE_VIDEO_FORMAT_BASE "RGB" -#define SPA_TYPE_VIDEO_FORMAT__BGR SPA_TYPE_VIDEO_FORMAT_BASE "BGR" -#define SPA_TYPE_VIDEO_FORMAT__Y41B SPA_TYPE_VIDEO_FORMAT_BASE "Y41B" -#define SPA_TYPE_VIDEO_FORMAT__Y42B SPA_TYPE_VIDEO_FORMAT_BASE "Y42B" -#define SPA_TYPE_VIDEO_FORMAT__YVYU SPA_TYPE_VIDEO_FORMAT_BASE "YVYU" -#define SPA_TYPE_VIDEO_FORMAT__Y444 SPA_TYPE_VIDEO_FORMAT_BASE "Y444" -#define SPA_TYPE_VIDEO_FORMAT__v210 SPA_TYPE_VIDEO_FORMAT_BASE "v210" -#define SPA_TYPE_VIDEO_FORMAT__v216 SPA_TYPE_VIDEO_FORMAT_BASE "v216" -#define SPA_TYPE_VIDEO_FORMAT__NV12 SPA_TYPE_VIDEO_FORMAT_BASE "NV12" -#define SPA_TYPE_VIDEO_FORMAT__NV21 SPA_TYPE_VIDEO_FORMAT_BASE "NV21" -#define SPA_TYPE_VIDEO_FORMAT__GRAY8 SPA_TYPE_VIDEO_FORMAT_BASE "GRAY8" -#define SPA_TYPE_VIDEO_FORMAT__GRAY16_BE SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_BE" -#define SPA_TYPE_VIDEO_FORMAT__GRAY16_LE SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_LE" -#define SPA_TYPE_VIDEO_FORMAT__v308 SPA_TYPE_VIDEO_FORMAT_BASE "v308" -#define SPA_TYPE_VIDEO_FORMAT__RGB16 SPA_TYPE_VIDEO_FORMAT_BASE "RGB16" -#define SPA_TYPE_VIDEO_FORMAT__BGR16 SPA_TYPE_VIDEO_FORMAT_BASE "BGR16" -#define SPA_TYPE_VIDEO_FORMAT__RGB15 SPA_TYPE_VIDEO_FORMAT_BASE "RGB15" -#define SPA_TYPE_VIDEO_FORMAT__BGR15 SPA_TYPE_VIDEO_FORMAT_BASE "BGR15" -#define SPA_TYPE_VIDEO_FORMAT__UYVP SPA_TYPE_VIDEO_FORMAT_BASE "UYVP" -#define SPA_TYPE_VIDEO_FORMAT__A420 SPA_TYPE_VIDEO_FORMAT_BASE "A420" -#define SPA_TYPE_VIDEO_FORMAT__RGB8P SPA_TYPE_VIDEO_FORMAT_BASE "RGB8P" -#define SPA_TYPE_VIDEO_FORMAT__YUV9 SPA_TYPE_VIDEO_FORMAT_BASE "YUV9" -#define SPA_TYPE_VIDEO_FORMAT__YVU9 SPA_TYPE_VIDEO_FORMAT_BASE "YVU9" -#define SPA_TYPE_VIDEO_FORMAT__IYU1 SPA_TYPE_VIDEO_FORMAT_BASE "IYU1" -#define SPA_TYPE_VIDEO_FORMAT__ARGB64 SPA_TYPE_VIDEO_FORMAT_BASE "ARGB64" -#define SPA_TYPE_VIDEO_FORMAT__AYUV64 SPA_TYPE_VIDEO_FORMAT_BASE "AYUV64" -#define SPA_TYPE_VIDEO_FORMAT__r210 SPA_TYPE_VIDEO_FORMAT_BASE "r210" -#define SPA_TYPE_VIDEO_FORMAT__I420_10BE SPA_TYPE_VIDEO_FORMAT_BASE "I420_10BE" -#define SPA_TYPE_VIDEO_FORMAT__I420_10LE SPA_TYPE_VIDEO_FORMAT_BASE "I420_10LE" -#define SPA_TYPE_VIDEO_FORMAT__I422_10BE SPA_TYPE_VIDEO_FORMAT_BASE "I422_10BE" -#define SPA_TYPE_VIDEO_FORMAT__I422_10LE SPA_TYPE_VIDEO_FORMAT_BASE "I422_10LE" -#define SPA_TYPE_VIDEO_FORMAT__Y444_10BE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10BE" -#define SPA_TYPE_VIDEO_FORMAT__Y444_10LE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10LE" -#define SPA_TYPE_VIDEO_FORMAT__GBR SPA_TYPE_VIDEO_FORMAT_BASE "GBR" -#define SPA_TYPE_VIDEO_FORMAT__GBR_10BE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10BE" -#define SPA_TYPE_VIDEO_FORMAT__GBR_10LE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10LE" -#define SPA_TYPE_VIDEO_FORMAT__NV16 SPA_TYPE_VIDEO_FORMAT_BASE "NV16" -#define SPA_TYPE_VIDEO_FORMAT__NV24 SPA_TYPE_VIDEO_FORMAT_BASE "NV24" -#define SPA_TYPE_VIDEO_FORMAT__NV12_64Z32 SPA_TYPE_VIDEO_FORMAT_BASE "NV12_64Z32" -#define SPA_TYPE_VIDEO_FORMAT__A420_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A420_10BE" -#define SPA_TYPE_VIDEO_FORMAT__A420_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A420_10LE" -#define SPA_TYPE_VIDEO_FORMAT__A422_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A422_10BE" -#define SPA_TYPE_VIDEO_FORMAT__A422_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A422_10LE" -#define SPA_TYPE_VIDEO_FORMAT__A444_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A444_10BE" -#define SPA_TYPE_VIDEO_FORMAT__A444_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A444_10LE" -#define SPA_TYPE_VIDEO_FORMAT__NV61 SPA_TYPE_VIDEO_FORMAT_BASE "NV61" -#define SPA_TYPE_VIDEO_FORMAT__P010_10BE SPA_TYPE_VIDEO_FORMAT_BASE "P010_10BE" -#define SPA_TYPE_VIDEO_FORMAT__P010_10LE SPA_TYPE_VIDEO_FORMAT_BASE "P010_10LE" -#define SPA_TYPE_VIDEO_FORMAT__IYU2 SPA_TYPE_VIDEO_FORMAT_BASE "IYU2" -#define SPA_TYPE_VIDEO_FORMAT__VYUY SPA_TYPE_VIDEO_FORMAT_BASE "VYUY" -#define SPA_TYPE_VIDEO_FORMAT__GBRA SPA_TYPE_VIDEO_FORMAT_BASE "GBRA" -#define SPA_TYPE_VIDEO_FORMAT__GBRA_10BE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10BE" -#define SPA_TYPE_VIDEO_FORMAT__GBRA_10LE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10LE" -#define SPA_TYPE_VIDEO_FORMAT__GBR_12BE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12BE" -#define SPA_TYPE_VIDEO_FORMAT__GBR_12LE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12LE" -#define SPA_TYPE_VIDEO_FORMAT__GBRA_12BE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12BE" -#define SPA_TYPE_VIDEO_FORMAT__GBRA_12LE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12LE" -#define SPA_TYPE_VIDEO_FORMAT__I420_12BE SPA_TYPE_VIDEO_FORMAT_BASE "I420_12BE" -#define SPA_TYPE_VIDEO_FORMAT__I420_12LE SPA_TYPE_VIDEO_FORMAT_BASE "I420_12LE" -#define SPA_TYPE_VIDEO_FORMAT__I422_12BE SPA_TYPE_VIDEO_FORMAT_BASE "I422_12BE" -#define SPA_TYPE_VIDEO_FORMAT__I422_12LE SPA_TYPE_VIDEO_FORMAT_BASE "I422_12LE" -#define SPA_TYPE_VIDEO_FORMAT__Y444_12BE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12BE" -#define SPA_TYPE_VIDEO_FORMAT__Y444_12LE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12LE" +#define SPA_TYPE_VIDEO_FORMAT__ENCODED SPA_TYPE_VIDEO_FORMAT_BASE "encoded" +#define SPA_TYPE_VIDEO_FORMAT__I420 SPA_TYPE_VIDEO_FORMAT_BASE "I420" +#define SPA_TYPE_VIDEO_FORMAT__YV12 SPA_TYPE_VIDEO_FORMAT_BASE "YV12" +#define SPA_TYPE_VIDEO_FORMAT__YUY2 SPA_TYPE_VIDEO_FORMAT_BASE "YUY2" +#define SPA_TYPE_VIDEO_FORMAT__UYVY SPA_TYPE_VIDEO_FORMAT_BASE "UYVY" +#define SPA_TYPE_VIDEO_FORMAT__AYUV SPA_TYPE_VIDEO_FORMAT_BASE "AYUV" +#define SPA_TYPE_VIDEO_FORMAT__RGBx SPA_TYPE_VIDEO_FORMAT_BASE "RGBx" +#define SPA_TYPE_VIDEO_FORMAT__BGRx SPA_TYPE_VIDEO_FORMAT_BASE "BGRx" +#define SPA_TYPE_VIDEO_FORMAT__xRGB SPA_TYPE_VIDEO_FORMAT_BASE "xRGB" +#define SPA_TYPE_VIDEO_FORMAT__xBGR SPA_TYPE_VIDEO_FORMAT_BASE "xBGR" +#define SPA_TYPE_VIDEO_FORMAT__RGBA SPA_TYPE_VIDEO_FORMAT_BASE "RGBA" +#define SPA_TYPE_VIDEO_FORMAT__BGRA SPA_TYPE_VIDEO_FORMAT_BASE "BGRA" +#define SPA_TYPE_VIDEO_FORMAT__ARGB SPA_TYPE_VIDEO_FORMAT_BASE "ARGB" +#define SPA_TYPE_VIDEO_FORMAT__ABGR SPA_TYPE_VIDEO_FORMAT_BASE "ABGR" +#define SPA_TYPE_VIDEO_FORMAT__RGB SPA_TYPE_VIDEO_FORMAT_BASE "RGB" +#define SPA_TYPE_VIDEO_FORMAT__BGR SPA_TYPE_VIDEO_FORMAT_BASE "BGR" +#define SPA_TYPE_VIDEO_FORMAT__Y41B SPA_TYPE_VIDEO_FORMAT_BASE "Y41B" +#define SPA_TYPE_VIDEO_FORMAT__Y42B SPA_TYPE_VIDEO_FORMAT_BASE "Y42B" +#define SPA_TYPE_VIDEO_FORMAT__YVYU SPA_TYPE_VIDEO_FORMAT_BASE "YVYU" +#define SPA_TYPE_VIDEO_FORMAT__Y444 SPA_TYPE_VIDEO_FORMAT_BASE "Y444" +#define SPA_TYPE_VIDEO_FORMAT__v210 SPA_TYPE_VIDEO_FORMAT_BASE "v210" +#define SPA_TYPE_VIDEO_FORMAT__v216 SPA_TYPE_VIDEO_FORMAT_BASE "v216" +#define SPA_TYPE_VIDEO_FORMAT__NV12 SPA_TYPE_VIDEO_FORMAT_BASE "NV12" +#define SPA_TYPE_VIDEO_FORMAT__NV21 SPA_TYPE_VIDEO_FORMAT_BASE "NV21" +#define SPA_TYPE_VIDEO_FORMAT__GRAY8 SPA_TYPE_VIDEO_FORMAT_BASE "GRAY8" +#define SPA_TYPE_VIDEO_FORMAT__GRAY16_BE SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_BE" +#define SPA_TYPE_VIDEO_FORMAT__GRAY16_LE SPA_TYPE_VIDEO_FORMAT_BASE "GRAY16_LE" +#define SPA_TYPE_VIDEO_FORMAT__v308 SPA_TYPE_VIDEO_FORMAT_BASE "v308" +#define SPA_TYPE_VIDEO_FORMAT__RGB16 SPA_TYPE_VIDEO_FORMAT_BASE "RGB16" +#define SPA_TYPE_VIDEO_FORMAT__BGR16 SPA_TYPE_VIDEO_FORMAT_BASE "BGR16" +#define SPA_TYPE_VIDEO_FORMAT__RGB15 SPA_TYPE_VIDEO_FORMAT_BASE "RGB15" +#define SPA_TYPE_VIDEO_FORMAT__BGR15 SPA_TYPE_VIDEO_FORMAT_BASE "BGR15" +#define SPA_TYPE_VIDEO_FORMAT__UYVP SPA_TYPE_VIDEO_FORMAT_BASE "UYVP" +#define SPA_TYPE_VIDEO_FORMAT__A420 SPA_TYPE_VIDEO_FORMAT_BASE "A420" +#define SPA_TYPE_VIDEO_FORMAT__RGB8P SPA_TYPE_VIDEO_FORMAT_BASE "RGB8P" +#define SPA_TYPE_VIDEO_FORMAT__YUV9 SPA_TYPE_VIDEO_FORMAT_BASE "YUV9" +#define SPA_TYPE_VIDEO_FORMAT__YVU9 SPA_TYPE_VIDEO_FORMAT_BASE "YVU9" +#define SPA_TYPE_VIDEO_FORMAT__IYU1 SPA_TYPE_VIDEO_FORMAT_BASE "IYU1" +#define SPA_TYPE_VIDEO_FORMAT__ARGB64 SPA_TYPE_VIDEO_FORMAT_BASE "ARGB64" +#define SPA_TYPE_VIDEO_FORMAT__AYUV64 SPA_TYPE_VIDEO_FORMAT_BASE "AYUV64" +#define SPA_TYPE_VIDEO_FORMAT__r210 SPA_TYPE_VIDEO_FORMAT_BASE "r210" +#define SPA_TYPE_VIDEO_FORMAT__I420_10BE SPA_TYPE_VIDEO_FORMAT_BASE "I420_10BE" +#define SPA_TYPE_VIDEO_FORMAT__I420_10LE SPA_TYPE_VIDEO_FORMAT_BASE "I420_10LE" +#define SPA_TYPE_VIDEO_FORMAT__I422_10BE SPA_TYPE_VIDEO_FORMAT_BASE "I422_10BE" +#define SPA_TYPE_VIDEO_FORMAT__I422_10LE SPA_TYPE_VIDEO_FORMAT_BASE "I422_10LE" +#define SPA_TYPE_VIDEO_FORMAT__Y444_10BE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10BE" +#define SPA_TYPE_VIDEO_FORMAT__Y444_10LE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_10LE" +#define SPA_TYPE_VIDEO_FORMAT__GBR SPA_TYPE_VIDEO_FORMAT_BASE "GBR" +#define SPA_TYPE_VIDEO_FORMAT__GBR_10BE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10BE" +#define SPA_TYPE_VIDEO_FORMAT__GBR_10LE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_10LE" +#define SPA_TYPE_VIDEO_FORMAT__NV16 SPA_TYPE_VIDEO_FORMAT_BASE "NV16" +#define SPA_TYPE_VIDEO_FORMAT__NV24 SPA_TYPE_VIDEO_FORMAT_BASE "NV24" +#define SPA_TYPE_VIDEO_FORMAT__NV12_64Z32 SPA_TYPE_VIDEO_FORMAT_BASE "NV12_64Z32" +#define SPA_TYPE_VIDEO_FORMAT__A420_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A420_10BE" +#define SPA_TYPE_VIDEO_FORMAT__A420_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A420_10LE" +#define SPA_TYPE_VIDEO_FORMAT__A422_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A422_10BE" +#define SPA_TYPE_VIDEO_FORMAT__A422_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A422_10LE" +#define SPA_TYPE_VIDEO_FORMAT__A444_10BE SPA_TYPE_VIDEO_FORMAT_BASE "A444_10BE" +#define SPA_TYPE_VIDEO_FORMAT__A444_10LE SPA_TYPE_VIDEO_FORMAT_BASE "A444_10LE" +#define SPA_TYPE_VIDEO_FORMAT__NV61 SPA_TYPE_VIDEO_FORMAT_BASE "NV61" +#define SPA_TYPE_VIDEO_FORMAT__P010_10BE SPA_TYPE_VIDEO_FORMAT_BASE "P010_10BE" +#define SPA_TYPE_VIDEO_FORMAT__P010_10LE SPA_TYPE_VIDEO_FORMAT_BASE "P010_10LE" +#define SPA_TYPE_VIDEO_FORMAT__IYU2 SPA_TYPE_VIDEO_FORMAT_BASE "IYU2" +#define SPA_TYPE_VIDEO_FORMAT__VYUY SPA_TYPE_VIDEO_FORMAT_BASE "VYUY" +#define SPA_TYPE_VIDEO_FORMAT__GBRA SPA_TYPE_VIDEO_FORMAT_BASE "GBRA" +#define SPA_TYPE_VIDEO_FORMAT__GBRA_10BE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10BE" +#define SPA_TYPE_VIDEO_FORMAT__GBRA_10LE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_10LE" +#define SPA_TYPE_VIDEO_FORMAT__GBR_12BE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12BE" +#define SPA_TYPE_VIDEO_FORMAT__GBR_12LE SPA_TYPE_VIDEO_FORMAT_BASE "GBR_12LE" +#define SPA_TYPE_VIDEO_FORMAT__GBRA_12BE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12BE" +#define SPA_TYPE_VIDEO_FORMAT__GBRA_12LE SPA_TYPE_VIDEO_FORMAT_BASE "GBRA_12LE" +#define SPA_TYPE_VIDEO_FORMAT__I420_12BE SPA_TYPE_VIDEO_FORMAT_BASE "I420_12BE" +#define SPA_TYPE_VIDEO_FORMAT__I420_12LE SPA_TYPE_VIDEO_FORMAT_BASE "I420_12LE" +#define SPA_TYPE_VIDEO_FORMAT__I422_12BE SPA_TYPE_VIDEO_FORMAT_BASE "I422_12BE" +#define SPA_TYPE_VIDEO_FORMAT__I422_12LE SPA_TYPE_VIDEO_FORMAT_BASE "I422_12LE" +#define SPA_TYPE_VIDEO_FORMAT__Y444_12BE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12BE" +#define SPA_TYPE_VIDEO_FORMAT__Y444_12LE SPA_TYPE_VIDEO_FORMAT_BASE "Y444_12LE" /** * spa_video_flags: diff --git a/spa/plugins/videotestsrc/draw.c b/spa/plugins/videotestsrc/draw.c index d4707d8b2..98f14dd50 100644 --- a/spa/plugins/videotestsrc/draw.c +++ b/spa/plugins/videotestsrc/draw.c @@ -17,285 +17,264 @@ * Boston, MA 02110-1301, USA. */ -typedef enum -{ - GRAY = 0, - YELLOW, - CYAN, - GREEN, - MAGENTA, - RED, - BLUE, - BLACK, - NEG_I, - WHITE, - POS_Q, - DARK_BLACK, - LIGHT_BLACK, - N_COLORS +typedef enum { + GRAY = 0, + YELLOW, + CYAN, + GREEN, + MAGENTA, + RED, + BLUE, + BLACK, + NEG_I, + WHITE, + POS_Q, + DARK_BLACK, + LIGHT_BLACK, + N_COLORS } Color; typedef struct _Pixel Pixel; -struct _Pixel -{ - unsigned char R; - unsigned char G; - unsigned char B; - unsigned char Y; - unsigned char U; - unsigned char V; +struct _Pixel { + unsigned char R; + unsigned char G; + unsigned char B; + unsigned char Y; + unsigned char U; + unsigned char V; }; -static Pixel colors[N_COLORS] = -{ - {191, 191, 191, 0, 0, 0}, /* GRAY */ - {191, 191, 0, 0, 0, 0}, /* YELLOW */ - {0, 191, 191, 0, 0, 0}, /* CYAN */ - {0, 191, 0, 0, 0, 0}, /* GREEN */ - {191, 0, 191, 0, 0, 0}, /* MAGENTA */ - {191, 0, 0, 0, 0, 0}, /* RED */ - {0, 0, 191, 0, 0, 0}, /* BLUE */ - {19, 19, 19, 0, 0, 0}, /* BLACK */ - {0, 33, 76, 0, 0, 0}, /* NEGATIVE I */ - {255, 255, 255, 0, 0, 0}, /* WHITE */ - {49, 0, 107, 0, 0, 0}, /* POSITIVE Q */ - {9, 9, 9, 0, 0, 0}, /* DARK BLACK */ - {29, 29, 29, 0, 0, 0}, /* LIGHT BLACK */ +static Pixel colors[N_COLORS] = { + {191, 191, 191, 0, 0, 0}, /* GRAY */ + {191, 191, 0, 0, 0, 0}, /* YELLOW */ + {0, 191, 191, 0, 0, 0}, /* CYAN */ + {0, 191, 0, 0, 0, 0}, /* GREEN */ + {191, 0, 191, 0, 0, 0}, /* MAGENTA */ + {191, 0, 0, 0, 0, 0}, /* RED */ + {0, 0, 191, 0, 0, 0}, /* BLUE */ + {19, 19, 19, 0, 0, 0}, /* BLACK */ + {0, 33, 76, 0, 0, 0}, /* NEGATIVE I */ + {255, 255, 255, 0, 0, 0}, /* WHITE */ + {49, 0, 107, 0, 0, 0}, /* POSITIVE Q */ + {9, 9, 9, 0, 0, 0}, /* DARK BLACK */ + {29, 29, 29, 0, 0, 0}, /* LIGHT BLACK */ }; + /* YUV values are computed in init_colors() */ typedef struct _DrawingData DrawingData; -typedef void (*DrawPixelFunc) (DrawingData *dd, - int x, - Pixel *pixel); +typedef void (*DrawPixelFunc) (DrawingData * dd, int x, Pixel * pixel); struct _DrawingData { - char* line; - int width; - int height; - int stride; - DrawPixelFunc draw_pixel; + char *line; + int width; + int height; + int stride; + DrawPixelFunc draw_pixel; }; -static inline void -update_yuv (Pixel *pixel) +static inline void update_yuv(Pixel * pixel) { - uint16_t y, u, v; + uint16_t y, u, v; - /* see https://en.wikipedia.org/wiki/YUV#Studio_swing_for_BT.601 */ + /* see https://en.wikipedia.org/wiki/YUV#Studio_swing_for_BT.601 */ - y = 76 * pixel->R + 150 * pixel->G + 29 * pixel->B; - u = -43 * pixel->R - 84 * pixel->G + 127 * pixel->B; - v = 127 * pixel->R - 106 * pixel->G - 21 * pixel->B; + y = 76 * pixel->R + 150 * pixel->G + 29 * pixel->B; + u = -43 * pixel->R - 84 * pixel->G + 127 * pixel->B; + v = 127 * pixel->R - 106 * pixel->G - 21 * pixel->B; - y = (y + 128) >> 8; - u = (u + 128) >> 8; - v = (v + 128) >> 8; + y = (y + 128) >> 8; + u = (u + 128) >> 8; + v = (v + 128) >> 8; - pixel->Y = y; - pixel->U = u + 128; - pixel->V = v + 128; + pixel->Y = y; + pixel->U = u + 128; + pixel->V = v + 128; } -static void -init_colors (void) +static void init_colors(void) { - int i; + int i; - if (colors[WHITE].Y != 0) { - /* already computed */ - return; - } + if (colors[WHITE].Y != 0) { + /* already computed */ + return; + } - for (i = 0; i < N_COLORS; i++) { - update_yuv (&colors[i]); - } + for (i = 0; i < N_COLORS; i++) { + update_yuv(&colors[i]); + } } -static void -draw_pixel_rgb (DrawingData *dd, int x, Pixel *color) +static void draw_pixel_rgb(DrawingData * dd, int x, Pixel * color) { - dd->line[3 * x + 0] = color->R; - dd->line[3 * x + 1] = color->G; - dd->line[3 * x + 2] = color->B; + dd->line[3 * x + 0] = color->R; + dd->line[3 * x + 1] = color->G; + dd->line[3 * x + 2] = color->B; } -static void -draw_pixel_uyvy (DrawingData *dd, int x, Pixel *color) +static void draw_pixel_uyvy(DrawingData * dd, int x, Pixel * color) { - if (x & 1) { - /* odd pixel */ - dd->line[2 * (x - 1) + 3] = color->Y; - } else { - /* even pixel */ - dd->line[2 * x + 0] = color->U; - dd->line[2 * x + 1] = color->Y; - dd->line[2 * x + 2] = color->V; - } + if (x & 1) { + /* odd pixel */ + dd->line[2 * (x - 1) + 3] = color->Y; + } else { + /* even pixel */ + dd->line[2 * x + 0] = color->U; + dd->line[2 * x + 1] = color->Y; + dd->line[2 * x + 2] = color->V; + } } -static int -drawing_data_init (DrawingData *dd, - struct impl *this, - char* data) +static int drawing_data_init(DrawingData * dd, struct impl *this, char *data) { - struct spa_video_info *format = &this->current_format; - struct spa_rectangle *size = &format->info.raw.size; + struct spa_video_info *format = &this->current_format; + struct spa_rectangle *size = &format->info.raw.size; - if ((format->media_type != this->type.media_type.video) || - (format->media_subtype != this->type.media_subtype.raw)) - return SPA_RESULT_NOT_IMPLEMENTED; + if ((format->media_type != this->type.media_type.video) || + (format->media_subtype != this->type.media_subtype.raw)) + return SPA_RESULT_NOT_IMPLEMENTED; - if (format->info.raw.format == this->type.video_format.RGB) { - dd->draw_pixel = draw_pixel_rgb; - } - else if (format->info.raw.format == this->type.video_format.UYVY) { - dd->draw_pixel = draw_pixel_uyvy; - } - else - return SPA_RESULT_NOT_IMPLEMENTED; + if (format->info.raw.format == this->type.video_format.RGB) { + dd->draw_pixel = draw_pixel_rgb; + } else if (format->info.raw.format == this->type.video_format.UYVY) { + dd->draw_pixel = draw_pixel_uyvy; + } else + return SPA_RESULT_NOT_IMPLEMENTED; - dd->line = data; - dd->width = size->width; - dd->height = size->height; - dd->stride = this->stride; + dd->line = data; + dd->width = size->width; + dd->height = size->height; + dd->stride = this->stride; - return SPA_RESULT_OK; + return SPA_RESULT_OK; } -static inline void -draw_pixels (DrawingData *dd, - int offset, - Color color, - int length) +static inline void draw_pixels(DrawingData * dd, int offset, Color color, int length) { - int x; + int x; - for (x = offset; x < offset + length; x++) { - dd->draw_pixel (dd, x, &colors[color]); - } + for (x = offset; x < offset + length; x++) { + dd->draw_pixel(dd, x, &colors[color]); + } } -static inline void -next_line (DrawingData *dd) +static inline void next_line(DrawingData * dd) { - dd->line += dd->stride; + dd->line += dd->stride; } -static void -draw_smpte_snow (DrawingData *dd) +static void draw_smpte_snow(DrawingData * dd) { - int h, w; - int y1, y2; - int i, j; + int h, w; + int y1, y2; + int i, j; - w = dd->width; - h = dd->height; - y1 = 2 * h / 3; - y2 = 3 * h / 4; + w = dd->width; + h = dd->height; + y1 = 2 * h / 3; + y2 = 3 * h / 4; - for (i = 0; i < y1; i++) { - for (j = 0; j < 7; j++) { - int x1 = j * w / 7; - int x2 = (j + 1) * w / 7; - draw_pixels (dd, x1, j, x2 - x1); - } - next_line (dd); - } + for (i = 0; i < y1; i++) { + for (j = 0; j < 7; j++) { + int x1 = j * w / 7; + int x2 = (j + 1) * w / 7; + draw_pixels(dd, x1, j, x2 - x1); + } + next_line(dd); + } - for (i = y1; i < y2; i++) { - for (j = 0; j < 7; j++) { - int x1 = j * w / 7; - int x2 = (j + 1) * w / 7; - Color c = (j & 1) ? BLACK : BLUE - j; + for (i = y1; i < y2; i++) { + for (j = 0; j < 7; j++) { + int x1 = j * w / 7; + int x2 = (j + 1) * w / 7; + Color c = (j & 1) ? BLACK : BLUE - j; - draw_pixels (dd, x1, c, x2 - x1); - } - next_line (dd); - } + draw_pixels(dd, x1, c, x2 - x1); + } + next_line(dd); + } - for (i = y2; i < h; i++) { - int x = 0; + for (i = y2; i < h; i++) { + int x = 0; - /* negative I */ - draw_pixels (dd, x, NEG_I, w / 6); - x += w / 6; + /* negative I */ + draw_pixels(dd, x, NEG_I, w / 6); + x += w / 6; - /* white */ - draw_pixels (dd, x, WHITE, w / 6); - x += w / 6; + /* white */ + draw_pixels(dd, x, WHITE, w / 6); + x += w / 6; - /* positive Q */ - draw_pixels (dd, x, POS_Q, w / 6); - x += w / 6; + /* positive Q */ + draw_pixels(dd, x, POS_Q, w / 6); + x += w / 6; - /* pluge */ - draw_pixels (dd, x, DARK_BLACK, w / 12); - x += w / 12; - draw_pixels (dd, x, BLACK, w / 12); - x += w / 12; - draw_pixels (dd, x, LIGHT_BLACK, w / 12); - x += w / 12; + /* pluge */ + draw_pixels(dd, x, DARK_BLACK, w / 12); + x += w / 12; + draw_pixels(dd, x, BLACK, w / 12); + x += w / 12; + draw_pixels(dd, x, LIGHT_BLACK, w / 12); + x += w / 12; - /* war of the ants (a.k.a. snow) */ - for (j = x; j < w; j++) { - Pixel p; - unsigned char r = rand (); + /* war of the ants (a.k.a. snow) */ + for (j = x; j < w; j++) { + Pixel p; + unsigned char r = rand(); - p.R = r; - p.G = r; - p.B = r; - update_yuv (&p); - dd->draw_pixel (dd, j, &p); - } + p.R = r; + p.G = r; + p.B = r; + update_yuv(&p); + dd->draw_pixel(dd, j, &p); + } - next_line (dd); - } + next_line(dd); + } } -static void -draw_snow (DrawingData *dd) +static void draw_snow(DrawingData * dd) { - int x, y; + int x, y; - for (y = 0; y < dd->height; y++) { - for (x = 0; x < dd->width; x++) { - Pixel p; - unsigned char r = rand (); + for (y = 0; y < dd->height; y++) { + for (x = 0; x < dd->width; x++) { + Pixel p; + unsigned char r = rand(); - p.R = r; - p.G = r; - p.B = r; - update_yuv (&p); - dd->draw_pixel (dd, x, &p); - } + p.R = r; + p.G = r; + p.B = r; + update_yuv(&p); + dd->draw_pixel(dd, x, &p); + } - next_line (dd); - } + next_line(dd); + } } -static int -draw (struct impl *this, char *data) +static int draw(struct impl *this, char *data) { - DrawingData dd; - int res; - uint32_t pattern; + DrawingData dd; + int res; + uint32_t pattern; - init_colors (); + init_colors(); - res = drawing_data_init (&dd, this, data); - if (res != SPA_RESULT_OK) - return res; + res = drawing_data_init(&dd, this, data); + if (res != SPA_RESULT_OK) + return res; - pattern = this->props.pattern; - if (pattern == this->type.pattern_smpte_snow) - draw_smpte_snow (&dd); - else if (pattern == this->type.pattern_snow) - draw_snow (&dd); - else - return SPA_RESULT_NOT_IMPLEMENTED; + pattern = this->props.pattern; + if (pattern == this->type.pattern_smpte_snow) + draw_smpte_snow(&dd); + else if (pattern == this->type.pattern_snow) + draw_snow(&dd); + else + return SPA_RESULT_NOT_IMPLEMENTED; - return SPA_RESULT_OK; + return SPA_RESULT_OK; } diff --git a/spa/plugins/videotestsrc/videotestsrc.c b/spa/plugins/videotestsrc/videotestsrc.c index 1c7f90212..ba8aa7182 100644 --- a/spa/plugins/videotestsrc/videotestsrc.c +++ b/spa/plugins/videotestsrc/videotestsrc.c @@ -150,18 +150,18 @@ static void reset_props(struct impl *this, struct props *props) props->pattern = this->type.DEFAULT_PATTERN; } -#define PROP(f,key,type,...) \ - SPA_POD_PROP (f,key,0,type,1,__VA_ARGS__) -#define PROP_MM(f,key,type,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) -#define PROP_U_MM(f,key,type,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ - SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) -#define PROP_EN(f,key,type,n,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) -#define PROP_U_EN(f,key,type,n,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ - SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) +#define PROP(f,key,type,...) \ + SPA_POD_PROP (f,key,0,type,1,__VA_ARGS__) +#define PROP_MM(f,key,type,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) +#define PROP_U_MM(f,key,type,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ + SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) +#define PROP_EN(f,key,type,n,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) +#define PROP_U_EN(f,key,type,n,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ + SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) static int impl_node_get_props(struct spa_node *node, struct spa_props **props) { diff --git a/spa/plugins/volume/volume.c b/spa/plugins/volume/volume.c index ef40f6bd2..67a171bcc 100644 --- a/spa/plugins/volume/volume.c +++ b/spa/plugins/volume/volume.c @@ -133,16 +133,16 @@ static void reset_props(struct props *props) props->mute = DEFAULT_MUTE; } -#define PROP(f,key,type,...) \ - SPA_POD_PROP (f,key,0,type,1,__VA_ARGS__) -#define PROP_MM(f,key,type,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) -#define PROP_U_MM(f,key,type,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ - SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) -#define PROP_U_EN(f,key,type,n,...) \ - SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ - SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) +#define PROP(f,key,type,...) \ + SPA_POD_PROP (f,key,0,type,1,__VA_ARGS__) +#define PROP_MM(f,key,type,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) +#define PROP_U_MM(f,key,type,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ + SPA_POD_PROP_RANGE_MIN_MAX,type,3,__VA_ARGS__) +#define PROP_U_EN(f,key,type,n,...) \ + SPA_POD_PROP (f,key,SPA_POD_PROP_FLAG_UNSET | \ + SPA_POD_PROP_RANGE_ENUM,type,n,__VA_ARGS__) static int impl_node_get_props(struct spa_node *node, struct spa_props **props)