@apocaliss92/scrypted-reolink-native 0.2.8 → 0.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@apocaliss92/scrypted-reolink-native",
-   "version": "0.2.8",
+   "version": "0.2.9",
    "description": "Use any reolink camera with Scrypted, even older/unsupported models without HTTP protocol support",
    "author": "@apocaliss92",
    "license": "Apache",

package/src/camera.ts

@@ -618,15 +618,38 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         },
         pipMargin: {
             title: 'PIP Margin',
-            description: 'Margin from edge in pixels',
+            description: 'Margin from edge as a fraction of the output size (e.g. 0.01 = 1%). Values > 1 are treated as pixels (legacy).',
             type: 'number',
-            defaultValue: 10,
+            defaultValue: 0.01,
             group: 'Composite stream',
             hide: true,
             onPut: async () => {
                 this.scheduleStreamManagerRestart('pipMargin changed');
             },
         },
+
+        compositeAssumeH264: {
+            title: 'Composite: Assume H.264 Inputs',
+            description: 'Assume both wider+tele inputs are H.264 (skips codec detection). Recommended when using sub+sub on TrackMix. If inputs are actually H.265, the composite may fail to start.',
+            type: 'boolean',
+            defaultValue: true,
+            group: 'Composite stream',
+            hide: true,
+            onPut: async () => {
+                this.scheduleStreamManagerRestart('compositeAssumeH264 changed');
+            },
+        },
+        compositeDisableTranscode: {
+            title: 'Composite: Disable Codec Transcode (Best-effort)',
+            description: 'Best-effort knob. Overlay requires re-encode in ffmpeg; this option only avoids HEVC->H264 codec assumptions when possible. Leave off unless you know what you are doing.',
+            type: 'boolean',
+            defaultValue: false,
+            group: 'Composite stream',
+            hide: true,
+            onPut: async () => {
+                this.scheduleStreamManagerRestart('compositeDisableTranscode changed');
+            },
+        },
     });
 
     ptzPresets = new ReolinkPtzPresets(this);
@@ -1541,7 +1564,7 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
         };
 
         if (this.isMultiFocal) {
-            const { pipPosition, pipSize, pipMargin, rtspChannel } = this.storageSettings.values;
+            const { pipPosition, pipSize, pipMargin, rtspChannel, compositeAssumeH264, compositeDisableTranscode } = this.storageSettings.values;
 
             // On NVR/Hub, TrackMix lenses are selected via stream variant, not via a separate channel.
             // Use rtspChannel for BOTH wide and tele so the library can request tele via streamType/variant.
@@ -1583,6 +1606,10 @@ export class ReolinkCamera extends BaseBaichuanClass implements VideoCamera, Cam
                 pipSize,
                 pipMargin,
                 onNvr: this.isOnNvr,
+                // Prefer H.264 for composite (sub+sub by default) to reduce GOP latency.
+                forceH264: true,
+                assumeH264Inputs: compositeAssumeH264 ?? true,
+                disableTranscode: compositeDisableTranscode ?? false,
             };
         }