Skip to content

Commit af32c52

Browse files
committed
Merge pull request godotengine#101219 from L2750558108/add-video-speed-virtual
Add speed scale feature for VideoStreamPlayer node
2 parents 092dc74 + c2eba05 commit af32c52

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

doc/classes/VideoStreamPlayer.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
<member name="paused" type="bool" setter="set_paused" getter="is_paused" default="false">
7474
If [code]true[/code], the video is paused.
7575
</member>
76+
<member name="speed_scale" type="float" setter="set_speed_scale" getter="get_speed_scale" default="1.0">
77+
The stream's current speed scale. [code]1.0[/code] is the normal speed, while [code]2.0[/code] is double speed and [code]0.5[/code] is half speed. A speed scale of [code]0.0[/code] pauses the video, similar to setting [member paused] to [code]true[/code].
78+
</member>
7679
<member name="stream" type="VideoStream" setter="set_stream" getter="get_stream">
7780
The assigned video stream. See description for supported formats.
7881
</member>

scene/gui/video_stream_player.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ void VideoStreamPlayer::_notification(int p_notification) {
157157
double delta = first_frame ? 0 : get_process_delta_time();
158158
first_frame = false;
159159

160-
resampler.set_playback_speed(Engine::get_singleton()->get_time_scale());
160+
resampler.set_playback_speed(Engine::get_singleton()->get_time_scale() * speed_scale);
161161

162-
playback->update(delta); // playback->is_playing() returns false in the last video frame
162+
playback->update(delta * speed_scale); // playback->is_playing() returns false in the last video frame
163163

164164
if (!playback->is_playing()) {
165165
resampler.flush();
@@ -433,6 +433,15 @@ float VideoStreamPlayer::get_volume_db() const {
433433
}
434434
}
435435

436+
void VideoStreamPlayer::set_speed_scale(float p_speed_scale) {
437+
ERR_FAIL_COND(p_speed_scale < 0.0);
438+
speed_scale = p_speed_scale;
439+
}
440+
441+
float VideoStreamPlayer::get_speed_scale() const {
442+
return speed_scale;
443+
}
444+
436445
String VideoStreamPlayer::get_stream_name() const {
437446
if (stream.is_null()) {
438447
return "<No Stream>";
@@ -530,6 +539,9 @@ void VideoStreamPlayer::_bind_methods() {
530539
ClassDB::bind_method(D_METHOD("set_volume_db", "db"), &VideoStreamPlayer::set_volume_db);
531540
ClassDB::bind_method(D_METHOD("get_volume_db"), &VideoStreamPlayer::get_volume_db);
532541

542+
ClassDB::bind_method(D_METHOD("set_speed_scale", "speed_scale"), &VideoStreamPlayer::set_speed_scale);
543+
ClassDB::bind_method(D_METHOD("get_speed_scale"), &VideoStreamPlayer::get_speed_scale);
544+
533545
ClassDB::bind_method(D_METHOD("set_audio_track", "track"), &VideoStreamPlayer::set_audio_track);
534546
ClassDB::bind_method(D_METHOD("get_audio_track"), &VideoStreamPlayer::get_audio_track);
535547

@@ -559,6 +571,7 @@ void VideoStreamPlayer::_bind_methods() {
559571
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "VideoStream"), "set_stream", "get_stream");
560572
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01,suffix:dB"), "set_volume_db", "get_volume_db");
561573
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "volume", PROPERTY_HINT_RANGE, "0,15,0.01,exp", PROPERTY_USAGE_NONE), "set_volume", "get_volume");
574+
ADD_PROPERTY(PropertyInfo(Variant::FLOAT, "speed_scale", PROPERTY_HINT_RANGE, "0,4,0.001,or_greater"), "set_speed_scale", "get_speed_scale");
562575
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autoplay"), "set_autoplay", "has_autoplay");
563576
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "paused"), "set_paused", "is_paused");
564577
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand"), "set_expand", "has_expand");

scene/gui/video_stream_player.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class VideoStreamPlayer : public Control {
6363
bool paused_from_tree = false;
6464
bool autoplay = false;
6565
float volume = 1.0;
66+
float speed_scale = 1.0;
6667
bool expand = false;
6768
bool loop = false;
6869
bool first_frame = false;
@@ -107,6 +108,9 @@ class VideoStreamPlayer : public Control {
107108
void set_volume_db(float p_db);
108109
float get_volume_db() const;
109110

111+
void set_speed_scale(float p_speed_scale);
112+
float get_speed_scale() const;
113+
110114
String get_stream_name() const;
111115
double get_stream_length() const;
112116
double get_stream_position() const;

0 commit comments

Comments
 (0)