Merge branch 'release/2.3' into master

derselbst · derselbst · commit ce97c6d43715 · 2024-09-19T14:48:47.000+02:00
diff --git a/src/sfloader/fluid_sffile.c b/src/sfloader/fluid_sffile.c
@@ -2500,6 +2500,12 @@ static int fluid_sffile_read_vorbis(SFData *sf, unsigned int start_byte, unsigne
         goto error_exit;
     }
 
+    // Avoid clipping for loud samples, see
+    // https://github.com/FluidSynth/fluidsynth/issues/1380
+    // and
+    // https://github.com/libsndfile/libsndfile/issues/194
+    sf_command(sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);
+
     /* Automatically decompresses the Ogg Vorbis data to 16-bit PCM */
     if(sf_readf_short(sndfile, wav_data, sfinfo.frames) < sfinfo.frames)
     {

Original file line number	Diff line number	Diff line change
`@@ -2500,6 +2500,12 @@ static int fluid_sffile_read_vorbis(SFData *sf, unsigned int start_byte, unsigne`
`2500`	`2500`	`goto error_exit;`
`2501`	`2501`	`}`
`2502`	`2502`
	`2503`	`+ // Avoid clipping for loud samples, see`
	`2504`	`+ // https://github.com/FluidSynth/fluidsynth/issues/1380`
	`2505`	`+ // and`
	`2506`	`+ // https://github.com/libsndfile/libsndfile/issues/194`
	`2507`	`+ sf_command(sndfile, SFC_SET_SCALE_FLOAT_INT_READ, NULL, SF_TRUE);`
	`2508`	`+`
`2503`	`2509`	`/* Automatically decompresses the Ogg Vorbis data to 16-bit PCM */`
`2504`	`2510`	`if(sf_readf_short(sndfile, wav_data, sfinfo.frames) < sfinfo.frames)`
`2505`	`2511`	`{`