smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused libsmf seconds/time API

Browse source 
This significantly speeds up parsing MIDI files with complex
tempo-maps. e.g. "Black MIDI Trilogy_2.mid" has 24134 Tempo
changes. Prior to this commit parsing that file took over 5 minutes.
now it loads in under one seconds (libsmf only; libardour still
add overhead, and now needs about 30-40 seconds, previously
it took about 10 mins).

The problem was that every call to `smf_track_add_event_pulses()`
calls `seconds_from_pulses()` which calls `smf_get_tempo_by_seconds()`
which iterates over the tempo-map:

  for every midi-event { for ever tempo until that midi-event {..} }

This does not scale to 3.5M events and 24k tempo-changes.
This commit is contained in:
Robin Gareus 2020-07-16 18:34:36 +02:00
parent ba7db8759b
commit c6b87972b1
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 1 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

99
libs/evoral/libsmf/smf.c
View file

@ -247,7 +247,6 @@ smf_event_new(void)
event->delta_time_pulses = -1;
event->time_pulses = -1;
event->time_seconds = -1.0;
event->track_number = -1;
return (event);
@ -466,7 +465,6 @@ smf_track_add_event(smf_track_t *track, smf_event_t *event)
assert(track->smf != NULL);
assert(event->track == NULL);
assert(event->delta_time_pulses == -1);
assert(event->time_seconds >= 0.0);
remove_eot_if_before_pulses(track, event->time_pulses);
@ -574,26 +572,6 @@ smf_track_add_eot_pulses(smf_track_t *track, size_t pulses)
return (0);
}
int
smf_track_add_eot_seconds(smf_track_t *track, double seconds)
{
smf_event_t *event, *last_event;
last_event = smf_track_get_last_event(track);
if (last_event != NULL) {
if (last_event->time_seconds > seconds)
return (-2);
}
event = smf_event_new_from_bytes(0xFF, 0x2F, 0x00);
if (event == NULL)
return (-1);
smf_track_add_event_seconds(track, event, seconds);
return (0);
}
/**
* Detaches event from its track.
*/
@ -642,7 +620,6 @@ smf_event_remove_from_track(smf_event_t *event)
event->event_number = 0;
event->delta_time_pulses = -1;
event->time_pulses = 0;
event->time_seconds = -1.0;
}
/**
@ -977,52 +954,6 @@ smf_seek_to_event(smf_t *smf, const smf_event_t *target)
break;
}
smf->last_seek_position = event->time_seconds;
return (0);
}
/**
* Seeks the SMF to the given position. For example, after seeking to 1.0 seconds,
* smf_get_next_event will return first event that happens after the first second of song.
* \return 0 if everything went ok, nonzero otherwise.
*/
int
smf_seek_to_seconds(smf_t *smf, double seconds)
{
smf_event_t *event;
assert(seconds >= 0.0);
if (seconds == smf->last_seek_position) {
#if 0
g_debug("Avoiding seek to %f seconds.", seconds);
#endif
return (0);
}
smf_rewind(smf);
#if 0
g_debug("Seeking to %f seconds.", seconds);
#endif
for (;;) {
event = smf_peek_next_event(smf);
if (event == NULL) {
g_warning("Trying to seek past the end of song.");
return (-1);
}
if (event->time_seconds < seconds)
smf_skip_next_event(smf);
else
break;
}
smf->last_seek_position = seconds;
return (0);
}
@ -1056,8 +987,6 @@ smf_seek_to_pulses(smf_t *smf, size_t pulses)
break;
}
smf->last_seek_position = event->time_seconds;
return (0);
}
@ -1089,34 +1018,6 @@ smf_get_length_pulses(const smf_t *smf)
return (pulses);
}
/**
* \return Length of SMF, in seconds.
*/
double
smf_get_length_seconds(const smf_t *smf)
{
int i;
double seconds = 0.0;
for (i = 1; i <= smf->number_of_tracks; i++) {
smf_track_t *track;
smf_event_t *event;
track = smf_get_track_by_number(smf, i);
assert(track);
event = smf_track_get_last_event(track);
/* Empty track? */
if (event == NULL)
continue;
if (event->time_seconds > seconds)
seconds = event->time_seconds;
}
return (seconds);
}
/**
* \return Nonzero, if there are no events in the SMF after this one.
* Note that may be more than one "last event", if they occur at the same time.