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

pw-cat: fix tempo changes

Browse source 
Use time in seconds as event timestamp.
Apply tempo from the new events, keep track of elapsed time and
time since tempo change to get the right time.
Skip metadata midi in pw-cat.
This commit is contained in:
Wim Taymans 2020-02-18 16:13:35 +01:00
parent fe616e38d8
commit b6a6d1f0bb
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tools/midifile.c
View file

@ -140,7 +140,7 @@ static int peek_event(struct midi_file *mf, struct midi_track *tr, struct midi_e
return res < 0 ? res : -EIO; return res < 0 ? res : -EIO;
event->track = tr; event->track = tr;
event->tick = tr->tick; event->sec = mf->tick_sec + ((tr->tick - mf->tick_start) * (double)mf->tempo) / (1000000.0 * mf->division);
start = event->offset = tr->offset; start = event->offset = tr->offset;
status = buffer[0]; status = buffer[0];
@ -183,6 +183,8 @@ static int peek_event(struct midi_file *mf, struct midi_track *tr, struct midi_e
if ((res = mf->events->read(mf->data, tr->start + tr->offset, buffer, 3)) != 3) if ((res = mf->events->read(mf->data, tr->start + tr->offset, buffer, 3)) != 3)
return res < 0 ? res : -EIO; return res < 0 ? res : -EIO;
mf->tick_sec = event->sec;
mf->tick_start = tr->tick;
mf->tempo = (buffer[0]<<16) | (buffer[1]<<8) | buffer[2]; mf->tempo = (buffer[0]<<16) | (buffer[1]<<8) | buffer[2];
break; break;
} }

4
src/tools/midifile.h
View file

@ -32,7 +32,7 @@ struct midi_event {
struct midi_track *track; struct midi_track *track;
int64_t tick; double sec;
uint8_t status; uint8_t status;
uint8_t meta; uint8_t meta;
uint32_t offset; uint32_t offset;
@ -69,6 +69,8 @@ struct midi_file {
uint32_t offset; uint32_t offset;
int64_t tick; int64_t tick;
double tick_sec;
double tick_start;
const struct midi_events *events; const struct midi_events *events;
void *data; void *data;

11
src/tools/pw-cat.c
View file

@ -989,8 +989,10 @@ static int midi_play(struct data *d, void *src, unsigned int n_frames)
if (res < 0) if (res < 0)
return res; return res;
frame = ev.tick * ((double)d->position->clock.rate.denom * d->md.file.tempo) / if (ev.status == 0xff)
(1000000.0 * d->md.file.division); goto next;
frame = ev.sec * d->position->clock.rate.denom;
if (frame < first_frame) if (frame < first_frame)
frame = 0; frame = 0;
@ -1001,11 +1003,10 @@ static int midi_play(struct data *d, void *src, unsigned int n_frames)
spa_pod_builder_control(&b, frame, SPA_CONTROL_Midi); spa_pod_builder_control(&b, frame, SPA_CONTROL_Midi);
buf[0] = ev.status; buf[0] = ev.status;
if (ev.status == 0xff) midi_read(d, ev.offset, &buf[1], ev.size);
buf[1] = ev.meta;
midi_read(d, ev.offset, ev.status == 0xff ? &buf[2] : &buf[1], ev.size);
spa_pod_builder_bytes(&b, buf, ev.size + 1); spa_pod_builder_bytes(&b, buf, ev.size + 1);
next:
midi_file_consume_event(&d->md.file, &ev); midi_file_consume_event(&d->md.file, &ev);
} }
spa_pod_builder_pop(&b, &f); spa_pod_builder_pop(&b, &f);