piixishstream 1.0.5 → 1.0.7

package/dist/media/newApi.js

@@ -33,6 +33,7 @@ export function prepareStream(input, options = {}, cancelSignal) {
         },
         customInputOptions: [],
         customFfmpegFlags: [],
+    audioInput: undefined,
     };
     function mergeOptions(opts) {
         return {
@@ -67,6 +68,7 @@ export function prepareStream(input, options = {}, cancelSignal) {
             },
             customInputOptions: opts.customInputOptions ?? defaultOptions.customInputOptions,
             customFfmpegFlags: opts.customFfmpegFlags ?? defaultOptions.customFfmpegFlags,
+            audioInput: opts.audioInput ?? defaultOptions.audioInput,
         };
     }
     const mergedOptions = mergeOptions(options);
@@ -80,8 +82,11 @@ export function prepareStream(input, options = {}, cancelSignal) {
     }
     const output = new PassThrough();
     // command creation
-    const command = ffmpeg(input);
-    // input options
+    const command = ffmpeg(input);
+    if (mergedOptions.audioInput) {
+        command.input(mergedOptions.audioInput).inputOptions(["-stream_loop", "-1"]);
+    }
+  // input options
     if (mergedOptions.customInputOptions &&
         mergedOptions.customInputOptions.length > 0) {
         command.inputOptions(mergedOptions.customInputOptions);
@@ -144,10 +149,14 @@ export function prepareStream(input, options = {}, cancelSignal) {
             .outputOptions(encoderSettings.globalOptions ?? []);
     }
     // audio setup
-    const { includeAudio, bitrateAudio } = mergedOptions;
-    if (includeAudio)
+    const { includeAudio, bitrateAudio, audioInput } = mergedOptions;
+    if (includeAudio) {
+        if (audioInput) {
+            command.addOutputOption("-map 1:a");
+        } else {
+            command.addOutputOption("-map 0:a:0?");
+        }
         command
-            .addOutputOption("-map 0:a:0?")
             .audioChannels(2)
             /*
              * I don't have much surround sound material to test this with,
@@ -159,6 +168,7 @@ export function prepareStream(input, options = {}, cancelSignal) {
             .audioCodec("libopus")
             .audioBitrate(`${bitrateAudio}k`)
             .audioFilters("volume@internal_lib=1.0");
+    }
     // Add custom ffmpeg flags
     if (mergedOptions.customFfmpegFlags &&
         mergedOptions.customFfmpegFlags.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "piixishstream",
-    "version": "1.0.5",
+    "version": "1.0.7",
     "description": "Experiment for making video streaming work for discord selfbots",
     "main": "./dist/index.js",
     "exports": "./dist/index.js",
@@ -82,3 +82,5 @@
     }
 }
 
+
+

package/src/media/newApi.ts

@@ -137,7 +137,8 @@ export function prepareStream(
       Connection: "keep-alive",
     },
     customInputOptions: [],
-    customFfmpegFlags: [],
+    customFfmpegFlags: [],
+    audioInput: undefined,
   } satisfies PrepareStreamOptions;
 
   function mergeOptions(opts: Partial<PrepareStreamOptions>) {
@@ -211,7 +212,12 @@ export function prepareStream(
 
   // command creation
   const command = ffmpeg(input);
-
+  if (mergedOptions.audioInput) {
+    command.input(mergedOptions.audioInput).inputOptions(["-stream_loop", "-1"]);
+  }
+  if (mergedOptions.audioInput) {
+    command.input(mergedOptions.audioInput).inputOptions(["-stream_loop", "-1"]);
+  }
   // input options
   if (
     mergedOptions.customInputOptions &&
@@ -298,10 +304,10 @@ export function prepareStream(
   }
 
   // audio setup
-  const { includeAudio, bitrateAudio } = mergedOptions;
+  const { includeAudio, bitrateAudio, audioInput } = mergedOptions;
   if (includeAudio)
     command
-      .addOutputOption("-map 0:a:0?")
+      .addOutputOption(mergedOptions.audioInput ? "-map 1:a" : "-map 0:a:0?")
       .audioChannels(2)
       /*
        * I don't have much surround sound material to test this with,
@@ -617,8 +623,10 @@ export async function playStream(
   return new Promise<void>((resolve, reject) => {
     cleanupFuncs.push(() => {
       stopStream();
-      conn.mediaConnection.setSpeaking(false);
-      conn.mediaConnection.setVideoAttributes(false);
+      if (!mergedOptions.keepConnection) {
+        conn.mediaConnection.setSpeaking(false);
+        conn.mediaConnection.setVideoAttributes(false);
+      }
     });
     let cleanedUp = false;
     const cleanup = () => {