mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "impl-node: improve the node unprepare function"

Browse source 
This reverts commit 2891e579a1.

This seems to cause regresssions with nodes xrun etc.

See #4893
This commit is contained in:
Wim Taymans 2025-09-15 10:15:01 +02:00
parent 9df770eb16
commit f81bb670c3
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -240,21 +240,17 @@ do_node_unprepare(struct spa_loop *loop, bool async, uint32_t seq,
{ {
struct pw_impl_node *this = user_data; struct pw_impl_node *this = user_data;
struct pw_node_target *t; struct pw_node_target *t;
int old_state, new_state; int old_state;
uint64_t trigger = 0; uint64_t trigger = 0;
pw_log_trace("%p: unprepare %d remote:%d exported:%d", this, this->rt.prepared, pw_log_trace("%p: unprepare %d remote:%d exported:%d", this, this->rt.prepared,
this->remote, this->exported); this->remote, this->exported);
/* The remote client will INACTIVE itself and remove itself from the loop to avoid /* We mark ourself as finished now, this will avoid going further into the process loop
* being scheduled. * in case our fd was ready (removing ourselfs from the loop should avoid that as well).
* The server will mark remote nodes as FINISHED. This will make sure the node will not * If we were supposed to be scheduled make sure we continue the graph for the peers we
* trigger the peers anymore when it will stop because we do that on the server side * were supposed to trigger */
* because the client might simply be dead and not able to resume anything. old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, PW_NODE_ACTIVATION_INACTIVE);
*/
new_state = this->remote ? PW_NODE_ACTIVATION_FINISHED : PW_NODE_ACTIVATION_INACTIVE;
old_state = SPA_ATOMIC_XCHG(this->rt.target.activation->status, new_state);
if (PW_NODE_ACTIVATION_PENDING_TRIGGER(old_state)) if (PW_NODE_ACTIVATION_PENDING_TRIGGER(old_state))
trigger = get_time_ns(this->rt.target.system); trigger = get_time_ns(this->rt.target.system);