fix: reconnect to sourceStream ffmpeg

antebrl · Dec 21, 2024 · 84776cf · 84776cf
1 parent 9fba7a4
commit 84776cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/backend/services/streaming/FFmpegService.js b/backend/services/streaming/FFmpegService.js
@@ -2,30 +2,35 @@ const { spawn } = require('child_process');
 require('dotenv').config();
 
 let currentFFmpegProcess = null;
+let currentChannelId = null;
 const STORAGE_PATH = process.env.STORAGE_PATH;
 
 function startFFmpeg(nextChannel) {
-    console.log('Starting FFmpeg process...');
+    console.log('Starting FFmpeg process with channel:', nextChannel.id);
     if (currentFFmpegProcess) {
         console.log('Gracefully terminate previous ffmpeg-Prozess...');
         currentFFmpegProcess.kill('SIGTERM');
     }
 
     const channelUrl = nextChannel.url;
-    const channelId = nextChannel.id;
+    currentChannelId = nextChannel.id;
     const headers = nextChannel.headers;
 
 
     currentFFmpegProcess = spawn('ffmpeg', [
         '-headers', headers.map(header => `${header.key}: ${header.value}`).join('\r\n'),
+        '-reconnect', '1',
+        '-reconnect_at_eof', '1',
+        '-reconnect_streamed', '1',
+        '-reconnect_delay_max', '2',
         '-i', channelUrl,
         '-c', 'copy',
         '-f', 'hls',
         '-hls_time', '6',
         '-hls_list_size', '5',
         '-hls_flags', 'delete_segments+program_date_time',
         '-start_number', Math.floor(Date.now() / 1000),
-        `${STORAGE_PATH}${channelId}/${channelId}.m3u8`
+        `${STORAGE_PATH}${currentChannelId}/${currentChannelId}.m3u8`
     ]);
 
     // currentFFmpegProcess.stdout.on('data', (data) => {
@@ -38,13 +43,14 @@ function startFFmpeg(nextChannel) {
 
     currentFFmpegProcess.on('close', (code) => {
         console.log(`ffmpeg-Process terminated with code: ${code}`);
-        currentFFmpegProcess = null;
 
-        //Restart if crashed
-        if (code && code !== 255) {
-            console.log(`Restarting FFmpeg process...`);
-            startFFmpeg(nextChannel);
-        }
+        // currentFFmpegProcess = null;
+        // //Restart if crashed
+        // if (code !== null && code !== 255) {
+        //     console.log(`Restarting FFmpeg process with channel: ${nextChannel.id}`);
+        //     //wait 1 second before restarting
+        //     setTimeout(() => startFFmpeg(nextChannel), 2000);
+        // }
     });
 }
 

diff --git a/frontend/src/components/VideoPlayer.tsx b/frontend/src/components/VideoPlayer.tsx
@@ -158,6 +158,8 @@ function VideoPlayer({ channel, syncEnabled }: VideoPlayerProps) {
       hls.on(Hls.Events.ERROR, (_, data) => {
         if (data.fatal) {
 
+          console.error('HLS error:', data);
+
           if (toastStartId) {
             removeToast(toastStartId);
           }