asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #84794 from akien-mga/videoplayer-fix-reloading-translation-remapped-stream

Browse source 
VideoPlayer: Fix reloading translation remapped stream
This commit is contained in:
Rémi Verschelde 2023-12-04 23:05:15 +01:00
commit f444818c7e
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/classes/VideoStreamPlayer.xml
View file

@ -6,7 +6,6 @@
<description> <description>
A control used for playback of [VideoStream] resources. A control used for playback of [VideoStream] resources.
Supported video formats are [url=https://www.theora.org/]Ogg Theora[/url] ([code].ogv[/code], [VideoStreamTheora]) and any format exposed via a GDExtension plugin. Supported video formats are [url=https://www.theora.org/]Ogg Theora[/url] ([code].ogv[/code], [VideoStreamTheora]) and any format exposed via a GDExtension plugin.
[b]Note:[/b] Due to a bug, VideoStreamPlayer does not support localization remapping yet.
[b]Warning:[/b] On Web, video playback [i]will[/i] perform poorly due to missing architecture-specific assembly optimizations. [b]Warning:[/b] On Web, video playback [i]will[/i] perform poorly due to missing architecture-specific assembly optimizations.
</description> </description>
<tutorials> <tutorials>

10
scene/gui/video_stream_player.cpp
View file

@ -237,6 +237,12 @@ bool VideoStreamPlayer::has_loop() const {
void VideoStreamPlayer::set_stream(const Ref<VideoStream> &p_stream) { void VideoStreamPlayer::set_stream(const Ref<VideoStream> &p_stream) {
stop(); stop();
// Make sure to handle stream changes seamlessly, e.g. when done via
// translation remapping.
if (stream.is_valid()) {
stream->disconnect_changed(callable_mp(this, &VideoStreamPlayer::set_stream));
}
AudioServer::get_singleton()->lock(); AudioServer::get_singleton()->lock();
mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size()); mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size());
stream = p_stream; stream = p_stream;
@ -248,6 +254,10 @@ void VideoStreamPlayer::set_stream(const Ref<VideoStream> &p_stream) {
} }
AudioServer::get_singleton()->unlock(); AudioServer::get_singleton()->unlock();
if (stream.is_valid()) {
stream->connect_changed(callable_mp(this, &VideoStreamPlayer::set_stream).bind(stream));
}
if (!playback.is_null()) { if (!playback.is_null()) {
playback->set_paused(paused); playback->set_paused(paused);
texture = playback->get_texture(); texture = playback->get_texture();

1
scene/resources/video_stream.cpp
View file

@ -172,6 +172,7 @@ Ref<VideoStreamPlayback> VideoStream::instantiate_playback() {
void VideoStream::set_file(const String &p_file) { void VideoStream::set_file(const String &p_file) {
file = p_file; file = p_file;
emit_changed();
} }
String VideoStream::get_file() { String VideoStream::get_file() {