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

Fixes VideostreamGDNative crash on audio_channel=0. 

Added an if case to check if the mix_callback exists before running any
of the audio code.

Fixes: #28644
This commit is contained in:
Anish 2019-05-04 00:34:58 +05:30
parent c2251eab51
commit f0757f31a4
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gdnative/videodecoder/video_stream_gdnative.cpp
View File

@ -146,6 +146,7 @@ void VideoStreamPlaybackGDNative::update(float p_delta) {
ERR_FAIL_COND(interface == NULL); ERR_FAIL_COND(interface == NULL);
interface->update(data_struct, p_delta); interface->update(data_struct, p_delta);
if (mix_callback) {
if (pcm_write_idx >= 0) { if (pcm_write_idx >= 0) {
// Previous remains // Previous remains
int mixed = mix_callback(mix_udata, pcm, samples_decoded); int mixed = mix_callback(mix_udata, pcm, samples_decoded);
@ -165,6 +166,7 @@ void VideoStreamPlaybackGDNative::update(float p_delta) {
samples_decoded -= pcm_write_idx; samples_decoded -= pcm_write_idx;
} }
} }
}
while (interface->get_playback_position(data_struct) < time && playing) { while (interface->get_playback_position(data_struct) < time && playing) {