Merge branch 'main' of github.com:koush/scrypted

koush · Jul 21, 2024 · d5995d9 · d5995d9
2 parents f13844c + 6d7add8
commit d5995d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/plugins/prebuffer-mixin/src/ffmpeg-rebroadcast.ts b/plugins/prebuffer-mixin/src/ffmpeg-rebroadcast.ts
@@ -134,6 +134,7 @@ export async function startParserSession<T extends string>(ffmpegInput: FFmpegIn
 
 
     const args = ffmpegInput.inputArguments.slice();
+    const env = ffmpegInput.env ? { ...process.env, ...ffmpegInput.env } : undefined;
 
     const ensureActive = (killed: () => void) => {
         if (!isActive) {
@@ -191,6 +192,7 @@ export async function startParserSession<T extends string>(ffmpegInput: FFmpegIn
     safePrintFFmpegArguments(console, args);
     const cp = child_process.spawn(await mediaManager.getFFmpegPath(), args, {
         stdio,
+        env,
     });
     ffmpegLogInitialOutput(console, cp, undefined, options?.storage);
     cp.on('exit', () => kill(new Error('ffmpeg exited')));

diff --git a/plugins/prebuffer-mixin/src/main.ts b/plugins/prebuffer-mixin/src/main.ts
@@ -590,6 +590,9 @@ class PrebufferSession {
         // if (!userInputArguments && (ffmpegInput.container === 'rtmp' || ffmpegInput.url?.startsWith('rtmp:')))
         //   ffmpegInput.inputArguments.unshift('-use_wallclock_as_timestamps', '1');
 
+        if (ffmpegInput.h264EncoderArguments?.length) {
+          vcodec = [...ffmpegInput.h264EncoderArguments];
+        }
         // extraOutputArguments must contain full codec information
         if (extraOutputArguments) {
           vcodec = [...extraOutputArguments.split(' ').filter(d => !!d)];