niansa-misc/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2025-03-06 20:48:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Sound loading: Fix issues where ov_read skips samples

Browse source
This commit is contained in:
Desour 2024-04-09 15:54:03 +02:00 • committed by DS
parent 43df39c4f7
commit f836a47bc1
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/client/sound/ogg_file.cpp
View file

@ -184,13 +184,15 @@ RAIIALSoundBuffer RAIIOggFile::loadBuffer(const OggFileDecodeInfo &decode_info,
assert(pcm_start <= decode_info.length_samples); assert(pcm_start <= decode_info.length_samples);
// seek // seek
if (ov_pcm_tell(&m_file) != pcm_start) { s64 current_pcm = ov_pcm_tell(&m_file);
if (current_pcm != pcm_start) {
if (ov_pcm_seek(&m_file, pcm_start) != 0) { if (ov_pcm_seek(&m_file, pcm_start) != 0) {
warningstream << "Audio: Error decoding (could not seek) " warningstream << "Audio: Error decoding (could not seek): "
<< decode_info.name_for_logging << std::endl; << decode_info.name_for_logging << std::endl;
return RAIIALSoundBuffer(); return RAIIALSoundBuffer();
} }
assert(ov_pcm_tell(&m_file) == pcm_start); assert(ov_pcm_tell(&m_file) == pcm_start);
current_pcm = pcm_start;
} }
const size_t size = static_cast<size_t>(pcm_end - pcm_start) const size_t size = static_cast<size_t>(pcm_end - pcm_start)
@ -199,6 +201,7 @@ RAIIALSoundBuffer RAIIOggFile::loadBuffer(const OggFileDecodeInfo &decode_info,
std::unique_ptr<char[]> snd_buffer(new char[size]); std::unique_ptr<char[]> snd_buffer(new char[size]);
// read size bytes // read size bytes
s64 last_byte_offset = current_pcm * decode_info.bytes_per_sample;
size_t read_count = 0; size_t read_count = 0;
int bitstream; int bitstream;
while (read_count < size) { while (read_count < size) {
@ -221,6 +224,25 @@ RAIIALSoundBuffer RAIIOggFile::loadBuffer(const OggFileDecodeInfo &decode_info,
return RAIIALSoundBuffer(); return RAIIALSoundBuffer();
} }
// This usually doesn't happen, but for some sounds ov_read seems to skip
// some samples, see #14453.
s64 current_byte_offset = ov_pcm_tell(&m_file) * decode_info.bytes_per_sample;
if (current_byte_offset != last_byte_offset + num_bytes) {
infostream << "Audio: ov_read skipped "
<< current_byte_offset - (last_byte_offset + num_bytes)
<< " bytes, re-seeking: "
<< decode_info.name_for_logging << std::endl;
s64 expected_offset = (last_byte_offset + num_bytes) / decode_info.bytes_per_sample;
if (ov_pcm_seek(&m_file, expected_offset) != 0) {
warningstream << "Audio: Error decoding (could not seek): "
<< decode_info.name_for_logging << std::endl;
return RAIIALSoundBuffer();
}
assert(ov_pcm_tell(&m_file) == expected_offset);
current_byte_offset = last_byte_offset + num_bytes;
}
last_byte_offset = current_byte_offset;
read_count += num_bytes; read_count += num_bytes;
} }