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

stream: make time increase even when clock changed

Browse source
This commit is contained in:
Wim Taymans 2020-08-19 16:00:20 +02:00
parent 5f4fd14a40
commit 825fe8ac54
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pipewire/filter.c
View file

@ -139,6 +139,8 @@ struct filter {
struct data data; struct data data;
uintptr_t seq; uintptr_t seq;
struct pw_time time; struct pw_time time;
uint64_t base_pos;
uint32_t clock_id;
unsigned int disconnecting:1; unsigned int disconnecting:1;
unsigned int disconnect_core:1; unsigned int disconnect_core:1;
@ -733,11 +735,15 @@ static int impl_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffe
static inline void copy_position(struct filter *impl) static inline void copy_position(struct filter *impl)
{ {
struct spa_io_position *p = impl->rt.position; struct spa_io_position *p = impl->rt.position;
if (p != NULL) { if (SPA_UNLIKELY(p != NULL)) {
SEQ_WRITE(impl->seq); SEQ_WRITE(impl->seq);
impl->time.now = p->clock.nsec; impl->time.now = p->clock.nsec;
impl->time.rate = p->clock.rate; impl->time.rate = p->clock.rate;
impl->time.ticks = p->clock.position; if (SPA_UNLIKELY(impl->clock_id != p->clock.id)) {
impl->base_pos = p->clock.position - impl->time.ticks;
impl->clock_id = p->clock.id;
}
impl->time.ticks = p->clock.position - impl->base_pos;
impl->time.delay = p->clock.delay; impl->time.delay = p->clock.delay;
SEQ_WRITE(impl->seq); SEQ_WRITE(impl->seq);
} }

10
src/pipewire/stream.c
View file

@ -130,6 +130,8 @@ struct stream {
struct data data; struct data data;
uintptr_t seq; uintptr_t seq;
struct pw_time time; struct pw_time time;
uint64_t base_pos;
uint32_t clock_id;
unsigned int disconnecting:1; unsigned int disconnecting:1;
unsigned int disconnect_core:1; unsigned int disconnect_core:1;
@ -720,11 +722,15 @@ static int impl_port_reuse_buffer(void *object, uint32_t port_id, uint32_t buffe
static inline void copy_position(struct stream *impl, int64_t queued) static inline void copy_position(struct stream *impl, int64_t queued)
{ {
struct spa_io_position *p = impl->rt.position; struct spa_io_position *p = impl->rt.position;
if (p != NULL) { if (SPA_UNLIKELY(p != NULL)) {
SEQ_WRITE(impl->seq); SEQ_WRITE(impl->seq);
impl->time.now = p->clock.nsec; impl->time.now = p->clock.nsec;
impl->time.rate = p->clock.rate; impl->time.rate = p->clock.rate;
impl->time.ticks = p->clock.position; if (SPA_UNLIKELY(impl->clock_id != p->clock.id)) {
impl->base_pos = p->clock.position - impl->time.ticks;
impl->clock_id = p->clock.id;
}
impl->time.ticks = p->clock.position - impl->base_pos;
impl->time.delay = p->clock.delay; impl->time.delay = p->clock.delay;
impl->time.queued = queued; impl->time.queued = queued;
SEQ_WRITE(impl->seq); SEQ_WRITE(impl->seq);