From 58ae63aaf63577e51260ca74eb06553985653227 Mon Sep 17 00:00:00 2001 From: Connor Ness Date: Mon, 17 Mar 2025 15:20:49 -0500 Subject: [PATCH 1/4] fix https://github.com/BotBlake/jellybench_py/issues/70 --- jellybench_py/worker.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jellybench_py/worker.py b/jellybench_py/worker.py index 6620343..0a9f489 100644 --- a/jellybench_py/worker.py +++ b/jellybench_py/worker.py @@ -134,7 +134,10 @@ def workMan(worker_count: int, ffmpeg_cmd: str, passed_logger: Logger) -> tuple: new_line = line.split() frames.append(int(float(new_line[0].split("=")[-1]))) framerates += int(float(new_line[1].split("=")[-1])) - speeds.append(float(new_line[6].split("=")[-1].replace("x", ""))) + speed = new_line[6].split("=")[-1].replace("x", "") + if speed == "N/A": + speed = 0 + speeds.append(float(speed)) lineAmmount = len(framelines) if lineAmmount == 0: lineAmmount = 1 From 2eedd22ce1d94438ffa1b9b82092379b345dd89b Mon Sep 17 00:00:00 2001 From: Connor Ness Date: Mon, 17 Mar 2025 17:57:34 -0500 Subject: [PATCH 2/4] fix KeyError: 'speed' when ffmpeg does not print 'speed' --- jellybench_py/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jellybench_py/core.py b/jellybench_py/core.py index fdb6fde..323219d 100644 --- a/jellybench_py/core.py +++ b/jellybench_py/core.py @@ -354,7 +354,7 @@ def benchmark(ffmpeg_cmd: str, debug_flag: bool, prog_bar, limit=0) -> tuple: result = { "max_streams": max_pass, "failure_reasons": failure_reason, - "single_worker_speed": max_pass_run_data["speed"], + "single_worker_speed": max_pass_run_data.get("speed", 0), "single_worker_rss_kb": max_pass_run_data["rss_kb"], } if prog_bar: From d7611d294f767b4ef41c1f9b60d92916fa2a59ed Mon Sep 17 00:00:00 2001 From: Connor Ness Date: Mon, 17 Mar 2025 20:24:25 -0500 Subject: [PATCH 3/4] Fix KeyError: 'rss_kb' --- jellybench_py/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jellybench_py/core.py b/jellybench_py/core.py index 323219d..3cf010d 100644 --- a/jellybench_py/core.py +++ b/jellybench_py/core.py @@ -355,7 +355,7 @@ def benchmark(ffmpeg_cmd: str, debug_flag: bool, prog_bar, limit=0) -> tuple: "max_streams": max_pass, "failure_reasons": failure_reason, "single_worker_speed": max_pass_run_data.get("speed", 0), - "single_worker_rss_kb": max_pass_run_data["rss_kb"], + "single_worker_rss_kb": max_pass_run_data.get("rss_kb", 0), } if prog_bar: prog_bar.update(status="Done", workers=max_pass, speed=f"{last_speed:.02f}") From 35b4d43c5012f4b830997f117e99255d7a19490f Mon Sep 17 00:00:00 2001 From: Connor Ness Date: Mon, 24 Mar 2025 16:56:55 -0500 Subject: [PATCH 4/4] hack missing workrss --- jellybench_py/worker.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jellybench_py/worker.py b/jellybench_py/worker.py index 0a9f489..7b375cf 100644 --- a/jellybench_py/worker.py +++ b/jellybench_py/worker.py @@ -122,6 +122,8 @@ def workMan(worker_count: int, ffmpeg_cmd: str, passed_logger: Logger) -> tuple: workrss = float( rssline[1].split("=")[-1].replace("kB", "").replace("KiB", "") ) # maxrss + else: + workrss = 0 if re.match(r"^bench: utime", line): timeline = line.split()