mirror of
https://github.com/godotengine/godot.git
synced 2025-10-31 13:41:03 +00:00
52 lines
2.6 KiB
Diff
52 lines
2.6 KiB
Diff
|
diff --git a/thirdparty/minimp3/minimp3_ex.h b/thirdparty/minimp3/minimp3_ex.h
|
||
|
|
index 2871705df3..2b207a25a7 100644
|
||
|
|
--- a/thirdparty/minimp3/minimp3_ex.h
|
||
|
|
+++ b/thirdparty/minimp3/minimp3_ex.h
|
||
|
|
@@ -377,7 +377,7 @@ int mp3dec_load_cb(mp3dec_t *dec, mp3dec_io_t *io, uint8_t *buf, size_t buf_size
|
||
|
|
samples = hdr_frame_samples(hdr)*frame_info.channels;
|
||
|
|
if (3 != frame_info.layer)
|
||
|
|
break;
|
||
|
|
- int ret = mp3dec_check_vbrtag(hdr, frame_size, &frames, &delay, &padding);
|
||
|
|
+ ret = mp3dec_check_vbrtag(hdr, frame_size, &frames, &delay, &padding);
|
||
|
|
if (ret > 0)
|
||
|
|
{
|
||
|
|
padding *= frame_info.channels;
|
||
|
|
@@ -529,7 +529,8 @@ int mp3dec_iterate_buf(const uint8_t *buf, size_t buf_size, MP3D_ITERATE_CB call
|
||
|
|
|
||
|
|
if (callback)
|
||
|
|
{
|
||
|
|
- if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, buf_size, hdr - orig_buf, &frame_info)))
|
||
|
|
+ ret = callback(user_data, hdr, frame_size, free_format_bytes, buf_size, hdr - orig_buf, &frame_info);
|
||
|
|
+ if (ret != 0)
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
buf += frame_size;
|
||
|
|
@@ -562,7 +563,7 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA
|
||
|
|
readed += id3v2size;
|
||
|
|
} else
|
||
|
|
{
|
||
|
|
- size_t readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data);
|
||
|
|
+ readed = io->read(buf + MINIMP3_ID3_DETECT_SIZE, buf_size - MINIMP3_ID3_DETECT_SIZE, io->read_data);
|
||
|
|
if (readed > (buf_size - MINIMP3_ID3_DETECT_SIZE))
|
||
|
|
return MP3D_E_IOERROR;
|
||
|
|
filled += readed;
|
||
|
|
@@ -590,7 +591,8 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA
|
||
|
|
readed += i;
|
||
|
|
if (callback)
|
||
|
|
{
|
||
|
|
- if ((ret = callback(user_data, hdr, frame_size, free_format_bytes, filled - consumed, readed, &frame_info)))
|
||
|
|
+ ret = callback(user_data, hdr, frame_size, free_format_bytes, filled - consumed, readed, &frame_info);
|
||
|
|
+ if (ret != 0)
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
readed += frame_size;
|
||
|
|
@@ -600,7 +602,7 @@ int mp3dec_iterate_cb(mp3dec_io_t *io, uint8_t *buf, size_t buf_size, MP3D_ITERA
|
||
|
|
memmove(buf, buf + consumed, filled - consumed);
|
||
|
|
filled -= consumed;
|
||
|
|
consumed = 0;
|
||
|
|
- size_t readed = io->read(buf + filled, buf_size - filled, io->read_data);
|
||
|
|
+ readed = io->read(buf + filled, buf_size - filled, io->read_data);
|
||
|
|
if (readed > (buf_size - filled))
|
||
|
|
return MP3D_E_IOERROR;
|
||
|
|
if (readed != (buf_size - filled))
|