dave/py-media-grader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix rendering again........

Browse Source
This commit is contained in:
PhatPhuckDave
2025-09-08 20:39:26 +02:00
parent d6af05b6db
commit 8f77960183
1 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
croppa/main.py
View File

@@ -1872,16 +1872,28 @@ class VideoEditor:
output_path output_path
] ]
# Start FFmpeg process with Windows-optimized configuration # Use a more robust approach: write to a temporary file in chunks
import tempfile
import os
# Create a temporary file for the raw video data
temp_file = tempfile.NamedTemporaryFile(delete=False, suffix='.raw')
temp_file.close()
print(f"Using temporary file approach: {temp_file.name}")
# Modify FFmpeg command to read from file
ffmpeg_cmd[ffmpeg_cmd.index('-i') + 1] = temp_file.name
# Start FFmpeg process
self.ffmpeg_process = subprocess.Popen( self.ffmpeg_process = subprocess.Popen(
ffmpeg_cmd, ffmpeg_cmd,
stdin=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
stdout=subprocess.DEVNULL, # Discard stdout to prevent hanging stdout=subprocess.DEVNULL,
bufsize=65536, # 64KB buffer to prevent Windows pipe overflow
universal_newlines=False, # Binary mode for Windows
creationflags=subprocess.CREATE_NO_WINDOW if hasattr(subprocess, 'CREATE_NO_WINDOW') else 0 creationflags=subprocess.CREATE_NO_WINDOW if hasattr(subprocess, 'CREATE_NO_WINDOW') else 0
) )
self.temp_file_name = temp_file.name
# OpenCV for frame reading and transformations # OpenCV for frame reading and transformations
render_cap = cv2.VideoCapture(str(self.video_path)) render_cap = cv2.VideoCapture(str(self.video_path))
@@ -1894,60 +1906,57 @@ class VideoEditor:
self.render_progress_queue.put(("progress", f"Processing {total_frames} frames...", 0.1, 0.0)) self.render_progress_queue.put(("progress", f"Processing {total_frames} frames...", 0.1, 0.0))
for i in range(total_frames): # Write all frames to temporary file first
if self.render_cancelled: with open(self.temp_file_name, 'wb') as temp_file:
self.ffmpeg_process.stdin.close() for i in range(total_frames):
self.ffmpeg_process.terminate() if self.render_cancelled:
self.ffmpeg_process.wait() render_cap.release()
render_cap.release() self.render_progress_queue.put(("cancelled", "Render cancelled", 0.0, 0.0))
self.ffmpeg_process = None return False
self.render_progress_queue.put(("cancelled", "Render cancelled", 0.0, 0.0))
return False
ret, frame = render_cap.read() ret, frame = render_cap.read()
if not ret: if not ret:
break
# Apply transformations with OpenCV
processed_frame = self._process_frame_for_render(frame, output_width, output_height)
if processed_frame is not None:
# Debug frame dimensions
if i == 0: # Only print for first frame
print(f"Processed frame dimensions: {processed_frame.shape[1]}x{processed_frame.shape[0]}")
print(f"Expected dimensions: {output_width}x{output_height}")
# Write frame to FFmpeg via pipe
try:
self.ffmpeg_process.stdin.write(processed_frame.tobytes())
frames_written += 1
# Small delay every 10 frames to prevent Windows pipe overflow
if frames_written % 10 == 0:
time.sleep(0.001) # 1ms delay
except BrokenPipeError:
# FFmpeg process died
print("FFmpeg process died - BrokenPipeError")
break break
# Update progress with FPS calculation # Apply transformations with OpenCV
current_time = time.time() processed_frame = self._process_frame_for_render(frame, output_width, output_height)
progress = 0.1 + (0.8 * (i + 1) / total_frames) if processed_frame is not None:
# Debug frame dimensions
# Calculate FPS and update progress (throttled) if i == 0: # Only print for first frame
if current_time - last_progress_update > 0.5: print(f"Processed frame dimensions: {processed_frame.shape[1]}x{processed_frame.shape[0]}")
elapsed = current_time - start_time print(f"Expected dimensions: {output_width}x{output_height}")
fps_rate = frames_written / elapsed if elapsed > 0 else 0
self.render_progress_queue.put(("progress", f"Processed {i+1}/{total_frames} frames", progress, fps_rate)) # Write frame to temporary file
last_progress_update = current_time temp_file.write(processed_frame.tobytes())
frames_written += 1
# Close FFmpeg input and wait for completion # Update progress with FPS calculation
self.ffmpeg_process.stdin.close() current_time = time.time()
progress = 0.1 + (0.8 * (i + 1) / total_frames)
# Calculate FPS and update progress (throttled)
if current_time - last_progress_update > 0.5:
elapsed = current_time - start_time
fps_rate = frames_written / elapsed if elapsed > 0 else 0
self.render_progress_queue.put(("progress", f"Processed {i+1}/{total_frames} frames", progress, fps_rate))
last_progress_update = current_time
render_cap.release()
# Now wait for FFmpeg to finish encoding
self.render_progress_queue.put(("progress", "Encoding with FFmpeg...", 0.9, 0.0))
# Wait for FFmpeg to finish encoding
stderr = self.ffmpeg_process.communicate()[1] stderr = self.ffmpeg_process.communicate()[1]
return_code = self.ffmpeg_process.returncode return_code = self.ffmpeg_process.returncode
self.ffmpeg_process = None self.ffmpeg_process = None
render_cap.release() # Clean up temporary file
if hasattr(self, 'temp_file_name') and os.path.exists(self.temp_file_name):
try:
os.unlink(self.temp_file_name)
except OSError:
pass
if return_code == 0: if return_code == 0:
total_time = time.time() - start_time total_time = time.time() - start_time