Allow to set the libav format to none

Lillifee · Mar 4, 2024 · ce6e8b3 · ce6e8b3
1 parent a931268
commit ce6e8b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/server/control.ts b/src/server/control.ts
@@ -178,8 +178,6 @@ const modeHelper: {
       ...stream.convert(),
     };
 
-    stream.read().player === 'Broadway' && (settings.profile = 'baseline');
-
     return {
       command: 'libcamera-vid',
       settings: {

diff --git a/src/shared/settings/stream.ts b/src/shared/settings/stream.ts
@@ -57,7 +57,7 @@ export const streamSettingDesc = {
    * Set the libav output format to use. These output formats can be specified as containers (e.g. mkv, mp4, avi)
    * or stream output (e.g. h264 or mpegts). If this option is not provided, libav tries to deduce the output format from the filename specified by the -o command line argument.
    */
-  'libav-format': enumSetting('libav-format', ['h264'], 'h264'),
+  'libav-format': enumSetting('Libav format', ['none', 'h264'], 'h264'),
 
   /** Player for H264 stream  */
   player: enumSetting('Player', ['Broadway', 'JMuxer'], 'JMuxer'),
@@ -72,5 +72,13 @@ export const streamSettingConverter = (
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { player, ...passThroughSettings } = settings;
 
+  if (player === 'Broadway') {
+    passThroughSettings.profile = 'baseline';
+  }
+
+  if (passThroughSettings['libav-format'] === 'none') {
+    passThroughSettings['libav-format'] = undefined;
+  }
+
   return passThroughSettings;
 };
diff --git a/src/site/components/main/settings/StreamSettings.tsx b/src/site/components/main/settings/StreamSettings.tsx
@@ -60,12 +60,10 @@ export const StreamSettings: React.FC<StreamSettingsProps> = ({ stream, updateSt
           <React.Fragment>
             <NumberSetting {...stream.bitrate} update={updateStreamField('bitrate')} />
             <EnumDropdownSetting {...stream.player} update={updateStreamField('player')} />
-            {stream.codec.value === 'LIBAV' && (
-              <EnumDropdownSetting
-                {...stream['libav-format']}
-                update={updateStreamField('libav-format')}
-              />
-            )}
+            <EnumDropdownSetting
+              {...stream['libav-format']}
+              update={updateStreamField('libav-format')}
+            />
             <EnumDropdownSetting {...stream.profile} update={updateStreamField('profile')} />
             <EnumDropdownSetting {...stream.level} update={updateStreamField('level')} />
           </React.Fragment>