Merge branch 'vladmandic:dev' into dev

scripts/dlss_ext.py

@@ -105,7 +105,6 @@ def verify(pkg_path):
         return { 'error': 'package path not found' }
     if not c.controller.get_python(pkg_path):
         return { 'error': 'python not found in package path' }
-    shared.opts.dlss_pkg_path = pkg_path
     response = c.controller.call(pkg_path, 'verify', { 'gpu_uuid': 'auto', 'options': { 'level': 'deep' } })
     if response.get('status') != 'ok':
         error = response.get('error') or {}
@@ -121,6 +120,8 @@ def verify(pkg_path):
         else:
             checks['failed'] += 1
             log.error(f'DLSS : {check}')
+    shared.opts.dlss_pkg_path = pkg_path
+    shared.opts.save()
     log.debug(f'DLSS: gpu={report.get("gpu", "unknown")} checks={checks}')
     return report
 
@@ -281,12 +282,18 @@ def dlss(p: processing.StableDiffusionProcessing | None, pp: processing.Processe
     ss_scale_factor = float(getattr(p, 'ss_scale_factor', ss_scale_factor))
     fg_source_fps = str(getattr(p, 'fg_source_fps', fg_source_fps))
     fg_target_fps = str(getattr(p, 'fg_target_fps', fg_target_fps))
+    if (p is not None) and ('video' in p.ops): # should not add video frames
+        nr_append = False
+        ss_append = False
 
     images = []
     originals = []
     current_images = inputs
     t = timer.Timer()
 
+    jobid = shared.state.begin('DLSS')
+    t_start = time.time()
+
     if ss_enabled:
         t0 = time.time()
         if p:
@@ -332,6 +339,9 @@ def dlss(p: processing.StableDiffusionProcessing | None, pp: processing.Processe
             current_images = output
         t.ts('framegen', t0)
 
+    shared.state.end(jobid)
+    timer.process.ts('dlss', t_start)
+
     log.debug(f'DLSS: frames={len(images)} {t.summary(min_time=0)}')
     if update == 'images':
         pp.images = images