godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Dynamic audio buffer size

This commit is contained in:
Bernat Arlandis 2025-02-11 10:06:21 +01:00
parent 6cb1e94790
commit 8e7b47840f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/theora/video_stream_theora.cpp
View File

@ -261,6 +261,9 @@ void VideoStreamPlaybackTheora::clear() {
vorbis_comment_clear(&vc); vorbis_comment_clear(&vc);
vorbis_info_clear(&vi); vorbis_info_clear(&vi);
ogg_stream_clear(&vo); ogg_stream_clear(&vo);
if (audio_buffer_size) {
memdelete_arr(audio_buffer);
}
} }
if (has_video) { if (has_video) {
th_decode_free(td); th_decode_free(td);
@ -270,6 +273,7 @@ void VideoStreamPlaybackTheora::clear() {
ogg_sync_clear(&oy); ogg_sync_clear(&oy);
} }
audio_buffer = nullptr;
playing = false; playing = false;
has_video = false; has_video = false;
has_audio = false; has_audio = false;
@ -450,6 +454,8 @@ void VideoStreamPlaybackTheora::set_file(const String &p_file) {
if (has_audio) { if (has_audio) {
vorbis_synthesis_init(&vd, &vi); vorbis_synthesis_init(&vd, &vi);
vorbis_block_init(&vd, &vb); vorbis_block_init(&vd, &vb);
audio_buffer_size = MIN(vi.channels, 8) * 1024;
audio_buffer = memnew_arr(float, audio_buffer_size);
} }
stream_data_offset = file->get_position() - oy.fill + oy.returned; stream_data_offset = file->get_position() - oy.fill + oy.returned;
@ -516,7 +522,7 @@ void VideoStreamPlaybackTheora::update(double p_delta) {
if (ret > 0) { if (ret > 0) {
int frames_read = 0; int frames_read = 0;
while (frames_read < ret) { while (frames_read < ret) {
int m = MIN(AUXBUF_LEN / vi.channels, ret - frames_read); int m = MIN(audio_buffer_size / vi.channels, ret - frames_read);
int count = 0; int count = 0;
for (int j = 0; j < m; j++) { for (int j = 0; j < m; j++) {
for (int i = 0; i < vi.channels; i++) { for (int i = 0; i < vi.channels; i++) {

4
modules/theora/video_stream_theora.h
View File

@ -52,8 +52,8 @@ class VideoStreamPlaybackTheora : public VideoStreamPlayback {
Point2i size; Point2i size;
Rect2i region; Rect2i region;
const static int AUXBUF_LEN = 8192; float *audio_buffer = nullptr;
float audio_buffer[AUXBUF_LEN]; int audio_buffer_size;
int audio_ptr_start; int audio_ptr_start;
int audio_ptr_end; int audio_ptr_end;