zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-12-11 21:31:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Parallelize SF2 loading (#812)

Browse source 
The loading of SF2 samples can be parallelized as well, at least for bigger soundfonts like the Stgiga 4GB monster.

The following test is performed with hot-caches:

`time src/fluidsynth -i -a alsa Stgiga\'s\ HiDef\ Soundfont\ \(2019-05-25\).sf2`

Serial version:
```
real    0m15,460s
user    0m14,163s
sys     0m1,192s
```

Parallelized version proposed by this PR:
```
real    0m5,851s
user    0m14,089s
sys     0m1,194s
```
This commit is contained in:
Tom M 2021-03-17 19:41:33 +01:00 committed by GitHub
parent ea5ebe4813
commit c32faa7b17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sfloader/fluid_defsfont.c
View file

@ -422,11 +422,14 @@ int fluid_defsfont_load_all_sampledata(fluid_defsfont_t *defsfont, SFData *sfdat
} }
else else
{ {
/* Data pointers of SF2 samples point to large sample data block loaded above */ #pragma omp task firstprivate(sample, defsfont) default(none)
sample->data = defsfont->sampledata; {
sample->data24 = defsfont->sample24data; /* Data pointers of SF2 samples point to large sample data block loaded above */
fluid_sample_sanitize_loop(sample, defsfont->samplesize); sample->data = defsfont->sampledata;
fluid_voice_optimize_sample(sample); sample->data24 = defsfont->sample24data;
fluid_sample_sanitize_loop(sample, defsfont->samplesize);
fluid_voice_optimize_sample(sample);
}
} }
} }

2
src/sfloader/fluid_sfont.h
View file

@ -147,7 +147,7 @@ struct _fluid_sample_t
{ {
char name[21]; /**< Sample name */ char name[21]; /**< Sample name */
/* The following for sample pointers store the original pointers from the Soundfont /* The following four sample pointers store the original pointers from the Soundfont
* file. They are never changed after loading and are used to re-create the * file. They are never changed after loading and are used to re-create the
* actual sample pointers after a sample has been unloaded and loaded again. The * actual sample pointers after a sample has been unloaded and loaded again. The
* actual sample pointers get modified during loading for SF3 (compressed) samples * actual sample pointers get modified during loading for SF3 (compressed) samples