diff --git a/utilities/blender_worker.py b/utilities/blender_worker.py index 89cfa02..465f130 100644 --- a/utilities/blender_worker.py +++ b/utilities/blender_worker.py @@ -22,13 +22,10 @@ class BlenderRenderWorker(BaseRenderWorker): self.export_format = self.args.get('export_format', None) or 'JPEG' self.camera = self.args.get('camera', None) self.render_all_frames = self.args.get('render_all_frames', False) - self.frame = 0 #todo: remove this attribute + self.frame_to_render = 0 # Stats - self.memory_use = None - self.time_elapsed = None - self.time_remaining = None - self.frame_percent_complete = 0.0 + self.__frame_percent_complete = 0.0 # Scene Info self.scene_info = get_scene_info(input_path) @@ -51,7 +48,10 @@ class BlenderRenderWorker(BaseRenderWorker): def _generate_subprocess(self): - cmd = [self.renderer_path(), '-b', self.input_path] + cmd = [self.renderer_path()] + if self.args.get('background', True): # optionally run render not in background + cmd.append('-b') + cmd.append(self.input_path) if self.camera: cmd.extend(['--python-expr', f"import bpy;bpy.context.scene.camera = bpy.data.objects['{self.camera}'];"]) @@ -59,7 +59,7 @@ class BlenderRenderWorker(BaseRenderWorker): cmd.extend(['-E', self.engine, '-o', self.output_path, '-F', self.export_format]) # all frames or single - cmd.extend(['-a'] if self.render_all_frames else ['-f', str(self.frame)]) + cmd.extend(['-a'] if self.render_all_frames else ['-f', str(self.frame_to_render)]) return cmd @@ -70,14 +70,14 @@ class BlenderRenderWorker(BaseRenderWorker): found = pattern.search(line) if found: stats = found.groupdict() - self.memory_use = stats['memory'] - self.time_elapsed = stats['time'] - self.time_remaining = stats['remaining'] or 'Unknown' + memory_use = stats['memory'] + time_elapsed = stats['time'] + time_remaining = stats['remaining'] or 'Unknown' sample_string = line.split('|')[-1].strip() if "sample" in sample_string.lower(): samples = re.sub(r'[^\d/]', '', sample_string) - self.frame_percent_complete = int(samples.split('/')[0]) / int(samples.split('/')[-1]) + self.__frame_percent_complete = int(samples.split('/')[0]) / int(samples.split('/')[-1]) # Calculate rough percent based on cycles # EEVEE @@ -93,8 +93,8 @@ class BlenderRenderWorker(BaseRenderWorker): if int(stats['frame']) > self.current_frame: self.current_frame = int(stats['frame']) logger.debug( - 'Frame:{0} | Mem:{1} | Time:{2} | Remaining:{3}'.format(self.current_frame, self.memory_use, - self.time_elapsed, self.time_remaining)) + 'Frame:{0} | Mem:{1} | Time:{2} | Remaining:{3}'.format(self.current_frame, memory_use, + time_elapsed, time_remaining)) elif 'error' in line.lower(): logger.error(line) self.errors.append(line) @@ -115,10 +115,10 @@ class BlenderRenderWorker(BaseRenderWorker): def percent_complete(self): if self.total_frames <= 1: - return self.frame_percent_complete + return self.__frame_percent_complete else: whole_frame_percent = (self.current_frame - 1) / self.total_frames - adjusted_frame_percent = self.frame_percent_complete / self.total_frames + adjusted_frame_percent = self.__frame_percent_complete / self.total_frames total_percent = whole_frame_percent + adjusted_frame_percent return max(total_percent, 0) diff --git a/utilities/ffmpeg_worker.py b/utilities/ffmpeg_worker.py index f4d9099..6457a5f 100644 --- a/utilities/ffmpeg_worker.py +++ b/utilities/ffmpeg_worker.py @@ -57,7 +57,7 @@ class FFMPEGRenderWorker(BaseRenderWorker): if found: stats = found.groupdict() self.current_frame = stats['current_frame'] - self.time_elapsed = stats['time_elapsed'] + time_elapsed = stats['time_elapsed'] elif "not found" in line: self.errors.append(line) diff --git a/utilities/render_worker.py b/utilities/render_worker.py index 2fca8b7..c4714e1 100644 --- a/utilities/render_worker.py +++ b/utilities/render_worker.py @@ -68,9 +68,9 @@ class BaseRenderWorker(object): self.maximum_attempts = 1 # Threads and processes - self.thread = threading.Thread(target=self.run, args=()) - self.thread.daemon = True - self.process = None + self.__thread = threading.Thread(target=self.run, args=()) + self.__thread.daemon = True + self.__process = None self.is_finished = False self.last_output = None @@ -112,7 +112,7 @@ class BaseRenderWorker(object): self.status = RenderStatus.RUNNING logger.info('Starting {0} {1} Render for {2}'.format(self.renderer, self.version(), self.input_path)) - self.thread.start() + self.__thread.start() def run(self): @@ -135,8 +135,8 @@ class BaseRenderWorker(object): # Start process and get updates subprocess_cmds = self._generate_subprocess() logger.debug("Renderer commands generated - {}".format(" ".join(subprocess_cmds))) - self.process = subprocess.Popen(subprocess_cmds, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, - universal_newlines=False) + self.__process = subprocess.Popen(subprocess_cmds, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, + universal_newlines=False) self.start_time = datetime.now() with open(self.log_path, "a") as f: @@ -144,7 +144,7 @@ class BaseRenderWorker(object): f.write("{3} - Starting {0} {1} Render for {2}\n".format(self.renderer, self.version(), self.input_path, self.start_time.isoformat())) f.write(f"Running command: {' '.join(subprocess_cmds)}\n") - for c in io.TextIOWrapper(self.process.stdout, encoding="utf-8"): # or another encoding + for c in io.TextIOWrapper(self.__process.stdout, encoding="utf-8"): # or another encoding f.write(c) logger.debug(f"{self.renderer}Worker: {c.strip()}") self.last_output = c.strip() @@ -152,7 +152,7 @@ class BaseRenderWorker(object): f.write('\n') # Check return codes - return_code = self.process.wait() + return_code = self.__process.wait() self.end_time = datetime.now() # Return early if job was cancelled if self.status is RenderStatus.CANCELLED: @@ -180,16 +180,16 @@ class BaseRenderWorker(object): self.is_finished = True def is_running(self): - if self.thread: - return self.thread.is_alive() + if self.__thread: + return self.__thread.is_alive() return False def stop(self): - if self.process: + if self.__process: try: self.status = RenderStatus.CANCELLED self.maximum_attempts = 0 - process = psutil.Process(self.process.pid) + process = psutil.Process(self.__process.pid) for proc in process.children(recursive=True): proc.kill() process.kill() diff --git a/utilities/scripts/get_blender_info.py b/utilities/scripts/get_blender_info.py index af23617..8a7c799 100644 --- a/utilities/scripts/get_blender_info.py +++ b/utilities/scripts/get_blender_info.py @@ -13,7 +13,8 @@ data = {'cameras': cameras, 'frame_start': bpy.data.scenes[0].frame_start, 'frame_end': bpy.data.scenes[0].frame_end, 'resolution_x': bpy.data.scenes[0].render.resolution_x, - 'resolution_y': bpy.data.scenes[0].render.resolution_y} + 'resolution_y': bpy.data.scenes[0].render.resolution_y, + 'fps': bpy.data.scenes[0].render.fps} data_string = json.dumps(data) print("SCENE_DATA:" + data_string)