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: Snap timer to ASHA connection interval

Browse source 
For ASHA stereo, the timer for flushing packets on both sides of a
pair should be as closed to each other as possible.

Also set seqnum before first flush so other side sends the correct
packets at the start.
This commit is contained in:
Arun Raghavan 2025-04-21 06:49:42 -04:00 • committed by Wim Taymans
parent 4d22296d3a
commit efb4a1df25
1 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,7 @@ struct spa_bt_asha {
uint8_t seqnum_pending;
uint64_t ref_t0;
uint64_t ref_timer;
uint64_t prev_time;
uint64_t next_time;
@ -354,12 +355,23 @@ static int set_asha_timeout(struct impl *this, uint64_t time)
this->asha->timerfd, SPA_FD_TIMER_ABSTIME, &ts, NULL);
}
static int set_asha_timer(struct impl *this)
static int set_asha_timer(struct impl *this, bool snap)
{
struct timespec now;
uint64_t now_ns, offset = 0;
spa_system_clock_gettime(this->data_system, CLOCK_MONOTONIC, &now);
this->asha->prev_time = this->asha->next_time = SPA_TIMESPEC_TO_NSEC(&now);
now_ns = SPA_TIMESPEC_TO_NSEC(&now);
if (snap) {
/* If requested, snap our wakeup time to a 20ms interval */
offset = (now_ns - this->asha->ref_timer) % ASHA_CONN_INTERVAL;
} else {
/* Else, remember when we started this timer so the other side can use it */
this->asha->ref_timer = now_ns;
}
this->asha->prev_time = this->asha->next_time = now_ns + offset;
return set_asha_timeout(this, this->asha->next_time);
}
@ -2243,25 +2255,26 @@ static int impl_node_process(void *object)
setup_matching(this);
spa_log_trace(this->log, "%p: on process time:%"PRIu64, this, this->process_time);
if ((res = flush_data(this, this->current_time)) < 0) {
io->status = res;
return SPA_STATUS_STOPPED;
}
if (this->codec->asha && !this->asha->set_timer) {
struct impl *other = find_other_asha(this);
if (other && other->asha->ref_t0 != 0) {
this->asha->ref_t0 = other->asha->ref_t0;
this->seqnum = asha_seqnum(this);
reset_buffer(this);
set_asha_timer(this, true);
} else {
this->asha->ref_t0 = get_reference_time(this, NULL);
this->seqnum = 0;
set_asha_timer(this, false);
}
this->asha->set_timer = true;
set_asha_timer(this);
}
spa_log_trace(this->log, "%p: on process time:%"PRIu64, this, this->process_time);
if ((res = flush_data(this, this->current_time)) < 0) {
io->status = res;
return SPA_STATUS_STOPPED;
}
return SPA_STATUS_HAVE_DATA;