describealign 1.1.1__py3-none-any.whl → 1.2.0__py3-none-any.whl

{describealign-1.1.1.dist-info → describealign-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: describealign
-Version: 1.1.1
+Version: 1.2.0
 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.2.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+describealign.py,sha256=Pdt6OgYCSCHtpM22CwHsw77wKUIBBYbVxRc9TdG494w,71259
+describealign-1.2.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+describealign-1.2.0.dist-info/METADATA,sha256=vh8ecBA6BIivlyI-B92HN2wKiFo_o254sr5yzvx4Dd4,1295
+describealign-1.2.0.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+describealign-1.2.0.dist-info/entry_points.txt,sha256=7o7N6v3r4vFIH_XBdgk7WWhr-vZ_YitY8JWMdzN5xU0,71
+describealign-1.2.0.dist-info/top_level.txt,sha256=VYHWy4TeimBAF5BQAuDj4adGdLaWs2AoYx6qQjGPJ4M,14
+describealign-1.2.0.dist-info/RECORD,,

{describealign-1.1.1.dist-info → describealign-1.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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!")
@@ -458,7 +461,8 @@ def cap_synced_end_points(smooth_path, video_arr, audio_desc_arr):
     smooth_path[-1] = new_end_point
 
 # visualize both the rough and smooth alignments
-def plot_alignment(plot_filename_no_ext, path, smooth_path, quals, runs, bad_clips, ad_timings):
+def plot_alignment(plot_filename_no_ext, path, smooth_path, quals, runs,
+                   bad_clips, ad_timings, similarity_percent):
   scatter_color = [.2,.4,.8]
   lcs_rgba = np.zeros((len(quals),4))
   lcs_rgba[:,:3] = np.array(scatter_color)[None,:]
@@ -497,7 +501,7 @@ def plot_alignment(plot_filename_no_ext, path, smooth_path, quals, runs, bad_cli
       plt.plot(video_times / 60., audio_offsets, 'r-', lw=1, label='Replaced Audio')
   plt.xlabel('Video Time (minutes)')
   plt.ylabel('Audio Description Offset (seconds)')
-  plt.title('Alignment')
+  plt.title(f"Alignment - Media Similarity {similarity_percent:.2f}%")
   plt.legend().legend_handles[0].set_color(scatter_color)
   plt.tight_layout()
   plt.savefig(plot_filename_no_ext + '.png', dpi=400)
@@ -506,6 +510,7 @@ def plot_alignment(plot_filename_no_ext, path, smooth_path, quals, runs, bad_cli
   with open(plot_filename_no_ext + '.txt', 'w') as file:
     rough_clips, median_slope, _ = chunk_path(smooth_path, tol=2e-2)
     video_offset = np.diff(smooth_path[rough_clips[0][0]])[0]
+    print(f"Input file similarity: {similarity_percent:.2f}%", file=file)
     print("Main changes needed to video to align it to audio input:", file=file)
     print(f"Start Offset: {-video_offset:.2f} seconds", file=file)
     print(f"Median Rate Change: {(median_slope-1.)*100:.2f}%", file=file)
@@ -550,6 +555,11 @@ def replace_aligned_segments(video_arr, audio_desc_arr, smooth_path, runs, no_pi
     segment = np.hstack(segment)
     return segment
   
+  # compress dual channel audio to mono for use in pitch corrected stretching
+  # pytsmod's wsola treats channels separately, so without this it sounds weird
+  if not no_pitch_correction:
+    audio_desc_arr_mono = np.mean(audio_desc_arr, axis=0)
+  
   x,y = zip(*smooth_path)
   for run in runs:
     run_length_seconds = y[run[-1][1]] - y[run[0][0]]
@@ -570,7 +580,7 @@ def replace_aligned_segments(video_arr, audio_desc_arr, smooth_path, runs, no_pi
         anchor_point_pair[1][-1] -= 1
         anchor_y_offset = anchor_point_pair[1][0]
         anchor_point_pair[1,:] -= anchor_y_offset
-        stretched_audio = pytsmod.wsola(audio_desc_arr, anchor_point_pair)
+        stretched_audio = pytsmod.wsola(audio_desc_arr_mono, anchor_point_pair)
       video_arr[:,slice(*anchor_points[1,clip_index:clip_index+2])] = stretched_audio
 
 # identify which segments of the replaced audio actually have the describer speaking
@@ -668,7 +678,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!")
@@ -749,7 +762,7 @@ def get_ffprobe():
 def get_closest_key_frame_time(video_file, time):
   if time <= 0:
     return 0
-  key_frames = ffmpeg.probe(video_file, cmd=get_ffprobe(), select_streams='v',
+  key_frames = ffmpeg.probe(video_file, cmd=get_ffprobe(), select_streams='V',
                             show_frames=None, skip_frame='nokey')['frames']
   key_frame_times = np.array([float(frame['pts_time']) for frame in key_frames] + [0])
   return np.max(key_frame_times[key_frame_times <= time])
@@ -885,6 +898,11 @@ def combine(video, audio, smoothness=50, stretch_audio=False, keep_non_ad=False,
       display("   output file already exists, skipping...", display_func)
       continue
     
+    # print warning if output file's full path is longer than Windows MAX_PATH (260)
+    full_output_filename = os.path.abspath(output_filename)
+    if IS_RUNNING_WINDOWS and len(full_output_filename) >= 260:
+      display("   WARNING: very long output path, ffmpeg may fail...", display_func)
+    
     video_arr = parse_audio_from_file(video_file)
     audio_desc_arr = parse_audio_from_file(audio_desc_file)
     video_spec_raw, video_timings = tokenize_audio(video_arr)
@@ -897,6 +915,13 @@ def combine(video, audio, smoothness=50, stretch_audio=False, keep_non_ad=False,
     
     path, quals = rough_align(video_spec, audio_desc_spec, video_timings, audio_desc_timings)
     
+    similarity_ratio = float(len(quals)) / max(video_spec.shape[0], audio_desc_spec.shape[0])
+    similarity_percent = min(100, 100 * similarity_ratio)
+    if similarity_percent < 10:
+      display(f"   WARNING: similarity {similarity_percent:.1f}%, likely mismatched files", display_func)
+    if similarity_percent > 90:
+      display(f"   WARNING: similarity {similarity_percent:.1f}%, likely undescribed media", display_func)
+    
     smooth_path, runs, bad_clips, clips = smooth_align(path, quals, smoothness)
     
     cap_synced_end_points(smooth_path, video_arr, audio_desc_arr)
@@ -945,7 +970,8 @@ def combine(video, audio, smoothness=50, stretch_audio=False, keep_non_ad=False,
     del video_arr
     if PLOT_ALIGNMENT_TO_FILE:
       plot_filename_no_ext = os.path.join(alignment_dir, os.path.splitext(os.path.split(video_file)[1])[0])
-      plot_alignment(plot_filename_no_ext, path, smooth_path, quals, runs, bad_clips, ad_timings)
+      plot_alignment(plot_filename_no_ext, path, smooth_path, quals,
+                     runs, bad_clips, ad_timings, similarity_percent)
   display("All files processed.", display_func)
 
 def write_config_file(config_path, settings):
@@ -1200,6 +1226,7 @@ def main_gui():
         window.disable()
         sg.Popup('Error: empty input field.', font=('Arial', 20))
         window.enable()
+        window['-VIDEO_FILES-'].set_focus()
         continue
       video_files = values['-VIDEO_FILES-'].split(';')
       if len(video_files) == 1:
@@ -1207,11 +1234,15 @@ def main_gui():
       audio_files = values['-AUDIO_FILES-'].split(';')
       if len(audio_files) == 1:
         audio_files = audio_files[0]
+      window.disable()
       combine_gui(video_files, audio_files, config_path)
+      window.enable()
+      window['-VIDEO_FILES-'].set_focus()
     if event == 'Settings':
       window.disable()
       settings_gui(config_path)
       window.enable()
+      window['-VIDEO_FILES-'].set_focus()
     if event == sg.WIN_CLOSED:
       break
   window.close()

describealign-1.1.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-describealign.py,sha256=pn7vyyQaq6D-xanF9YL3-phYaeGHQMHHH9wiNWC8M6A,69439
-describealign-1.1.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-describealign-1.1.1.dist-info/METADATA,sha256=0p6pNV7U1JmkNqTypD4UIXl-pYljMoVzK-2efKA5AqI,1272
-describealign-1.1.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-describealign-1.1.1.dist-info/entry_points.txt,sha256=7o7N6v3r4vFIH_XBdgk7WWhr-vZ_YitY8JWMdzN5xU0,71
-describealign-1.1.1.dist-info/top_level.txt,sha256=VYHWy4TeimBAF5BQAuDj4adGdLaWs2AoYx6qQjGPJ4M,14
-describealign-1.1.1.dist-info/RECORD,,