sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug that st_read_s16 and st_read_f32 reterned the number of frames

Browse source 
multiplied by the number of the WavPack file's channels.
This commit is contained in:
KIRA Ryouta 2023-10-24 10:03:19 +09:00 • committed by Paul Ferrand
parent be202a3b8a
commit 652ccb9059
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
external/st_audiofile/src/st_audiofile.c vendored
View file

@ -516,12 +516,13 @@ uint64_t st_read_s16(st_audio_file* af, int16_t* buffer, uint64_t count)
if (!buf_i32) { if (!buf_i32) {
return 0; return 0;
} }
count = channels * WavpackUnpackSamples(af->wv, buf_i32, (uint32_t)count); count = WavpackUnpackSamples(af->wv, buf_i32, (uint32_t)count);
uint64_t buf_size = channels * count;
if (af->cache.wv.mode & MODE_FLOAT) { if (af->cache.wv.mode & MODE_FLOAT) {
drwav_f32_to_s16((drwav_int16*)buffer, (float*)buf_i32, (size_t)count); drwav_f32_to_s16((drwav_int16*)buffer, (float*)buf_i32, (size_t)buf_size);
} else { } else {
int d = af->cache.wv.bitrate - 16; int d = af->cache.wv.bitrate - 16;
for (uint64_t i = 0; i < count; i++) { for (uint64_t i = 0; i < buf_size; i++) {
buffer[i] = (int16_t)(buf_i32[i] >> d); buffer[i] = (int16_t)(buf_i32[i] >> d);
} }
} }
@ -566,15 +567,16 @@ uint64_t st_read_f32(st_audio_file* af, float* buffer, uint64_t count)
if (!buf_i32) { if (!buf_i32) {
return 0; return 0;
} }
count = channels * WavpackUnpackSamples(af->wv, buf_i32, (uint32_t)count); count = WavpackUnpackSamples(af->wv, buf_i32, (uint32_t)count);
if (!(af->cache.wv.mode & MODE_FLOAT)) { {
uint64_t buf_size = count * channels;
if (af->cache.wv.bitrate < 32) { if (af->cache.wv.bitrate < 32) {
int d = 32 - af->cache.wv.bitrate; int d = 32 - af->cache.wv.bitrate;
for (uint64_t i = 0; i < count; i++) { for (uint64_t i = 0; i < buf_size; i++) {
buf_i32[i] <<= d; buf_i32[i] <<= d;
} }
} }
drwav_s32_to_f32(buffer, (drwav_int32*)buf_i32, (size_t)count); drwav_s32_to_f32(buffer, (drwav_int32*)buf_i32, (size_t)buf_size);
} }
free(buf_i32); free(buf_i32);
} }