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

Merge pull request #5224 from zaps166/2.0-fix-theora-no-audio 

Fix Theora video playback without a Vorbis stream
This commit is contained in:
Rémi Verschelde 2016-06-17 19:58:39 +02:00 committed by GitHub
parent d412cb65be 763b29f34e
commit ff91f409bf
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/theora/video_stream_theora.cpp
View File

@ -513,7 +513,7 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
} }
bool frame_done=false; bool frame_done=false;
bool audio_done=false; bool audio_done=!vorbis_p;
bool theora_done=false; bool theora_done=false;

11
scene/gui/video_player.cpp
View File

@ -208,10 +208,17 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) {
playback->set_paused(paused); playback->set_paused(paused);
texture=playback->get_texture(); texture=playback->get_texture();
const int channels = playback->get_channels();
AudioServer::get_singleton()->lock(); AudioServer::get_singleton()->lock();
resampler.setup(playback->get_channels(),playback->get_mix_rate(),server_mix_rate,buffering_ms,0); if (channels > 0)
resampler.setup(channels,playback->get_mix_rate(),server_mix_rate,buffering_ms,0);
else
resampler.clear();
AudioServer::get_singleton()->unlock(); AudioServer::get_singleton()->unlock();
playback->set_mix_callback(_audio_mix_callback,this);
if (channels > 0)
playback->set_mix_callback(_audio_mix_callback,this);
} else { } else {
texture.unref(); texture.unref();