diff --git a/core/joblib/SubprocessorBase.py b/core/joblib/SubprocessorBase.py index 17c4d5d..977681a 100644 --- a/core/joblib/SubprocessorBase.py +++ b/core/joblib/SubprocessorBase.py @@ -162,7 +162,7 @@ class Subprocessor(object): try: cli = self.SubprocessorCli_class(client_dict) cli.state = 1 - cli.sent_time = time.time() + cli.sent_time = 0 cli.sent_data = None cli.name = name cli.host_dict = host_dict @@ -247,7 +247,7 @@ class Subprocessor(object): for cli in self.clis[:]: if cli.state == 1: - if self.no_response_time_sec != 0 and (time.time() - cli.sent_time) > self.no_response_time_sec: + if cli.sent_time != and self.no_response_time_sec != 0 and (time.time() - cli.sent_time) > self.no_response_time_sec: #subprocess busy too long print ( '%s doesnt response, terminating it.' % (cli.name) ) self.on_data_return (cli.host_dict, cli.sent_data ) diff --git a/mainscripts/VideoEd.py b/mainscripts/VideoEd.py index cab6fcc..133848e 100644 --- a/mainscripts/VideoEd.py +++ b/mainscripts/VideoEd.py @@ -68,7 +68,7 @@ def cut_video ( input_file, from_time=None, to_time=None, audio_track_id=None, b if bitrate is None: bitrate = max (1, io.input_int ("Bitrate of output file in MB/s", 25) ) - kwargs = {"c:v": "libx264", + kwargs = {"c:v": "libx265", "b:v": "%dM" %(bitrate), "pix_fmt": "yuv420p", } @@ -188,7 +188,7 @@ def video_from_sequence( input_dir, output_file, reference_file=None, ext=None, output_kwargs.update ({"c:v": "png" }) else: - output_kwargs.update ({"c:v": "libx264", + output_kwargs.update ({"c:v": "libx265", "b:v": "%dM" %(bitrate), "pix_fmt": "yuv420p", })