godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stb_vorbis: Add clearer error messages when failing to import OGG file 

Fixes #56895.

(cherry picked from commit 8109902492)
This commit is contained in:
Rémi Verschelde 2022-01-18 14:50:58 +01:00
parent f0cbd12ea8
commit 2665fc1439
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/stb_vorbis/audio_stream_ogg_vorbis.cpp
View File

@ -185,8 +185,8 @@ void AudioStreamOGGVorbis::set_data(const PoolVector<uint8_t> &p_data) {
w.release(); w.release();
alloc_try *= 2; alloc_try *= 2;
} else { } else {
ERR_FAIL_COND(alloc_try == MAX_TEST_MEM); ERR_FAIL_COND_MSG(alloc_try == MAX_TEST_MEM, "Failed allocating memory for OGG Vorbis stream.");
ERR_FAIL_COND(ogg_stream == nullptr); ERR_FAIL_COND_MSG(!ogg_stream, "OGG Vorbis decoding failed. Check that your data is a valid OGG Vorbis audio stream.");
stb_vorbis_info info = stb_vorbis_get_info(ogg_stream); stb_vorbis_info info = stb_vorbis_get_info(ogg_stream);

2
modules/stb_vorbis/resource_importer_ogg_vorbis.cpp
View File

@ -91,7 +91,7 @@ Error ResourceImporterOGGVorbis::import(const String &p_source_file, const Strin
ogg_stream.instance(); ogg_stream.instance();
ogg_stream->set_data(data); ogg_stream->set_data(data);
ERR_FAIL_COND_V(!ogg_stream->get_data().size(), ERR_FILE_CORRUPT); ERR_FAIL_COND_V_MSG(!ogg_stream->get_data().size(), ERR_FILE_CORRUPT, "Couldn't import file as AudioStreamOGGVorbis: " + p_source_file);
ogg_stream->set_loop(loop); ogg_stream->set_loop(loop);
ogg_stream->set_loop_offset(loop_offset); ogg_stream->set_loop_offset(loop_offset);