From 592bd9920d902a0097916091cf7eca2111a32e91 Mon Sep 17 00:00:00 2001 From: Luigi311 Date: Sun, 11 Jul 2021 05:36:31 -0600 Subject: [PATCH] Fix x264/x265, Disable multiplexing (#290) * Fix x265/x264, Expand gitignore * Cargo: Disable Multiplex --- .cargo/config | 3 +++ .gitignore | 6 ++++++ av1an/manager/Pipes.py | 7 ++++--- 3 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 .cargo/config diff --git a/.cargo/config b/.cargo/config new file mode 100644 index 0000000..3f1f04b --- /dev/null +++ b/.cargo/config @@ -0,0 +1,3 @@ +[http] +timeout = 60 # timeout for each HTTP request, in seconds +multiplexing = false diff --git a/.gitignore b/.gitignore index 5941ee8..3724fcf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,15 @@ __pycache__/ # C extensions *.so + +# Videos *.mp4 *.av1 *.webm +*.y4m + +# Hidden folders +.* # Distribution / packaging .Python diff --git a/av1an/manager/Pipes.py b/av1an/manager/Pipes.py index b0ff2bd..d8c15d0 100644 --- a/av1an/manager/Pipes.py +++ b/av1an/manager/Pipes.py @@ -63,6 +63,7 @@ def process_encoding_pipe( print("ERROR IN ENCODING PROCESS") print("\n".join(encoder_history)) sys.exit(1) + new = match_line(encoder, line) if new > frame: counter.update(new - frame) @@ -101,19 +102,19 @@ def create_pipes( if c.per_shot_target_quality_cq: enc_cmd = man_command(a.encoder, enc_cmd, c.per_shot_target_quality_cq) - ffmpeg_gen_pipe = subprocess.Popen(c.ffmpeg_gen_cmd, stdout=PIPE, stderr=STDOUT) + ffmpeg_gen_pipe = subprocess.Popen(c.ffmpeg_gen_cmd, stdout=PIPE) ffmpeg_pipe = subprocess.Popen( compose_ffmpeg_pipe(a.ffmpeg_pipe), stdin=ffmpeg_gen_pipe.stdout, stdout=PIPE, - stderr=STDOUT, + stderr=STDOUT ) pipe = subprocess.Popen( enc_cmd, stdin=ffmpeg_pipe.stdout, stdout=PIPE, stderr=STDOUT, - universal_newlines=True, + universal_newlines=True ) utility = (ffmpeg_gen_pipe, ffmpeg_pipe)