changes

src/lib/ffmpeg.ts

@@ -20,8 +20,8 @@ const is_prod =
   APP_ENV === "prod" ||
   APP_ENV === "pre_prod";
 
-const ffmpeg_path = is_prod ? "ffmpeg" : ffmpeg || "";
-const ffprobe_path = is_prod ? "ffprobe" : ffprobe.path;
+const ffmpeg_path = !is_prod ? "ffmpeg" : (ffmpeg || "ffmpeg");
+const ffprobe_path = !is_prod ? "ffprobe" : (ffprobe.path || "ffprobe");
 
 // const ffmpeg_path = ffmpeg || "";
 // const ffprobe_path = ffprobe.path;
@@ -221,6 +221,7 @@ async function F_probe_v1(arg0: {
 async function F_probe_v2(arg0: {
   playback_headers?: Record<string, any> | null;
   playback_url: URL;
+  playback_type?: string;
   context?: Context;
 }) {
   const { playback_url, context } = arg0;
@@ -991,7 +992,7 @@ async function F_build_ffmpeg_command_v2(arg0: {
 async function F_build_ffmpeg_command_v3(arg0: {
   playback_headers?: Record<string, any>;
   playback_url: URL;
-  plackback_type?: string;
+  playback_type?: string;
   context?: Context;
   is_net_src?: boolean;
   has_tcp_progress?: boolean;
@@ -1008,7 +1009,7 @@ async function F_build_ffmpeg_command_v3(arg0: {
     subtitles,
     probe_data,
     output_format,
-    live, plackback_type
+    live, playback_type
   } = arg0;
 
   let { playback_headers } = arg0;
@@ -1031,7 +1032,7 @@ async function F_build_ffmpeg_command_v3(arg0: {
   if (is_net_src) {
     command.push("-reconnect", "1");
     command.push("-reconnect_streamed", "1");
-    command.push("-reconnect_delay_max", "15");
+    command.push("-reconnect_delay_max", "10");
 
     command.push("-rw_timeout", timeoutVal, "-timeout", timeoutVal);
 
@@ -1100,13 +1101,14 @@ async function F_build_ffmpeg_command_v3(arg0: {
   // command.push("-http_multiple", "0");
   // command.push("-analyzeduration", "10M");
   // command.push("-probesize", "10M");
-  // command.push("-err_detect", "ignore_err");
-  // command.push("-fflags", "+discardcorrupt+genpts+nobuffer");
   // command.push("-seg_max_retry", "5");
   // command.push("-max_reload", "100");
 
-  if(plackback_type === 'hls') {
-    command.push("-http_persistent", "0");
+  command.push("-fflags", "+discardcorrupt+genpts+nobuffer");
+  command.push("-err_detect", "ignore_err");
+
+  if(playback_type === 'hls') {
+    command.push("-http_persistent", "1");
   }
 
   command.push("-i", playback_url.href);
@@ -1339,7 +1341,7 @@ async function F_build_ffmpeg_command_v3(arg0: {
   /* ENCODING & TUNING */
   command.push("-tune", "zerolatency");
   command.push("-crf", "23");
-  command.push("-preset", use_ultrafast ? "ultrafast" : "ultrafast"); // veryfast faster medium
+  command.push("-preset", use_ultrafast ? "ultrafast" : "medium"); // ultrafast veryfast faster medium
   command.push("-pix_fmt", "yuv420p");
   command.push("-max_interleave_delta", "0");
 
@@ -1353,9 +1355,7 @@ async function F_build_ffmpeg_command_v3(arg0: {
 
   command.push(
     "-avoid_negative_ts",
-    "make_zero",
-    "-fflags",
-    "+genpts+nobuffer"
+    "make_zero"
   );
 
   if (live === "stream") {

src/sub-router/ffmpeg.ts

@@ -21,6 +21,7 @@ const sub_router = new Elysia({ prefix: "/ffmpeg" })
       let playback = body?.playback;
       let playback_headers = body?.playback_headers;
       let gen = body?.gen;
+      let playback_type = body?.playback_type;
 
       const REQ0 = request.url;
       const REQ_ORIGIN = (ctx as any).publicOrigin || new URL(REQ0).origin;
@@ -66,7 +67,7 @@ const sub_router = new Elysia({ prefix: "/ffmpeg" })
         promise: NS_ffmpeg.F_probe_v2({
           playback_url: new URL(playback),
           context: ctx,
-          playback_headers
+          playback_headers, playback_type
         })
       });
 
@@ -181,7 +182,7 @@ const sub_router = new Elysia({ prefix: "/ffmpeg" })
         subtitles: subtitles_ary,
         out_mime,
         probe_data,
-        progress_update_endpoint
+        progress_update_endpoint, playback_type
       };
 
       const data_str = devalue.stringify(data);
@@ -232,6 +233,14 @@ const sub_router = new Elysia({ prefix: "/ffmpeg" })
             error: () => "Invalid playback headers"
           })
         ),
+        playback_type: t.Optional(
+          t.String({
+            minLength: 1,
+            error() {
+              return "Invalid playback type";
+            }
+          })
+        ),
         gen: t.Optional(
           t.Object(
             {

src/sub-router/showtime.ts

@@ -171,7 +171,7 @@ async function F_handle_process(arg0: {
     subtitles,
     out_mime,
     probe_data,
-    progress_update_endpoint
+    progress_update_endpoint, playback_type
   } = start_data;
 
   const REQ0 = request.url;
@@ -372,7 +372,7 @@ async function F_handle_process(arg0: {
     subtitles: subtitles_ary,
     has_tcp_progress: tcp_progress,
     is_net_src: is_network_source,
-    playback_headers: playback_headers
+    playback_headers: playback_headers, playback_type
   });
 
   if (tcp_progress) {