describealign 1.1.0__tar.gz → 1.1.2__tar.gz

{describealign-1.1.0 → describealign-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: describealign
-Version: 1.1.0
+Version: 1.1.2
 Summary: Combines videos with matching audio files (e.g. audio descriptions)
 Author-email: Julian Brown <julbean@proton.me>
 Project-URL: Homepage, https://github.com/julbean/describealign
@@ -22,6 +22,7 @@ Requires-Dist: pytsmod~=0.3.7
 Requires-Dist: PySimpleGUIWx~=0.17.2; platform_system == "Windows"
 Requires-Dist: PySimpleGUIQt~=0.35.0; platform_system != "Windows"
 Requires-Dist: PySide2~=5.15; platform_system != "Windows"
+Dynamic: license-file
 
 For usage help, simply run the script directly.
 If the Scripts folder has been added to PATH, can be run

{describealign-1.1.0 → describealign-1.1.2}/describealign.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: describealign
-Version: 1.1.0
+Version: 1.1.2
 Summary: Combines videos with matching audio files (e.g. audio descriptions)
 Author-email: Julian Brown <julbean@proton.me>
 Project-URL: Homepage, https://github.com/julbean/describealign
@@ -22,6 +22,7 @@ Requires-Dist: pytsmod~=0.3.7
 Requires-Dist: PySimpleGUIWx~=0.17.2; platform_system == "Windows"
 Requires-Dist: PySimpleGUIQt~=0.35.0; platform_system != "Windows"
 Requires-Dist: PySide2~=5.15; platform_system != "Windows"
+Dynamic: license-file
 
 For usage help, simply run the script directly.
 If the Scripts folder has been added to PATH, can be run

{describealign-1.1.0 → describealign-1.1.2}/describealign.py

@@ -380,7 +380,10 @@ def smooth_align(path, quals, smoothness):
                               -scipy.sparse.eye(num_fit_points)])
   b_eq = y_diffs[1:  ] / x_diffs[1:  ] - \
          y_diffs[ :-1] / x_diffs[ :-1]
-  fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq)
+  fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq, method='highs-ds')
+  # if dual simplex solver encounters numerical problems, retry with interior point solver
+  if not fit.success and fit.status == 4:
+    fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq, method='highs-ipm')
   if not fit.success:
     print(fit)
     raise RuntimeError("Smooth Alignment L1-Min Optimization Failed!")
@@ -668,7 +671,10 @@ def detect_describer(video_arr, video_spec, video_spec_raw, video_timings,
                                scipy.sparse.eye(num_fit_points-1),
                               -scipy.sparse.eye(num_fit_points-1)])
   b_eq = y_diffs
-  fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq)
+  fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq, method='highs-ds')
+  # if dual simplex solver encounters numerical problems, retry with interior point solver
+  if not fit.success and fit.status == 4:
+    fit = scipy.optimize.linprog(c, A_eq=A_eq, b_eq=b_eq, method='highs-ipm')
   if not fit.success:
     print(fit)
     raise RuntimeError("Describer Voice Detection L1-Min Optimization Failed!")
@@ -721,10 +727,10 @@ def encode_fit_as_ffmpeg_expr(smooth_path, clips, video_offset, start_key_frame)
     # but that means the video is behind the audio and needs to catch up by playing quicker
     # catchup_spread is the ratio of time to spend catching up to the amount of catching up needed
     catchup_spread = 1./CATCHUP_RATE
-    setts_cmd.append(f'+clip(TS-STARTPTS,0,{start_skip*(1+catchup_spread)}/TB)*{-1./(1+catchup_spread)}')
+    setts_cmd.append(f'+clip(TS-{start_key_frame},0,{start_skip*(1+catchup_spread)}/TB)*{-1./(1+catchup_spread)}')
   elif video_offset < 0:
     # if the audio starts before the video, stretch the first frame of the video back to meet it
-    setts_cmd.append(f'+clip(TS-STARTPTS,0,{-video_offset/10000.}/TB)*10000')
+    setts_cmd.append(f'+clip(TS-{start_key_frame},0,{-video_offset/10000.}/TB)*10000')
   # each segment of the linear fit can be encoded as a single clip function
   setts_cmd.append('+(0')
   for clip_start, clip_end in clips:
@@ -735,7 +741,7 @@ def encode_fit_as_ffmpeg_expr(smooth_path, clips, video_offset, start_key_frame)
     audio_desc_length = audio_desc_end - audio_desc_start
     video_length = video_end - video_start
     slope = audio_desc_length / video_length
-    setts_cmd.append(f'+clip(TS-STARTPTS-{video_start:.4f}/TB,0,{max(0,video_length):.4f}/TB)*{slope-1:.9f}')
+    setts_cmd.append(f'+clip(TS-{start_key_frame}-{video_start:.4f}/TB,0,{max(0,video_length):.4f}/TB)*{slope-1:.9f}')
   setts_cmd.append(')')
   setts_cmd = ''.join(setts_cmd)
   return setts_cmd
@@ -1202,7 +1208,11 @@ def main_gui():
         window.enable()
         continue
       video_files = values['-VIDEO_FILES-'].split(';')
+      if len(video_files) == 1:
+        video_files = video_files[0]
       audio_files = values['-AUDIO_FILES-'].split(';')
+      if len(audio_files) == 1:
+        audio_files = audio_files[0]
       combine_gui(video_files, audio_files, config_path)
     if event == 'Settings':
       window.disable()

describealign-1.1.2/version

@@ -0,0 +1 @@
+1.1.2

describealign-1.1.0/version

@@ -1 +0,0 @@
-1.1.0