add timeout and launch the new correlation is the official

Author: studyfranco

src/audioCorrelation.py

@@ -8,7 +8,7 @@
 import gc
 import json
 import time
-
+from threading import RLock
 import sys
 
 '''
@@ -257,42 +257,49 @@ def show2(fs,s1,s2,title=None):
     show1(fs,s2,'red')
     plt.show()
 
+lock_fallback = RLock()
 def second_correlation(in1,in2):
-    begin = time.time()
-    fs,s1,s2 = read_normalized(in1,in2)
-    ls1,ls2,padsize,xmax,ca = corrabs(s1,s2)
-    ls1 = None
-    ls2 = None
-    ca = None
-    s1 = None
-    s2 = None
-    # if show: show1(fs,ca,title='Correlation',v=xmax/fs) Change if we want reports
-    #sync_text = """
-    #==============================================================================
-    #%s needs 'ffmpeg -ss %s' cut to get in sync
-    #==============================================================================
-    #"""
-    if xmax > padsize // 2:
-        # if show: show2(fs,s1,s2[padsize-xmax:],title='1st=blue;2nd=red=cut(%s;%s)'%(in1,in2))
-        file,offset = in2,(padsize-xmax)/fs
-    else:
-        # if show: show2(fs,s1[xmax:],s2,title='1st=blue=cut;2nd=red (%s;%s)'%(in1,in2))
-        file,offset = in1,xmax/fs
-    #print(sync_text%(file,offset))
-    padsize = None
-    xmax = None
-    fs = None
-    gc.collect()
-    
-    sys.stderr.write(f"\t\tSecond correlation in old function took {time.time()-begin:.2f} seconds\n\t\tand we obtain: {file} in offset {offset}\n")
     try:
         begin = time.time()
-        stdout, stderror, exitCode = tools.launch_cmdExt_with_timeout_reload([tools.software["audio_sync"],in1,in2],5,120)
+        stdout, stderror, exitCode = tools.launch_cmdExt_with_timeout_reload([tools.software["audio_sync"],in1,in2],5,300)
         data = json.loads(stdout.decode("utf-8").strip())
-        sys.stderr.write(f"\t\tSecond correlation in new function took {time.time()-begin:.2f} seconds\n\t\tand we obtain: {data}\n")
+        file = data['file']
+        offset = data['offset_seconds']
+        if tools.dev:
+            sys.stderr.write(f"\t\tSecond correlation in new function took {time.time()-begin:.2f} seconds\n\t\tand we obtain: {data}\n")
     except Exception as e:
         # If audio_sync is not installed, we return the file and offset
         sys.stderr.write(f"\t\taudio_sync not working: {e}\n")
+        
+        with lock_fallback:
+            begin = time.time()
+            fs,s1,s2 = read_normalized(in1,in2)
+            ls1,ls2,padsize,xmax,ca = corrabs(s1,s2)
+            ls1 = None
+            ls2 = None
+            ca = None
+            s1 = None
+            s2 = None
+            # if show: show1(fs,ca,title='Correlation',v=xmax/fs) Change if we want reports
+            #sync_text = """
+            #==============================================================================
+            #%s needs 'ffmpeg -ss %s' cut to get in sync
+            #==============================================================================
+            #"""
+            if xmax > padsize // 2:
+                # if show: show2(fs,s1,s2[padsize-xmax:],title='1st=blue;2nd=red=cut(%s;%s)'%(in1,in2))
+                file,offset = in2,(padsize-xmax)/fs
+            else:
+                # if show: show2(fs,s1[xmax:],s2,title='1st=blue=cut;2nd=red (%s;%s)'%(in1,in2))
+                file,offset = in1,xmax/fs
+            #print(sync_text%(file,offset))
+            padsize = None
+            xmax = None
+            fs = None
+            gc.collect()
+        
+        if tools.dev:
+            sys.stderr.write(f"\t\tSecond correlation in old function took {time.time()-begin:.2f} seconds\n\t\tand we obtain: {file} in offset {offset}\n")
 
     return file,offset
 

src/mergeVideo.py

@@ -148,17 +148,45 @@ def get_delay_fidelity(video_obj_1,video_obj_2,lenghtTime,ignore_audio_couple=se
     gc.collect()
     return delay_Fidelity_Values
 
+class get_delay_second_method_thread(Thread):
+    def __init__(self, video_obj_1_tmp_file,video_obj_2_tmp_file):
+        Thread.__init__(self)
+        self.video_obj_1_tmp_file = video_obj_1_tmp_file
+        self.video_obj_2_tmp_file = video_obj_2_tmp_file
+        self.delay_values  = None
+
+    def run(self):
+        result = second_correlation(self.video_obj_1_tmp_file,self.video_obj_2_tmp_file)
+        if result[0] == self.video_obj_1_tmp_file:
+            self.delay_values = result
+        elif result[0] == self.video_obj_2_tmp_file:
+            self.delay_values = result
+        else:
+            self.delay_values = result
+
 def get_delay_by_second_method(video_obj_1,video_obj_2,ignore_audio_couple=set()):
     delay_Values = {}
+    delay_value_jobs = []
+    
     video_obj_1.wait_end_ffmpeg_progress_audio()
     video_obj_2.wait_end_ffmpeg_progress_audio()
     for i in range(0,len(video_obj_1.tmpFiles['audio'])):
         for j in range(0,len(video_obj_2.tmpFiles['audio'])):
             if f"{i}-{j}" not in ignore_audio_couple:
-                delay_between_two_audio = []
-                delay_Values[f"{i}-{j}"] = delay_between_two_audio
+                delay_value_jobs_between_audio = []
+                delay_value_jobs.append([f"{i}-{j}",delay_value_jobs_between_audio])
                 for h in range(0,video.number_cut):
-                    delay_between_two_audio.append(second_correlation(video_obj_1.tmpFiles['audio'][i][h],video_obj_2.tmpFiles['audio'][j][h]))
+                    delay_value_jobs_between_audio.append(get_delay_second_method_thread(video_obj_1.tmpFiles['audio'][i][h],video_obj_2.tmpFiles['audio'][j][h]))
+                    delay_value_jobs_between_audio[-1].start()
+
+    for delay_value_job in delay_value_jobs:
+        delay_between_two_audio = []
+        delay_Values[delay_value_job[0]] = delay_between_two_audio
+        for delay_value_job_between_audio in delay_value_job[1]:
+            delay_value_job_between_audio.join()
+            delay_between_two_audio.append(delay_value_job_between_audio.delay_values)
+
+    gc.collect()
     return delay_Values
 
 class compare_video(Thread):
@@ -1460,7 +1488,7 @@ def generate_new_file(video_obj,delay_to_put,ffmpeg_cmd_dict,md5_audio_already_a
         tmp_file_audio = path.join(tools.tmpFolder,f"{video_obj.fileBaseName}_tmp.mkv")
         base_cmd.extend(["-strict", "-2", "-t", duration_best_video, "-max_muxing_queue_size", "8192", tmp_file_audio])
 
-        ffmpeg_cmd_dict['convert_process'].append(video.ffmpeg_pool_audio_convert.apply_async(tools.launch_cmdExt, (base_cmd,)))
+        ffmpeg_cmd_dict['convert_process'].append(video.ffmpeg_pool_audio_convert.apply_async(tools.launch_cmdExt_with_timeout_reload, (base_cmd,5,360)))
         ffmpeg_cmd_dict['merge_cmd'].extend(["--no-global-tags", "-M", "-B", tmp_file_audio])
 
     return number_track