retryng

app/services/encoder_service.py

@@ -9,6 +9,7 @@ import re
 import threading
 import queue
 import signal
+import time  # Added for retry delays
 
 # Configure logging
 logging.basicConfig(level=logging.INFO)
@@ -100,7 +101,7 @@ class EncoderService:
             return {'status': 'failed', 'error': str(e)}
 
     def _encode_video(self, filename, job_id):
-        """Internal method to handle video encoding"""
+        """Internal method to handle video encoding with retries and enhanced error handling"""
         try:
             upload_path = Path(os.getenv('UPLOAD_FOLDER', 'uploads'))
             encoded_path = Path(os.getenv('ENCODED_FOLDER', 'encoded'))
@@ -122,13 +123,17 @@ class EncoderService:
                 raise Exception("Could not determine video duration")
 
             for quality, settings in qualities.items():
-                try:
+                max_retries = 3
+                attempts = 0
+                success = False
+
+                while attempts < max_retries and not success:
+                    logger.info(f"Starting encoding for quality {quality}, attempt {attempts+1}")
                     self.jobs[job_id].update({
                         'status': 'processing',
                         'current_quality': quality,
                         'progress': (completed_steps / total_steps) * 100
                     })
-
                     output_file = output_dir / f"{output_name}_{quality}.mp4"
                     
                     # FFmpeg command with optimized settings for web streaming
@@ -146,59 +151,65 @@ class EncoderService:
                         '-vf', f"scale={settings['width']}:{settings['height']}",
                         '-g', settings['keyframe'],
                         '-keyint_min', settings['keyframe'],
-                        '-sc_threshold', '0',  # Disable scene cut detection
+                        '-sc_threshold', '0',
                         '-c:a', 'aac',
                         '-b:a', settings['audio_bitrate'],
-                        '-ar', '48000',  # Audio sample rate
-                        '-ac', '2',      # Stereo audio
-                        '-movflags', '+faststart',  # Enable fast start for web playback
+                        '-ar', '48000',
+                        '-ac', '2',
+                        '-movflags', '+faststart',
                         '-progress', 'pipe:1',
                         str(output_file)
                     ]
 
-                    process = subprocess.Popen(
-                        cmd,
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE,
-                        universal_newlines=True
-                    )
+                    try:
+                        process = subprocess.Popen(
+                            cmd,
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.PIPE,
+                            universal_newlines=True
+                        )
+                        self.active_processes[job_id] = process
 
-                    self.active_processes[job_id] = process
+                        # Monitor FFmpeg progress
+                        while True:
+                            line = process.stdout.readline()
+                            if line == '' and process.poll() is not None:
+                                break
+                            if line:
+                                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
 
-                    # Monitor FFmpeg progress
-                    while True:
-                        output = process.stdout.readline()
-                        if output == '' and process.poll() is not None:
-                            break
-                        if output:
-                            progress = self._parse_ffmpeg_progress(output, duration)
-                            if progress is not None:
-                                quality_progress = (completed_steps + progress/100) / total_steps * 100
-                                self.jobs[job_id]['progress'] = quality_progress
-
-                    if process.returncode == 0:
-                        outputs.append({
-                            'quality': quality,
-                            'path': str(output_file),
-                            'settings': settings
-                        })
-                        completed_steps += 1
-                    else:
-                        error_output = process.stderr.read()
-                        logger.error(f"FFmpeg error: {error_output}")
-                        raise Exception(f"FFmpeg failed for quality {quality}")
-
-                except Exception as e:
-                    logger.error(f"Error encoding {quality}: {str(e)}")
-                    self.jobs[job_id].update({
-                        'status': 'failed',
-                        'error': str(e)
-                    })
-                    return
+                        if process.returncode == 0:
+                            logger.info(f"Encoding successful for quality {quality} on attempt {attempts+1}")
+                            outputs.append({
+                                'quality': quality,
+                                'path': str(output_file),
+                                'settings': settings
+                            })
+                            success = True
+                            completed_steps += 1
+                        else:
+                            error_output = process.stderr.read()
+                            logger.error(f"FFmpeg error on quality {quality}, attempt {attempts+1}: {error_output}")
+                            raise Exception(f"FFmpeg failed for quality {quality}")
 
-                finally:
-                    if job_id in self.active_processes:
-                        del self.active_processes[job_id]
+                    except Exception as e:
+                        logger.error(f"Error encoding {quality} on attempt {attempts+1}: {str(e)}")
+                        attempts += 1
+                        if attempts < max_retries:
+                            logger.info(f"Retrying encoding for quality {quality} (attempt {attempts+1} of {max_retries})")
+                            time.sleep(2)  # Wait before retrying
+                        else:
+                            self.jobs[job_id].update({
+                                'status': 'failed',
+                                'error': f"Failed encoding {quality} after {max_retries} attempts: {str(e)}"
+                            })
+                            return
+                    finally:
+                        if job_id in self.active_processes:
+                            del self.active_processes[job_id]
 
             self.jobs[job_id].update({
                 'status': 'completed',