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

bluez5: media-sink: cleanup ISO rate matching

Browse source 
Move accounting for pending ISO packet to the reference time.  Make sure
rate matching is reset on start, and reset matching on resync properly.

Allow resync on first cycle, ok since iso_io->now is valid immediately.
This commit is contained in:
Pauli Virtanen 2025-10-11 18:53:31 +03:00 • committed by Wim Taymans
parent 4e3a5d9e6f
commit 91702975f7
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/bluez5/media-sink.c
View file

@ -652,6 +652,9 @@ static uint64_t get_reference_time(struct impl *this, uint64_t *duration_ns_ret)
if (this->process_rate_diff > 0)
t = (int64_t)(t / this->process_rate_diff);
if (this->transport && this->transport->iso_io && this->transport->iso_io->size)
t -= this->transport->iso_io->duration;
return this->process_time + t;
}
@ -1233,6 +1236,7 @@ static void media_iso_rate_match(struct impl *this)
if (this->resync || !this->position) {
spa_bt_rate_control_init(&port->ratectl, 0);
setup_matching(this);
return;
}
@ -1249,8 +1253,6 @@ static void media_iso_rate_match(struct impl *this)
*/
ref_time = get_reference_time(this, &duration_ns);
if (iso_io->size)
ref_time -= iso_io->duration;
value = (int64_t)iso_io->now - (int64_t)ref_time;
if (this->process_rate)
@ -1644,7 +1646,7 @@ static int transport_start(struct impl *this)
spa_loop_add_source(this->data_loop, &this->flush_source);
}
this->resync = RESYNC_CYCLES;
this->resync = 0;
this->flush_pending = false;
this->iso_pending = false;
@ -1689,6 +1691,7 @@ fail:
static int do_start(struct impl *this)
{
struct port *port = &this->port;
int res;
if (this->started)
@ -1717,6 +1720,7 @@ static int do_start(struct impl *this)
this->source.rmask = 0;
spa_loop_add_source(this->data_loop, &this->source);
spa_bt_rate_control_init(&port->ratectl, 0);
setup_matching(this);
set_timers(this);