godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

VideoStreamGDNative: Fix playing video files without audio stream

Browse Source
This commit is contained in:
marcosjouron
2019-10-11 19:03:49 +02:00
committed by Rémi Verschelde
parent a87e2f85ee
commit 6d2b21c6a4
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,9 +123,12 @@ bool VideoStreamPlaybackGDNative::open_file(const String &p_file) {
godot_vector2 vec = interface->get_texture_size(data_struct); godot_vector2 vec = interface->get_texture_size(data_struct);
texture_size = *(Vector2 *)&vec; texture_size = *(Vector2 *)&vec;
// Only do memset if num_channels > 0 otherwise it will crash.
if (num_channels > 0) {
pcm = (float *)memalloc(num_channels * AUX_BUFFER_SIZE * sizeof(float)); pcm = (float *)memalloc(num_channels * AUX_BUFFER_SIZE * sizeof(float));
memset(pcm, 0, num_channels * AUX_BUFFER_SIZE * sizeof(float)); memset(pcm, 0, num_channels * AUX_BUFFER_SIZE * sizeof(float));
}
pcm_write_idx = -1; pcm_write_idx = -1;
samples_decoded = 0; samples_decoded = 0;
@@ -146,7 +149,8 @@ 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) { // Don't mix if there's no audio (num_channels == 0).
if (mix_callback && num_channels > 0) {
if (pcm_write_idx >= 0) { if (pcm_write_idx >= 0) {
// Previous remains // Previous remains
int mixed = mix_callback(mix_udata, pcm + pcm_write_idx * num_channels, samples_decoded); int mixed = mix_callback(mix_udata, pcm + pcm_write_idx * num_channels, samples_decoded);