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

some fixes

Browse source 
-fix compilation on tres/tscn on MSVC
-fixed theora playback performance, closes #3004
This commit is contained in:
Juan Linietsky 2015-12-06 20:22:45 -03:00
parent 17a4ab992c
commit 7ba484bc74
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/io/resource_format_binary.cpp
View file

@ -905,7 +905,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) {
error=ERR_FILE_UNRECOGNIZED; error=ERR_FILE_UNRECOGNIZED;
ERR_EXPLAIN("Unrecognized binary resource file: "+local_path); ERR_EXPLAIN("Unrecognized binary resource file: "+local_path);
ERR_FAIL_V(); ERR_FAIL();
} }
bool big_endian = f->get_32(); bool big_endian = f->get_32();

2
drivers/theora/video_stream_theora.cpp
View file

@ -411,6 +411,7 @@ void VideoStreamPlaybackTheora::set_file(const String& p_file) {
th_decode_ctl(td,TH_DECCTL_GET_PPLEVEL_MAX,&pp_level_max, th_decode_ctl(td,TH_DECCTL_GET_PPLEVEL_MAX,&pp_level_max,
sizeof(pp_level_max)); sizeof(pp_level_max));
pp_level=pp_level_max; pp_level=pp_level_max;
pp_level=0;
th_decode_ctl(td,TH_DECCTL_SET_PPLEVEL,&pp_level,sizeof(pp_level)); th_decode_ctl(td,TH_DECCTL_SET_PPLEVEL,&pp_level,sizeof(pp_level));
pp_inc=0; pp_inc=0;
@ -620,7 +621,6 @@ void VideoStreamPlaybackTheora::update(float p_delta) {
if(videobuf_time>=get_time()) { if(videobuf_time>=get_time()) {
frame_done=true; frame_done=true;
} else{ } else{
/*If we are too slow, reduce the pp level.*/ /*If we are too slow, reduce the pp level.*/
pp_inc=pp_level>0?-1:0; pp_inc=pp_level>0?-1:0;

6
drivers/theora/video_stream_theora.h
View file

@ -138,20 +138,20 @@ class VideoStreamTheora : public VideoStream {
OBJ_TYPE(VideoStreamTheora,VideoStream); OBJ_TYPE(VideoStreamTheora,VideoStream);
String file; String file;
int audio_track; int audio_track;
public: public:
Ref<VideoStreamPlayback> instance_playback() { Ref<VideoStreamPlayback> instance_playback() {
Ref<VideoStreamPlaybackTheora> pb = memnew( VideoStreamPlaybackTheora ); Ref<VideoStreamPlaybackTheora> pb = memnew( VideoStreamPlaybackTheora );
pb->set_audio_track(audio_track); pb->set_audio_track(audio_track);
pb->set_file(file); pb->set_file(file);
return pb; return pb;
} }
void set_file(const String& p_file) { file=p_file; } void set_file(const String& p_file) { file=p_file; }
void set_audio_track(int p_track) { audio_track=p_track; } void set_audio_track(int p_track) { audio_track=p_track; }
VideoStreamTheora() { audio_track=0; } VideoStreamTheora() { audio_track=0; }

1
platform/windows/detect.py
View file

@ -170,7 +170,6 @@ def get_flags():
return [ return [
('freetype','builtin'), #use builtin freetype ('freetype','builtin'), #use builtin freetype
('openssl','builtin'), #use builtin openssl ('openssl','builtin'), #use builtin openssl
('theora','no'),
] ]
def build_res_file( target, source, env ): def build_res_file( target, source, env ):