thread dict

app/config.py

@@ -11,8 +11,6 @@ SECRET_KEY = os.getenv('SECRET_KEY', 'your-secret-key-here')
 # File upload configuration
 UPLOAD_FOLDER = os.getenv('UPLOAD_FOLDER', BASE_DIR / 'uploads')
 ENCODED_FOLDER = os.getenv('ENCODED_FOLDER', BASE_DIR / 'encoded')
-ALLOWED_EXTENSIONS = {'mp4', 'mov', 'avi', 'mkv', 'wmv'}
-
 
 # Create required directories
 Path(UPLOAD_FOLDER).mkdir(parents=True, exist_ok=True)

app/services/encoder_service.py

@@ -17,6 +17,7 @@ logger = logging.getLogger(__name__)
 class EncoderService:
     def __init__(self):
         self.jobs = {}
+        self.threads = {}  # Store encoding thread references
         # Optimized settings for web streaming
         self.default_qualities = {
             '480p': {
@@ -27,7 +28,7 @@ class EncoderService:
                 'bufsize': '2000k',
                 'audio_bitrate': '128k',
                 'keyframe': '48',  # Keyframe every 2 seconds at 24fps
-                'preset': 'ultrafast',  # Better compression
+                'preset': 'ultrafast',  # Faster encoding speed
                 'profile': 'main',
                 'level': '3.1',
                 'tune': 'fastdecode'
@@ -86,12 +87,12 @@ class EncoderService:
                 'settings': qualities
             }
 
-            # Start encoding in a separate thread.
-            # Note: Removing the daemon flag to ensure the thread completes.
+            # Start encoding in a separate thread and store the thread reference
             thread = threading.Thread(
                 target=self._encode_video,
                 args=(filename, job_id)
             )
+            self.threads[job_id] = thread
             thread.start()
             logger.info(f"Started encoding thread for job {job_id}")
 
@@ -175,17 +176,14 @@ class EncoderService:
                         # Monitor FFmpeg progress with a timeout if no output in 30 seconds
                         last_output_time = time.time()
                         while True:
-                            if process.stdout.readable():
-                                line = process.stdout.readline()
-                            else:
-                                line = ''
+                            line = process.stdout.readline() if process.stdout.readable() else ''
                             if line:
                                 last_output_time = time.time()
                                 progress = self._parse_ffmpeg_progress(line, duration)
                                 if progress is not None:
                                     quality_progress = ((completed_steps + progress / 100) / total_steps) * 100
                                     self.jobs[job_id]['progress'] = quality_progress
-                            # If no new output for 30 seconds, break the loop and retry
+                            # Break if no output for 30 seconds
                             if time.time() - last_output_time > 30:
                                 logger.warning(f"No ffmpeg output for 30 seconds on quality {quality}, attempt {attempts+1} for job {job_id}")
                                 break
@@ -236,6 +234,10 @@ class EncoderService:
                 'status': 'failed',
                 'error': str(e)
             })
+        finally:
+            # Remove thread reference once job completes/fails
+            if job_id in self.threads:
+                del self.threads[job_id]
 
     def _get_video_duration(self, input_file):
         """Get video duration using FFprobe"""