asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #97026 from DeeJayLSP/mp3-local

Browse source 
AudioStreamMP3: Use a LocalVector to store data
This commit is contained in:
Rémi Verschelde 2024-09-17 21:02:03 +02:00
commit 26dde5c21a
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/minimp3/audio_stream_mp3.cpp
View file

@ -221,10 +221,9 @@ void AudioStreamMP3::clear_data() {
void AudioStreamMP3::set_data(const Vector<uint8_t> &p_data) {
int src_data_len = p_data.size();
const uint8_t *src_datar = p_data.ptr();
mp3dec_ex_t *mp3d = memnew(mp3dec_ex_t);
int err = mp3dec_ex_open_buf(mp3d, src_datar, src_data_len, MP3D_SEEK_TO_SAMPLE);
int err = mp3dec_ex_open_buf(mp3d, p_data.ptr(), src_data_len, MP3D_SEEK_TO_SAMPLE);
if (err || mp3d->info.hz == 0) {
memdelete(mp3d);
ERR_FAIL_MSG("Failed to decode mp3 file. Make sure it is a valid mp3 audio file.");
@ -237,10 +236,7 @@ void AudioStreamMP3::set_data(const Vector<uint8_t> &p_data) {
mp3dec_ex_close(mp3d);
memdelete(mp3d);
clear_data();
data.resize(src_data_len);
memcpy(data.ptrw(), src_datar, src_data_len);
data = p_data;
data_len = src_data_len;
}

2
modules/minimp3/audio_stream_mp3.h
View file

@ -96,7 +96,7 @@ class AudioStreamMP3 : public AudioStream {
friend class AudioStreamPlaybackMP3;
PackedByteArray data;
LocalVector<uint8_t> data;
uint32_t data_len = 0;
float sample_rate = 1.0;