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

jack: update for segment owner

Browse source
This commit is contained in:
Wim Taymans 2019-08-29 18:20:40 +02:00
parent 6dfceccae2
commit f39d2fd78a
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/pipewire-jack.c
View file

@ -706,14 +706,13 @@ static inline void debug_position(struct client *c, jack_position_t *p)
} }
} }
static inline void jack_to_position(jack_position_t *s, struct spa_io_position *pos) static inline void jack_to_position(jack_position_t *s, struct pw_node_activation *a)
{ {
struct spa_io_segment *d = &pos->segments[0]; struct spa_io_segment *d = &a->pending.segment;
d->valid = 0;
if (s->valid & JackPositionBBT) { if (s->valid & JackPositionBBT) {
SPA_FLAG_SET(d->valid, SPA_IO_SEGMENT_VALID_BAR); SEQ_WRITE(a->pending.seq);
d->bar.flags = SPA_IO_SEGMENT_BAR_FLAG_VALID;
if (s->valid & JackBBTFrameOffset) if (s->valid & JackBBTFrameOffset)
d->bar.offset = s->bbt_offset; d->bar.offset = s->bbt_offset;
else else
@ -723,6 +722,7 @@ static inline void jack_to_position(jack_position_t *s, struct spa_io_position *
d->bar.bpm = s->beats_per_minute; d->bar.bpm = s->beats_per_minute;
d->bar.beat = (s->bar - 1) * s->beats_per_bar + (s->beat - 1) + d->bar.beat = (s->bar - 1) * s->beats_per_bar + (s->beat - 1) +
(s->tick / s->ticks_per_beat); (s->tick / s->ticks_per_beat);
SEQ_WRITE(a->pending.seq);
} }
} }
@ -764,7 +764,7 @@ static inline jack_transport_state_t position_to_jack(struct spa_io_position *s,
d->frame = seg->position; d->frame = seg->position;
d->valid = 0; d->valid = 0;
if (seg->valid & SPA_IO_SEGMENT_VALID_BAR) { if (seg->bar.owner && SPA_FLAG_CHECK(seg->bar.flags, SPA_IO_SEGMENT_BAR_FLAG_VALID)) {
double abs_beat; double abs_beat;
long beats; long beats;
@ -867,7 +867,7 @@ on_rtsocket_condition(void *data, int fd, uint32_t mask)
if (c->process_callback) if (c->process_callback)
c->process_callback(c->buffer_size, c->process_arg); c->process_callback(c->buffer_size, c->process_arg);
if (c->timebase_callback && driver && driver->segment_master[1] == c->node_id) { if (c->timebase_callback && driver && driver->pending.segment.bar.owner == c->node_id) {
if (activation->pending_new_pos || if (activation->pending_new_pos ||
jack_state == JackTransportRolling || jack_state == JackTransportRolling ||
jack_state == JackTransportLooping) { jack_state == JackTransportLooping) {
@ -880,7 +880,7 @@ on_rtsocket_condition(void *data, int fd, uint32_t mask)
activation->pending_new_pos = false; activation->pending_new_pos = false;
debug_position(c, &jack_position); debug_position(c, &jack_position);
jack_to_position(&jack_position, pos); jack_to_position(&jack_position, driver);
} }
} }
process_tee(c); process_tee(c);
@ -3346,11 +3346,9 @@ int jack_release_timebase (jack_client_t *client)
if (a == NULL) if (a == NULL)
return -EIO; return -EIO;
if (!ATOMIC_CAS(a->segment_master[1], c->node_id, 0)) if (!ATOMIC_CAS(a->pending.segment.bar.owner, c->node_id, 0))
return -EINVAL; return -EINVAL;
SPA_FLAG_UNSET(a->position.segments[0].valid, SPA_IO_SEGMENT_VALID_BAR);
c->timebase_callback = NULL; c->timebase_callback = NULL;
c->timebase_arg = NULL; c->timebase_arg = NULL;
c->activation->pending_new_pos = false; c->activation->pending_new_pos = false;
@ -3405,15 +3403,15 @@ int jack_set_timebase_callback (jack_client_t *client,
return -EIO; return -EIO;
/* was ok */ /* was ok */
if (ATOMIC_LOAD(a->segment_master[1]) == c->node_id) if (ATOMIC_LOAD(a->pending.segment.bar.owner) == c->node_id)
return 0; return 0;
/* try to become master */ /* try to become master */
if (conditional) { if (conditional) {
if (!ATOMIC_CAS(a->segment_master[1], 0, c->node_id)) if (!ATOMIC_CAS(a->pending.segment.bar.owner, 0, c->node_id))
return -EBUSY; return -EBUSY;
} else { } else {
ATOMIC_STORE(a->segment_master[1], c->node_id); ATOMIC_STORE(a->pending.segment.bar.owner, c->node_id);
} }
c->timebase_callback = timebase_callback; c->timebase_callback = timebase_callback;
@ -3496,11 +3494,11 @@ int jack_transport_reposition (jack_client_t *client,
do { do {
seq1 = SEQ_WRITE(a->pending.seq); seq1 = SEQ_WRITE(a->pending.seq);
a->pending.change_mask |= PW_NODE_ACTIVATION_UPDATE_REPOSITION; a->pending.change_mask |= PW_NODE_ACTIVATION_UPDATE_REPOSITION;
a->pending.segment.flags = 0; a->pending.reposition.flags = 0;
a->pending.segment.start = 0; a->pending.reposition.start = 0;
a->pending.segment.duration = 0; a->pending.reposition.duration = 0;
a->pending.segment.position = pos->frame; a->pending.reposition.position = pos->frame;
a->pending.segment.rate = 1.0; a->pending.reposition.rate = 1.0;
seq2 = SEQ_WRITE(a->pending.seq); seq2 = SEQ_WRITE(a->pending.seq);
} while (!SEQ_WRITE_SUCCESS(seq1, seq2)); } while (!SEQ_WRITE_SUCCESS(seq1, seq2));