godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix Video Player issue with audio mix_rate when different than 44100

Browse Source
This commit is contained in:
Marcelo Fernandez
2018-01-07 12:57:48 -03:00
parent 57efe0bea5
commit 6fc1801b6a
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scene/gui/video_player.cpp
View File

@@ -38,11 +38,6 @@ int VideoPlayer::sp_get_channel_count() const {
return playback->get_channels();
}
void VideoPlayer::sp_set_mix_rate(int p_rate) {
server_mix_rate = p_rate;
}
bool VideoPlayer::mix(AudioFrame *p_buffer, int p_frames) {
// Check the amount resampler can really handle.
@@ -241,7 +236,7 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) {
AudioServer::get_singleton()->lock();
if (channels > 0)
resampler.setup(channels, playback->get_mix_rate(), server_mix_rate, buffering_ms, 0);
resampler.setup(channels, playback->get_mix_rate(), AudioServer::get_singleton()->get_mix_rate(), buffering_ms, 0);
else
resampler.clear();
AudioServer::get_singleton()->unlock();
@@ -494,7 +489,6 @@ VideoPlayer::VideoPlayer() {
bus_index = 0;
buffering_ms = 500;
server_mix_rate = 44100;
// internal_stream.player=this;
// stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);