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

node: move segment owner into the io area

Browse source 
This makes it easier to keep track of who is responsible for what.
Also remove the valid fields and move them to flags in the segment
info. That way, the owner can update the flags without having to
worry about concurrency.

Keep separate info for the reposition information. We need to do this
to make it possible to seek in other formats than the frame.

Clear out the owner field when the node is destroyed or removed from
the driver.
This commit is contained in:
Wim Taymans 2019-08-29 18:21:32 +02:00
parent a910deb0fc
commit 8afa5b0ada
5 changed files with 59 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/private.h
View file

@ -368,16 +368,13 @@ struct pw_node_activation {
/* for drivers */
struct spa_io_position position;
uint32_t segment_master[32]; /* node id that will update extra segment info,
* There can be one master for each segment
* bitfield. 0 means no master for the
* given segment info */
uint64_t sync_timeout; /* sync timeout in nanoseconds
* position goes to RUNNING without waiting any
* longer for sync clients. */
uint64_t sync_left; /* number of cycles before timeout */
float cpu_load[3]; /* averaged over short, medium, long time */
uint32_t xrun_count; /* number of xruns */
uint64_t xrun_time; /* time of last xrun in microseconds */
@ -387,7 +384,6 @@ struct pw_node_activation {
struct {
uint32_t seq;
#define PW_NODE_ACTIVATION_UPDATE_COMMAND (1<<0)
#define PW_NODE_ACTIVATION_UPDATE_SEGMENT (1<<1)
#define PW_NODE_ACTIVATION_UPDATE_REPOSITION (1<<2)
#define PW_NODE_ACTIVATION_UPDATE_FLUSH (1<<3) /* flush out current segments and immediately
* start the new one */
@ -395,10 +391,9 @@ struct pw_node_activation {
#define PW_NODE_ACTIVATION_COMMAND_START 0
#define PW_NODE_ACTIVATION_COMMAND_STOP 1
uint32_t command; /* when change_mask & PW_NODE_ACTIVATION_UPDATE_COMMAND */
struct spa_io_segment reposition; /* reposition information */
struct spa_io_segment segment; /* update for the extra segment info
* fields. When REPOSITION update, the segment
* position field will contain the desired
* new position. */
* fields. */
} pending;
};