Fix x264/x265, Disable multiplexing (#290)

* Fix x265/x264, Expand gitignore
* Cargo: Disable Multiplex
This commit is contained in:
Luigi311 2021-07-11 05:36:31 -06:00 committed by GitHub
parent 308e97047e
commit 592bd9920d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions

3
.cargo/config Normal file
View file

@ -0,0 +1,3 @@
[http]
timeout = 60 # timeout for each HTTP request, in seconds
multiplexing = false

6
.gitignore vendored
View file

@ -7,9 +7,15 @@ __pycache__/
# C extensions # C extensions
*.so *.so
# Videos
*.mp4 *.mp4
*.av1 *.av1
*.webm *.webm
*.y4m
# Hidden folders
.*
# Distribution / packaging # Distribution / packaging
.Python .Python

View file

@ -63,6 +63,7 @@ def process_encoding_pipe(
print("ERROR IN ENCODING PROCESS") print("ERROR IN ENCODING PROCESS")
print("\n".join(encoder_history)) print("\n".join(encoder_history))
sys.exit(1) sys.exit(1)
new = match_line(encoder, line) new = match_line(encoder, line)
if new > frame: if new > frame:
counter.update(new - frame) counter.update(new - frame)
@ -101,19 +102,19 @@ def create_pipes(
if c.per_shot_target_quality_cq: if c.per_shot_target_quality_cq:
enc_cmd = man_command(a.encoder, enc_cmd, 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( ffmpeg_pipe = subprocess.Popen(
compose_ffmpeg_pipe(a.ffmpeg_pipe), compose_ffmpeg_pipe(a.ffmpeg_pipe),
stdin=ffmpeg_gen_pipe.stdout, stdin=ffmpeg_gen_pipe.stdout,
stdout=PIPE, stdout=PIPE,
stderr=STDOUT, stderr=STDOUT
) )
pipe = subprocess.Popen( pipe = subprocess.Popen(
enc_cmd, enc_cmd,
stdin=ffmpeg_pipe.stdout, stdin=ffmpeg_pipe.stdout,
stdout=PIPE, stdout=PIPE,
stderr=STDOUT, stderr=STDOUT,
universal_newlines=True, universal_newlines=True
) )
utility = (ffmpeg_gen_pipe, ffmpeg_pipe) utility = (ffmpeg_gen_pipe, ffmpeg_pipe)