diff --git a/jellybench_py/core.py b/jellybench_py/core.py index 42ca284..4d53b3d 100644 --- a/jellybench_py/core.py +++ b/jellybench_py/core.py @@ -356,8 +356,8 @@ 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_rss_kb": max_pass_run_data["rss_kb"], + "single_worker_speed": max_pass_run_data.get("speed", 0), + "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}") diff --git a/jellybench_py/worker.py b/jellybench_py/worker.py index 6620343..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() @@ -134,7 +136,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