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

node: add support for transport

Browse source 
Move some things around. Move the duration of the current cycle
to the clock. Also add the estimated next timeout to the clock.
Add a generic media specific counter to the clock.

Clean up the position_bar info. We can do with only a double beat
value and make the signature in floats.

Flesh out the io_position info. This has now the information needed
to convert a raw clock time into a stream time. It basically has
the same kind of features as GStreamer segments such as looping,
variable rate playback etc.. It also contains the state of the
timeline (paused/playing) and it can be used to update the position
and state from clients.

There is also extended information in the position field that
clients can update when they can.

Plugins basically only update the clock info they get (and use
the position info to check if they are slaved or not).

Before each cycle, check if there is a pending position update and
apply it.
This commit is contained in:
Wim Taymans 2019-08-27 14:41:47 +02:00
parent f36daaedea
commit b356c83d32
10 changed files with 168 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

41
spa/plugins/alsa/alsa-utils.c
View file

@ -656,11 +656,14 @@ static int update_time(struct state *state, uint64_t nsec, snd_pcm_sframes_t del
state->rate_match->rate = SPA_CLAMP(1.0/corr, 0.95, 1.05);
}
if (!slave && state->clock) {
state->clock->nsec = state->next_time;
state->clock->nsec = nsec;
state->clock->rate = SPA_FRACTION(1, state->rate);
state->clock->position += state->size;
state->clock->delay = state->size * corr;
state->clock->position += state->duration;
state->clock->duration = state->duration;
state->clock->count = state->clock->position;
state->clock->delay = state->duration * corr;
state->clock->rate_diff = corr;
state->clock->next_nsec = state->next_time;
}
spa_log_trace_fp(state->log, "slave:%d %"PRIu64" %f %ld %f %f %d", slave, nsec,
@ -680,9 +683,9 @@ int spa_alsa_write(struct state *state, snd_pcm_uframes_t silence)
snd_pcm_uframes_t written, frames, offset, off, to_write, total_written;
int res;
if (state->position && state->size != state->position->size) {
state->size = state->position->size;
state->threshold = (state->size * state->rate + state->rate_denom-1) / state->rate_denom;
if (state->position && state->duration != state->position->clock.duration) {
state->duration = state->position->clock.duration;
state->threshold = (state->duration * state->rate + state->rate_denom-1) / state->rate_denom;
}
if (state->slaved && state->alsa_started) {
@ -877,21 +880,21 @@ int spa_alsa_read(struct state *state, snd_pcm_uframes_t silence)
int res;
if (state->position && !state->slaved) {
uint64_t position, size;
uint64_t position, duration;
size = state->position->size;
if (state->size != size) {
state->size = size;
state->threshold = (size * state->rate + state->rate_denom-1) / state->rate_denom;
duration = state->position->clock.duration;
if (state->duration != duration) {
state->duration = duration;
state->threshold = (duration * state->rate + state->rate_denom-1) / state->rate_denom;
}
position = state->position->clock.position;
if (state->last_position && state->last_position + state->last_size != position) {
if (state->last_position && state->last_position + state->last_duration != position) {
state->alsa_sync = true;
spa_log_warn(state->log, "discont, resync %"PRIu64" %"PRIu64" %d",
state->last_position, position, state->last_size);
state->last_position, position, state->last_duration);
}
state->last_position = position;
state->last_size = size;
state->last_duration = duration;
}
if (state->slaved && state->alsa_started) {
@ -1031,8 +1034,8 @@ static void alsa_on_timeout_event(struct spa_source *source)
spa_log_warn(state->log, "error reading timerfd: %m");
if (state->position) {
state->size = state->position->size;
state->threshold = (state->size * state->rate + state->rate_denom-1) / state->rate_denom;
state->duration = state->position->clock.duration;
state->threshold = (state->duration * state->rate + state->rate_denom-1) / state->rate_denom;
}
spa_system_clock_gettime(state->data_system, CLOCK_MONOTONIC, &state->now);
@ -1099,15 +1102,15 @@ int spa_alsa_start(struct state *state)
state->slaved = is_slaved(state);
if (state->position) {
state->size = state->position->size;
state->duration = state->position->clock.duration;
state->rate_denom = state->position->clock.rate.denom;
}
else {
state->size = state->props.min_latency;
state->duration = state->props.min_latency;
state->rate_denom = state->rate;
}
state->threshold = (state->size * state->rate + state->rate_denom-1) / state->rate_denom;
state->threshold = (state->duration * state->rate + state->rate_denom-1) / state->rate_denom;
state->last_threshold = state->threshold;
init_loop(state);