summaryrefslogtreecommitdiff
path: root/scene/gui/video_player.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/gui/video_player.cpp')
-rw-r--r--scene/gui/video_player.cpp168
1 files changed, 77 insertions, 91 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp
index 063ad8c44a..433cc546a6 100644
--- a/scene/gui/video_player.cpp
+++ b/scene/gui/video_player.cpp
@@ -54,15 +54,15 @@ int VideoPlayer::sp_get_channel_count() const {
return playback->get_channels();
}
-void VideoPlayer::sp_set_mix_rate(int p_rate){
+void VideoPlayer::sp_set_mix_rate(int p_rate) {
- server_mix_rate=p_rate;
+ server_mix_rate = p_rate;
}
-bool VideoPlayer::sp_mix(int32_t *p_buffer,int p_frames) {
+bool VideoPlayer::sp_mix(int32_t *p_buffer, int p_frames) {
if (resampler.is_ready()) {
- return resampler.mix(p_buffer,p_frames);
+ return resampler.mix(p_buffer, p_frames);
}
return false;
@@ -93,24 +93,22 @@ void VideoPlayer::sp_update() {
#endif
}
-int VideoPlayer::_audio_mix_callback(void* p_udata,const int16_t *p_data,int p_frames) {
+int VideoPlayer::_audio_mix_callback(void *p_udata, const int16_t *p_data, int p_frames) {
- VideoPlayer *vp=(VideoPlayer*)p_udata;
+ VideoPlayer *vp = (VideoPlayer *)p_udata;
- int todo=MIN(vp->resampler.get_todo(),p_frames);
+ int todo = MIN(vp->resampler.get_todo(), p_frames);
int16_t *wb = vp->resampler.get_write_buffer();
int c = vp->resampler.get_channel_count();
- for(int i=0;i<todo*c;i++) {
- wb[i]=p_data[i];
+ for (int i = 0; i < todo * c; i++) {
+ wb[i] = p_data[i];
}
vp->resampler.write(todo);
return todo;
}
-
-
void VideoPlayer::_notification(int p_notification) {
switch (p_notification) {
@@ -133,12 +131,11 @@ void VideoPlayer::_notification(int p_notification) {
double audio_time = USEC_TO_SEC(OS::get_singleton()->get_ticks_usec()); //AudioServer::get_singleton()->get_mix_time();
- double delta = last_audio_time==0?0:audio_time-last_audio_time;
- last_audio_time=audio_time;
- if (delta==0)
+ double delta = last_audio_time == 0 ? 0 : audio_time - last_audio_time;
+ last_audio_time = audio_time;
+ if (delta == 0)
return;
-
playback->update(delta);
} break;
@@ -150,17 +147,13 @@ void VideoPlayer::_notification(int p_notification) {
if (texture->get_width() == 0)
return;
- Size2 s=expand?get_size():texture->get_size();
- draw_texture_rect(texture,Rect2(Point2(),s),false);
+ Size2 s = expand ? get_size() : texture->get_size();
+ draw_texture_rect(texture, Rect2(Point2(), s), false);
} break;
};
-
};
-
-
-
Size2 VideoPlayer::get_minimum_size() const {
if (!expand && !texture.is_null())
@@ -171,7 +164,7 @@ Size2 VideoPlayer::get_minimum_size() const {
void VideoPlayer::set_expand(bool p_expand) {
- expand=p_expand;
+ expand = p_expand;
update();
minimum_size_changed();
}
@@ -181,35 +174,34 @@ bool VideoPlayer::has_expand() const {
return expand;
}
-
void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) {
stop();
- stream=p_stream;
- if (stream.is_valid()) {
- stream->set_audio_track(audio_track);
- playback=stream->instance_playback();
- } else {
- playback=Ref<VideoStreamPlayback>();
- }
+ stream = p_stream;
+ if (stream.is_valid()) {
+ stream->set_audio_track(audio_track);
+ playback = stream->instance_playback();
+ } else {
+ playback = Ref<VideoStreamPlayback>();
+ }
if (!playback.is_null()) {
playback->set_loop(loops);
playback->set_paused(paused);
- texture=playback->get_texture();
+ texture = playback->get_texture();
const int channels = playback->get_channels();
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(), server_mix_rate, buffering_ms, 0);
else
resampler.clear();
AudioServer::get_singleton()->unlock();
if (channels > 0)
- playback->set_mix_callback(_audio_mix_callback,this);
+ playback->set_mix_callback(_audio_mix_callback, this);
} else {
texture.unref();
@@ -219,7 +211,6 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) {
}
update();
-
};
Ref<VideoStream> VideoPlayer::get_stream() const {
@@ -235,9 +226,9 @@ void VideoPlayer::play() {
playback->stop();
playback->play();
set_process_internal(true);
-// AudioServer::get_singleton()->stream_set_active(stream_rid,true);
-// AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
- last_audio_time=0;
+ // AudioServer::get_singleton()->stream_set_active(stream_rid,true);
+ // AudioServer::get_singleton()->stream_set_volume_scale(stream_rid,volume);
+ last_audio_time = 0;
};
void VideoPlayer::stop() {
@@ -248,10 +239,10 @@ void VideoPlayer::stop() {
return;
playback->stop();
-// AudioServer::get_singleton()->stream_set_active(stream_rid,false);
+ // AudioServer::get_singleton()->stream_set_active(stream_rid,false);
resampler.flush();
set_process_internal(false);
- last_audio_time=0;
+ last_audio_time = 0;
};
bool VideoPlayer::is_playing() const {
@@ -264,7 +255,7 @@ bool VideoPlayer::is_playing() const {
void VideoPlayer::set_paused(bool p_paused) {
- paused=p_paused;
+ paused = p_paused;
if (playback.is_valid()) {
playback->set_paused(p_paused);
set_process_internal(!p_paused);
@@ -279,27 +270,26 @@ bool VideoPlayer::is_paused() const {
void VideoPlayer::set_buffering_msec(int p_msec) {
- buffering_ms=p_msec;
+ buffering_ms = p_msec;
}
-int VideoPlayer::get_buffering_msec() const{
+int VideoPlayer::get_buffering_msec() const {
return buffering_ms;
}
void VideoPlayer::set_audio_track(int p_track) {
- audio_track=p_track;
+ audio_track = p_track;
}
int VideoPlayer::get_audio_track() const {
- return audio_track;
+ return audio_track;
}
-
void VideoPlayer::set_volume(float p_vol) {
- volume=p_vol;
+ volume = p_vol;
};
float VideoPlayer::get_volume() const {
@@ -309,7 +299,7 @@ float VideoPlayer::get_volume() const {
void VideoPlayer::set_volume_db(float p_db) {
- if (p_db<-79)
+ if (p_db < -79)
set_volume(0);
else
set_volume(Math::db2linear(p_db));
@@ -317,13 +307,12 @@ void VideoPlayer::set_volume_db(float p_db) {
float VideoPlayer::get_volume_db() const {
- if (volume==0)
+ if (volume == 0)
return -80;
else
return Math::linear2db(volume);
};
-
String VideoPlayer::get_stream_name() const {
if (stream.is_null())
@@ -343,12 +332,12 @@ Ref<Texture> VideoPlayer::get_video_texture() {
if (playback.is_valid())
return playback->get_texture();
- return Ref<Texture> ();
+ return Ref<Texture>();
}
void VideoPlayer::set_autoplay(bool p_enable) {
- autoplay=p_enable;
+ autoplay = p_enable;
};
bool VideoPlayer::has_autoplay() const {
@@ -358,75 +347,72 @@ bool VideoPlayer::has_autoplay() const {
void VideoPlayer::_bind_methods() {
- ClassDB::bind_method(D_METHOD("set_stream","stream:VideoStream"),&VideoPlayer::set_stream);
- ClassDB::bind_method(D_METHOD("get_stream:VideoStream"),&VideoPlayer::get_stream);
+ ClassDB::bind_method(D_METHOD("set_stream", "stream:VideoStream"), &VideoPlayer::set_stream);
+ ClassDB::bind_method(D_METHOD("get_stream:VideoStream"), &VideoPlayer::get_stream);
- ClassDB::bind_method(D_METHOD("play"),&VideoPlayer::play);
- ClassDB::bind_method(D_METHOD("stop"),&VideoPlayer::stop);
+ ClassDB::bind_method(D_METHOD("play"), &VideoPlayer::play);
+ ClassDB::bind_method(D_METHOD("stop"), &VideoPlayer::stop);
- ClassDB::bind_method(D_METHOD("is_playing"),&VideoPlayer::is_playing);
+ ClassDB::bind_method(D_METHOD("is_playing"), &VideoPlayer::is_playing);
- ClassDB::bind_method(D_METHOD("set_paused","paused"),&VideoPlayer::set_paused);
- ClassDB::bind_method(D_METHOD("is_paused"),&VideoPlayer::is_paused);
+ ClassDB::bind_method(D_METHOD("set_paused", "paused"), &VideoPlayer::set_paused);
+ ClassDB::bind_method(D_METHOD("is_paused"), &VideoPlayer::is_paused);
- ClassDB::bind_method(D_METHOD("set_volume","volume"),&VideoPlayer::set_volume);
- ClassDB::bind_method(D_METHOD("get_volume"),&VideoPlayer::get_volume);
+ ClassDB::bind_method(D_METHOD("set_volume", "volume"), &VideoPlayer::set_volume);
+ ClassDB::bind_method(D_METHOD("get_volume"), &VideoPlayer::get_volume);
- ClassDB::bind_method(D_METHOD("set_volume_db","db"),&VideoPlayer::set_volume_db);
- ClassDB::bind_method(D_METHOD("get_volume_db"),&VideoPlayer::get_volume_db);
+ ClassDB::bind_method(D_METHOD("set_volume_db", "db"), &VideoPlayer::set_volume_db);
+ ClassDB::bind_method(D_METHOD("get_volume_db"), &VideoPlayer::get_volume_db);
- ClassDB::bind_method(D_METHOD("set_audio_track","track"),&VideoPlayer::set_audio_track);
- ClassDB::bind_method(D_METHOD("get_audio_track"),&VideoPlayer::get_audio_track);
+ ClassDB::bind_method(D_METHOD("set_audio_track", "track"), &VideoPlayer::set_audio_track);
+ ClassDB::bind_method(D_METHOD("get_audio_track"), &VideoPlayer::get_audio_track);
- ClassDB::bind_method(D_METHOD("get_stream_name"),&VideoPlayer::get_stream_name);
+ ClassDB::bind_method(D_METHOD("get_stream_name"), &VideoPlayer::get_stream_name);
- ClassDB::bind_method(D_METHOD("get_stream_pos"),&VideoPlayer::get_stream_pos);
+ ClassDB::bind_method(D_METHOD("get_stream_pos"), &VideoPlayer::get_stream_pos);
- ClassDB::bind_method(D_METHOD("set_autoplay","enabled"),&VideoPlayer::set_autoplay);
- ClassDB::bind_method(D_METHOD("has_autoplay"),&VideoPlayer::has_autoplay);
+ ClassDB::bind_method(D_METHOD("set_autoplay", "enabled"), &VideoPlayer::set_autoplay);
+ ClassDB::bind_method(D_METHOD("has_autoplay"), &VideoPlayer::has_autoplay);
- ClassDB::bind_method(D_METHOD("set_expand","enable"), &VideoPlayer::set_expand );
- ClassDB::bind_method(D_METHOD("has_expand"), &VideoPlayer::has_expand );
+ ClassDB::bind_method(D_METHOD("set_expand", "enable"), &VideoPlayer::set_expand);
+ ClassDB::bind_method(D_METHOD("has_expand"), &VideoPlayer::has_expand);
- ClassDB::bind_method(D_METHOD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec);
- ClassDB::bind_method(D_METHOD("get_buffering_msec"),&VideoPlayer::get_buffering_msec);
+ ClassDB::bind_method(D_METHOD("set_buffering_msec", "msec"), &VideoPlayer::set_buffering_msec);
+ ClassDB::bind_method(D_METHOD("get_buffering_msec"), &VideoPlayer::get_buffering_msec);
- ClassDB::bind_method(D_METHOD("get_video_texture:Texture"), &VideoPlayer::get_video_texture );
+ ClassDB::bind_method(D_METHOD("get_video_texture:Texture"), &VideoPlayer::get_video_texture);
- ADD_PROPERTY( PropertyInfo(Variant::INT, "audio_track",PROPERTY_HINT_RANGE,"0,128,1"), "set_audio_track", "get_audio_track") ;
- ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), "set_stream", "get_stream") ;
+ ADD_PROPERTY(PropertyInfo(Variant::INT, "audio_track", PROPERTY_HINT_RANGE, "0,128,1"), "set_audio_track", "get_audio_track");
+ ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream", PROPERTY_HINT_RESOURCE_TYPE, "VideoStream"), "set_stream", "get_stream");
//ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), "set_loop", "has_loop") ;
- ADD_PROPERTY( PropertyInfo(Variant::REAL, "volume_db", PROPERTY_HINT_RANGE,"-80,24,0.01"), "set_volume_db", "get_volume_db") ;
- ADD_PROPERTY( PropertyInfo(Variant::BOOL, "autoplay"), "set_autoplay", "has_autoplay") ;
- ADD_PROPERTY( PropertyInfo(Variant::BOOL, "paused"), "set_paused", "is_paused") ;
- ADD_PROPERTY( PropertyInfo( Variant::BOOL, "expand" ), "set_expand","has_expand") ;
+ ADD_PROPERTY(PropertyInfo(Variant::REAL, "volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01"), "set_volume_db", "get_volume_db");
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "autoplay"), "set_autoplay", "has_autoplay");
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "paused"), "set_paused", "is_paused");
+ ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand"), "set_expand", "has_expand");
}
-
VideoPlayer::VideoPlayer() {
- volume=1;
+ volume = 1;
loops = false;
paused = false;
autoplay = false;
expand = true;
loops = false;
- audio_track=0;
-
- buffering_ms=500;
- server_mix_rate=44100;
+ audio_track = 0;
-// internal_stream.player=this;
-// stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
- last_audio_time=0;
+ buffering_ms = 500;
+ server_mix_rate = 44100;
+ // internal_stream.player=this;
+ // stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream);
+ last_audio_time = 0;
};
VideoPlayer::~VideoPlayer() {
-// if (stream_rid.is_valid())
-// AudioServer::get_singleton()->free(stream_rid);
+ // if (stream_rid.is_valid())
+ // AudioServer::get_singleton()->free(stream_rid);
resampler.clear(); //Not necessary here, but make in consistent with other "stream_player" classes
};
-