github/DeepFaceLab
1
0
Fork 0
mirror of https://github.com/iperov/DeepFaceLab.git synced 2025-07-06 21:12:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

1

Browse source
This commit is contained in:
Colombo 2020-01-22 17:21:33 +04:00
parent 60804ca3ba
commit 3924ef2bf5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/joblib/SubprocessorBase.py
View file

@ -162,7 +162,7 @@ class Subprocessor(object):
try: try:
cli = self.SubprocessorCli_class(client_dict) cli = self.SubprocessorCli_class(client_dict)
cli.state = 1 cli.state = 1
cli.sent_time = time.time() cli.sent_time = 0
cli.sent_data = None cli.sent_data = None
cli.name = name cli.name = name
cli.host_dict = host_dict cli.host_dict = host_dict
@ -247,7 +247,7 @@ class Subprocessor(object):
for cli in self.clis[:]: for cli in self.clis[:]:
if cli.state == 1: 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 #subprocess busy too long
print ( '%s doesnt response, terminating it.' % (cli.name) ) print ( '%s doesnt response, terminating it.' % (cli.name) )
self.on_data_return (cli.host_dict, cli.sent_data ) self.on_data_return (cli.host_dict, cli.sent_data )

4
mainscripts/VideoEd.py
View file

@ -68,7 +68,7 @@ def cut_video ( input_file, from_time=None, to_time=None, audio_track_id=None, b
if bitrate is None: if bitrate is None:
bitrate = max (1, io.input_int ("Bitrate of output file in MB/s", 25) ) 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), "b:v": "%dM" %(bitrate),
"pix_fmt": "yuv420p", "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" output_kwargs.update ({"c:v": "png"
}) })
else: else:
output_kwargs.update ({"c:v": "libx264", output_kwargs.update ({"c:v": "libx265",
"b:v": "%dM" %(bitrate), "b:v": "%dM" %(bitrate),
"pix_fmt": "yuv420p", "pix_fmt": "yuv420p",
}) })