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

stream: update for delay sign change

Browse source
This commit is contained in:
Wim Taymans 2018-11-09 15:25:39 +01:00
parent 88a786fdad
commit e8dfd22a6b
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/stream.c
View file

@ -422,7 +422,7 @@ static void update_timing_info(pa_stream *s)
struct pw_time pwt; struct pw_time pwt;
pa_timing_info *ti = &s->timing_info; pa_timing_info *ti = &s->timing_info;
size_t stride = pa_frame_size(&s->sample_spec); size_t stride = pa_frame_size(&s->sample_spec);
uint64_t delay; int64_t delay, queued, ticks;
pw_stream_get_time(s->stream, &pwt); pw_stream_get_time(s->stream, &pwt);
s->timing_info_valid = false; s->timing_info_valid = false;
@ -439,16 +439,19 @@ static void update_timing_info(pa_stream *s)
ti->write_index_corrupt = false; ti->write_index_corrupt = false;
ti->read_index_corrupt = false; ti->read_index_corrupt = false;
queued = pwt.queued + (pwt.ticks * s->sample_spec.rate / pwt.rate.denom) * stride;
ticks = ((pwt.ticks + pwt.delay) * s->sample_spec.rate / pwt.rate.denom) * stride;
delay = pwt.delay * SPA_USEC_PER_SEC / pwt.rate.denom; delay = pwt.delay * SPA_USEC_PER_SEC / pwt.rate.denom;
if (s->direction == PA_STREAM_PLAYBACK) { if (s->direction == PA_STREAM_PLAYBACK) {
ti->sink_usec = delay; ti->sink_usec = -delay;
ti->write_index = pwt.queued + (pwt.ticks * s->sample_spec.rate / pwt.rate.denom) * stride; ti->write_index = queued;
ti->read_index = ((pwt.ticks - pwt.delay) * s->sample_spec.rate / pwt.rate.denom) * stride; ti->read_index = ticks;
} }
else { else {
ti->source_usec = delay; ti->source_usec = delay;
ti->read_index = pwt.queued + (pwt.ticks * s->sample_spec.rate / pwt.rate.denom) * stride; ti->read_index = queued;
ti->write_index = ((pwt.ticks + pwt.delay) * s->sample_spec.rate / pwt.rate.denom) * stride; ti->write_index = ticks;
} }
ti->configured_sink_usec = 0; ti->configured_sink_usec = 0;