diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-05 15:35:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-05 15:35:24 +0200 |
| commit | dcf8b0bbe474ad4bae80a71802a9a8298146b8e3 (patch) | |
| tree | 67dc0e2bceff45d9d814ab3650a6bd4a0c3dab72 /modules | |
| parent | d8617f237acbed21ca4b1a9e7df2d28b32e511b1 (diff) | |
| parent | f0757f31a44144b1d8c8a527d63f67645a4141fb (diff) | |
Merge pull request #28657 from KidRigger/master
Fixes VideostreamGDNative crash on audio_channel=0.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gdnative/videodecoder/video_stream_gdnative.cpp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.cpp b/modules/gdnative/videodecoder/video_stream_gdnative.cpp index 9bb1186269..be131c5402 100644 --- a/modules/gdnative/videodecoder/video_stream_gdnative.cpp +++ b/modules/gdnative/videodecoder/video_stream_gdnative.cpp @@ -146,23 +146,25 @@ void VideoStreamPlaybackGDNative::update(float p_delta) { ERR_FAIL_COND(interface == NULL); interface->update(data_struct, p_delta); - if (pcm_write_idx >= 0) { - // Previous remains - int mixed = mix_callback(mix_udata, pcm, samples_decoded); - if (mixed == samples_decoded) { - pcm_write_idx = -1; - } else { - samples_decoded -= mixed; - pcm_write_idx += mixed; + if (mix_callback) { + if (pcm_write_idx >= 0) { + // Previous remains + int mixed = mix_callback(mix_udata, pcm, samples_decoded); + if (mixed == samples_decoded) { + pcm_write_idx = -1; + } else { + samples_decoded -= mixed; + pcm_write_idx += mixed; + } } - } - if (pcm_write_idx < 0) { - samples_decoded = interface->get_audioframe(data_struct, pcm, AUX_BUFFER_SIZE); - pcm_write_idx = mix_callback(mix_udata, pcm, samples_decoded); - if (pcm_write_idx == samples_decoded) { - pcm_write_idx = -1; - } else { - samples_decoded -= pcm_write_idx; + if (pcm_write_idx < 0) { + samples_decoded = interface->get_audioframe(data_struct, pcm, AUX_BUFFER_SIZE); + pcm_write_idx = mix_callback(mix_udata, pcm, samples_decoded); + if (pcm_write_idx == samples_decoded) { + pcm_write_idx = -1; + } else { + samples_decoded -= pcm_write_idx; + } } } |