forktown/Av1an
1
0
Fork 0
mirror of https://github.com/master-of-zen/Av1an.git synced 2024-11-25 02:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix not using total frame count with scenes file

Browse source
This commit is contained in:
Zen 2020-12-26 15:59:26 +02:00
parent f414cb845e
commit c73705a452
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
av1an/encode.py
View file

@ -66,11 +66,6 @@ def encode_file(project: Project):
def startup(project: Project, chunk_queue: List[Chunk]):
"""
If resuming, open done file and get file properties from there
else get file properties and
"""
done_path = project.temp / 'done.json'
if project.resume and done_path.exists():
log('Resuming...\n')
@ -83,7 +78,7 @@ def startup(project: Project, chunk_queue: List[Chunk]):
log(f'Resumed with {done} encoded clips done\n\n')
else:
initial = 0
total = frame_probe_fast(project.input, project.is_vs)
total = project.get_frames()
d = {'frames': total, 'done': {}}
with open(done_path, 'w') as done_file:
json.dump(d, done_file)
@ -98,16 +93,15 @@ def startup(project: Project, chunk_queue: List[Chunk]):
def encoding_loop(project: Project, chunk_queue: List[Chunk]):
"""Creating process pool for encoders, creating progress bar."""
if project.workers != 0:
with concurrent.futures.ThreadPoolExecutor(max_workers=project.workers) as executor:
future_cmd = {executor.submit(encode, cmd, project): cmd for cmd in chunk_queue}
for future in concurrent.futures.as_completed(future_cmd):
try:
future.result()
except Exception as exc:
_, _, exc_tb = sys.exc_info()
print(f'Encoding error {exc}\nAt line {exc_tb.tb_lineno}')
terminate()
with concurrent.futures.ThreadPoolExecutor(max_workers=project.workers) as executor:
future_cmd = {executor.submit(encode, cmd, project): cmd for cmd in chunk_queue}
for future in concurrent.futures.as_completed(future_cmd):
try:
future.result()
except Exception as exc:
_, _, exc_tb = sys.exc_info()
print(f'Encoding error {exc}\nAt line {exc_tb.tb_lineno}')
terminate()
project.counter.close()