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

impl-node: don't overwrite node state when finished

Browse source 
Don't just overwrite the state with FINISHED but only do this when the
state was AWAKE.

The server might already have started a new cycle and placed
NOT_TRIGGERED as the state. Or, it might have changed the state to
INACTIVE. In all cases, we should not overwrite the state unless it was
AWAKE and we should only trigger peers when we were AWAKE.

This fixes some spurious xruns and glitches.

See #4182
This commit is contained in:
Wim Taymans 2024-08-07 16:01:06 +02:00
parent 70a7bae5d7
commit 3376dff72b
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pipewire/impl-node.c
View file

@ -1442,7 +1442,8 @@ static inline int process_node(void *data, uint64_t nsec)
struct pw_impl_port *p;
struct pw_node_activation *a = this->rt.target.activation;
struct spa_system *data_system = this->rt.target.system;
int status, old_status;
int status;
bool was_awake;
if (!SPA_ATOMIC_CAS(a->status,
PW_NODE_ACTIVATION_TRIGGERED,
@ -1481,7 +1482,9 @@ static inline int process_node(void *data, uint64_t nsec)
a->state[0].status = status;
nsec = get_time_ns(data_system);
old_status = SPA_ATOMIC_XCHG(a->status, PW_NODE_ACTIVATION_FINISHED);
was_awake = SPA_ATOMIC_CAS(a->status,
PW_NODE_ACTIVATION_AWAKE,
PW_NODE_ACTIVATION_FINISHED);
a->finish_time = nsec;
pw_log_trace_fp("%p: finished status:%d %"PRIu64, this, status, nsec);
@ -1489,7 +1492,7 @@ static inline int process_node(void *data, uint64_t nsec)
/* we don't need to trigger targets when the node was driving the
* graph because that means we finished the graph. */
if (SPA_LIKELY(!this->driving)) {
if ((!this->async || a->server_version < 1) && old_status == PW_NODE_ACTIVATION_AWAKE)
if ((!this->async || a->server_version < 1) && was_awake)
trigger_targets(this, status, nsec);
} else {
/* calculate CPU time when finished */