diff options
Diffstat (limited to '')
| -rw-r--r-- | scene/gui/video_player.cpp | 176 |
1 files changed, 80 insertions, 96 deletions
diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 46b7bc6cb..6a7f153fc 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -29,39 +29,37 @@ #include "video_player.h" #include "os/os.h" - int VideoPlayer::InternalStream::get_channel_count() const { return player->sp_get_channel_count(); } -void VideoPlayer::InternalStream::set_mix_rate(int p_rate){ +void VideoPlayer::InternalStream::set_mix_rate(int p_rate) { return player->sp_set_mix_rate(p_rate); } -bool VideoPlayer::InternalStream::mix(int32_t *p_buffer,int p_frames){ +bool VideoPlayer::InternalStream::mix(int32_t *p_buffer, int p_frames) { - return player->sp_mix(p_buffer,p_frames); + return player->sp_mix(p_buffer, p_frames); } -void VideoPlayer::InternalStream::update(){ +void VideoPlayer::InternalStream::update() { player->sp_update(); } - 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; @@ -92,24 +90,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) { @@ -132,12 +128,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; @@ -149,17 +144,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()) @@ -170,7 +161,7 @@ Size2 VideoPlayer::get_minimum_size() const { void VideoPlayer::set_expand(bool p_expand) { - expand=p_expand; + expand = p_expand; update(); minimum_size_changed(); } @@ -180,35 +171,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(); @@ -218,7 +208,6 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) { } update(); - }; Ref<VideoStream> VideoPlayer::get_stream() const { @@ -234,9 +223,9 @@ void VideoPlayer::play() { playback->stop(); playback->play(); set_process(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() { @@ -247,10 +236,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(false); - last_audio_time=0; + last_audio_time = 0; }; bool VideoPlayer::is_playing() const { @@ -263,7 +252,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(!p_paused); @@ -278,27 +267,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 { @@ -308,7 +296,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)); @@ -316,13 +304,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()) @@ -342,12 +329,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 { @@ -357,69 +344,67 @@ bool VideoPlayer::has_autoplay() const { void VideoPlayer::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_stream","stream:VideoStream"),&VideoPlayer::set_stream); - ObjectTypeDB::bind_method(_MD("get_stream:VideoStream"),&VideoPlayer::get_stream); + ObjectTypeDB::bind_method(_MD("set_stream", "stream:VideoStream"), &VideoPlayer::set_stream); + ObjectTypeDB::bind_method(_MD("get_stream:VideoStream"), &VideoPlayer::get_stream); - ObjectTypeDB::bind_method(_MD("play"),&VideoPlayer::play); - ObjectTypeDB::bind_method(_MD("stop"),&VideoPlayer::stop); + ObjectTypeDB::bind_method(_MD("play"), &VideoPlayer::play); + ObjectTypeDB::bind_method(_MD("stop"), &VideoPlayer::stop); - ObjectTypeDB::bind_method(_MD("is_playing"),&VideoPlayer::is_playing); + ObjectTypeDB::bind_method(_MD("is_playing"), &VideoPlayer::is_playing); - ObjectTypeDB::bind_method(_MD("set_paused","paused"),&VideoPlayer::set_paused); - ObjectTypeDB::bind_method(_MD("is_paused"),&VideoPlayer::is_paused); + ObjectTypeDB::bind_method(_MD("set_paused", "paused"), &VideoPlayer::set_paused); + ObjectTypeDB::bind_method(_MD("is_paused"), &VideoPlayer::is_paused); - ObjectTypeDB::bind_method(_MD("set_volume","volume"),&VideoPlayer::set_volume); - ObjectTypeDB::bind_method(_MD("get_volume"),&VideoPlayer::get_volume); + ObjectTypeDB::bind_method(_MD("set_volume", "volume"), &VideoPlayer::set_volume); + ObjectTypeDB::bind_method(_MD("get_volume"), &VideoPlayer::get_volume); - ObjectTypeDB::bind_method(_MD("set_volume_db","db"),&VideoPlayer::set_volume_db); - ObjectTypeDB::bind_method(_MD("get_volume_db"),&VideoPlayer::get_volume_db); + ObjectTypeDB::bind_method(_MD("set_volume_db", "db"), &VideoPlayer::set_volume_db); + ObjectTypeDB::bind_method(_MD("get_volume_db"), &VideoPlayer::get_volume_db); - ObjectTypeDB::bind_method(_MD("set_audio_track","track"),&VideoPlayer::set_audio_track); - ObjectTypeDB::bind_method(_MD("get_audio_track"),&VideoPlayer::get_audio_track); + ObjectTypeDB::bind_method(_MD("set_audio_track", "track"), &VideoPlayer::set_audio_track); + ObjectTypeDB::bind_method(_MD("get_audio_track"), &VideoPlayer::get_audio_track); - ObjectTypeDB::bind_method(_MD("get_stream_name"),&VideoPlayer::get_stream_name); + ObjectTypeDB::bind_method(_MD("get_stream_name"), &VideoPlayer::get_stream_name); - ObjectTypeDB::bind_method(_MD("get_stream_pos"),&VideoPlayer::get_stream_pos); + ObjectTypeDB::bind_method(_MD("get_stream_pos"), &VideoPlayer::get_stream_pos); - ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&VideoPlayer::set_autoplay); - ObjectTypeDB::bind_method(_MD("has_autoplay"),&VideoPlayer::has_autoplay); + ObjectTypeDB::bind_method(_MD("set_autoplay", "enabled"), &VideoPlayer::set_autoplay); + ObjectTypeDB::bind_method(_MD("has_autoplay"), &VideoPlayer::has_autoplay); - ObjectTypeDB::bind_method(_MD("set_expand","enable"), &VideoPlayer::set_expand ); - ObjectTypeDB::bind_method(_MD("has_expand"), &VideoPlayer::has_expand ); + ObjectTypeDB::bind_method(_MD("set_expand", "enable"), &VideoPlayer::set_expand); + ObjectTypeDB::bind_method(_MD("has_expand"), &VideoPlayer::has_expand); - ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec); - ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&VideoPlayer::get_buffering_msec); + ObjectTypeDB::bind_method(_MD("set_buffering_msec", "msec"), &VideoPlayer::set_buffering_msec); + ObjectTypeDB::bind_method(_MD("get_buffering_msec"), &VideoPlayer::get_buffering_msec); - ObjectTypeDB::bind_method(_MD("get_video_texture:Texture"), &VideoPlayer::get_video_texture ); + ObjectTypeDB::bind_method(_MD("get_video_texture:Texture"), &VideoPlayer::get_video_texture); - ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/audio_track",PROPERTY_HINT_RANGE,"0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track") ); - ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), _SCS("set_stream"), _SCS("get_stream") ); -// ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop") ); - ADD_PROPERTY( PropertyInfo(Variant::REAL, "stream/volume_db", PROPERTY_HINT_RANGE,"-80,24,0.01"), _SCS("set_volume_db"), _SCS("get_volume_db") ); - ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/autoplay"), _SCS("set_autoplay"), _SCS("has_autoplay") ); - ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/paused"), _SCS("set_paused"), _SCS("is_paused") ); - ADD_PROPERTY( PropertyInfo( Variant::BOOL, "expand" ), _SCS("set_expand"),_SCS("has_expand") ); + ADD_PROPERTY(PropertyInfo(Variant::INT, "stream/audio_track", PROPERTY_HINT_RANGE, "0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track")); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE, "VideoStream"), _SCS("set_stream"), _SCS("get_stream")); + // ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop") ); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "stream/volume_db", PROPERTY_HINT_RANGE, "-80,24,0.01"), _SCS("set_volume_db"), _SCS("get_volume_db")); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/autoplay"), _SCS("set_autoplay"), _SCS("has_autoplay")); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "stream/paused"), _SCS("set_paused"), _SCS("is_paused")); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "expand"), _SCS("set_expand"), _SCS("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() { @@ -428,4 +413,3 @@ VideoPlayer::~VideoPlayer() { AudioServer::get_singleton()->free(stream_rid); resampler.clear(); //Not necessary here, but make in consistent with other "stream_player" classes }; - |
