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

context: handle force quantum like force_rate

Browse source 
Make sure we don't end looping when doing a reconfigure by using the
same logic as the force rate.
This commit is contained in:
Wim Taymans 2023-09-20 16:58:12 +02:00
parent 9bfe24d62f
commit cc0eb1ba0d
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/pipewire/context.c
View file

@ -1306,9 +1306,9 @@ again:
struct spa_fraction latency = SPA_FRACTION(0, 0); struct spa_fraction latency = SPA_FRACTION(0, 0);
struct spa_fraction max_latency = SPA_FRACTION(0, 0); struct spa_fraction max_latency = SPA_FRACTION(0, 0);
struct spa_fraction rate = SPA_FRACTION(0, 0); struct spa_fraction rate = SPA_FRACTION(0, 0);
uint32_t quantum, target_rate, current_rate; uint32_t target_quantum, target_rate, current_rate, current_quantum;
uint64_t quantum_stamp = 0, rate_stamp = 0; uint64_t quantum_stamp = 0, rate_stamp = 0;
bool force_rate, force_quantum, restore_rate = false; bool force_rate, force_quantum, restore_rate = false, restore_quantum = false;
bool do_reconfigure = false, was_target_pending; bool do_reconfigure = false, was_target_pending;
const uint32_t *node_rates; const uint32_t *node_rates;
uint32_t node_n_rates, node_def_rate; uint32_t node_n_rates, node_def_rate;
@ -1387,6 +1387,12 @@ again:
pw_log_info("(%s-%u) restore rate", n->name, n->info.id); pw_log_info("(%s-%u) restore rate", n->name, n->info.id);
restore_rate = true; restore_rate = true;
} }
if (n->forced_quantum && !force_quantum && n->runnable) {
/* A node that was forced to a quantum but is no longer being
* forced can restore its quantum */
pw_log_info("(%s-%u) restore quantum", n->name, n->info.id);
restore_quantum = true;
}
if (force_quantum) if (force_quantum)
lock_quantum = false; lock_quantum = false;
@ -1456,22 +1462,29 @@ again:
node_max_quantum = tmp; node_max_quantum = tmp;
} }
quantum = node_def_quantum; current_quantum = n->target_quantum;
if (!restore_quantum &&
(lock_quantum || n->reconfigure || !running ||
(!force_quantum && (n->info.state > PW_NODE_STATE_IDLE))))
target_quantum = current_quantum;
else {
target_quantum = node_def_quantum;
if (latency.denom != 0) if (latency.denom != 0)
quantum = (latency.num * current_rate / latency.denom); target_quantum = (latency.num * current_rate / latency.denom);
quantum = SPA_CLAMP(quantum, node_min_quantum, node_max_quantum); target_quantum = SPA_CLAMP(target_quantum, node_min_quantum, node_max_quantum);
quantum = SPA_MIN(quantum, lim_quantum); target_quantum = SPA_MIN(target_quantum, lim_quantum);
if (settings->clock_power_of_two_quantum) if (settings->clock_power_of_two_quantum)
quantum = flp2(quantum); target_quantum = flp2(target_quantum);
}
if (running && quantum != n->target_quantum && !lock_quantum) { if (target_quantum != current_quantum) {
pw_log_info("(%s-%u) new quantum:%"PRIu64"->%u", pw_log_info("(%s-%u) new quantum:%"PRIu64"->%u",
n->name, n->info.id, n->name, n->info.id,
n->target_quantum, n->target_quantum,
quantum); target_quantum);
/* this is the new pending quantum */ /* this is the new pending quantum */
n->target_quantum = quantum; n->target_quantum = target_quantum;
n->forced_quantum = force_quantum; n->forced_quantum = force_quantum;
n->target_pending = true; n->target_pending = true;
@ -1507,7 +1520,7 @@ again:
} }
pw_log_debug("%p: driver %p running:%d runnable:%d quantum:%u rate:%u (%"PRIu64"/%u)'%s'", pw_log_debug("%p: driver %p running:%d runnable:%d quantum:%u rate:%u (%"PRIu64"/%u)'%s'",
context, n, running, n->runnable, quantum, target_rate, context, n, running, n->runnable, target_quantum, target_rate,
n->rt.position->clock.target_duration, n->rt.position->clock.target_duration,
n->rt.position->clock.target_rate.denom, n->name); n->rt.position->clock.target_rate.denom, n->name);