tictacsync 0.8a0__tar.gz → 0.9a0__tar.gz

{tictacsync-0.8a0/tictacsync.egg-info → tictacsync-0.9a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.8a0
+Version: 0.9a0
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz

{tictacsync-0.8a0 → tictacsync-0.9a0}/setup.py

@@ -21,7 +21,7 @@ setup(
         'numpy>=1.24.3',
         'rich>=10.12.0',
         'lmfit',
-        'skimage',
+        'scikit-image',
         'scipy>=1.10.1',
         ], 
     python_requires='>=3.10',
@@ -32,7 +32,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.8a',
+    version = '0.9a',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.8a0 → tictacsync-0.9a0}/tictacsync/entry.py

@@ -72,6 +72,9 @@ def process_files(medias):
 def process_single(file, args):
     # argument is a single file
     m = device_scanner.media_at_path(None, Path(file))
+    if args.plotting:
+        print('\nPlots can be zoomed and panned...')
+        print('Close window for next one.')
     a_rec = yaltc.Recording(m, do_plots=args.plotting)
     time = a_rec.get_start_time()
     # time = a_rec.get_start_time(plots=args.plotting)
@@ -97,10 +100,10 @@ def process_single(file, args):
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
-                "directory",
+                "path",
                 type=str,
                 nargs=1,
-                help="path of media directory"
+                help="directory_name or media_file"
                 )
     # parser.add_argument("directory", nargs="?", help="path of media directory")
     # parser.add_argument('-v', action='store_true')
@@ -108,29 +111,29 @@ def main():
                     dest='verbose_output',
                     help='Set verbose ouput')
     parser.add_argument('-o', nargs=1,
-                    help='where to write synced clips')
+                    help='Where to write the SyncedMedia folder [default to "path" ]')
     parser.add_argument('-p', action='store_true', default=False,
                     dest='plotting',
-                    help='Make plots')
+                    help='Produce plots')
     parser.add_argument('--isos', action='store_true', default=False,
                     dest='write_ISOs',
                     help='Write ISO sound files')
     parser.add_argument('--nosync', action='store_true',
                     dest='nosync',
-                    help='just scan and decode')
+                    help='Just scan and decode')
     parser.add_argument('--terse', action='store_true',
                     dest='terse',
-                    help='terse output')
+                    help='Terse output')
     args = parser.parse_args()
     if args.verbose_output:
         logger.add(sys.stderr, level="DEBUG")
     # logger.add(sys.stdout, filter="__main__")
     # logger.add(sys.stdout, filter="yaltc")
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_read_sound_find_TicTacCode")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "build_audio_and_write_video")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_detect_sync_pulse_position")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_device_mix")
     # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix_files")
-    top_dir = args.directory[0]
+    top_dir = args.path[0]
     if os.path.isfile(top_dir):
         file = top_dir
         process_single(file, args)

{tictacsync-0.8a0 → tictacsync-0.9a0}/tictacsync/timeline.py

@@ -888,6 +888,8 @@ class AudioStitcherVideoMerger:
                 self.videoclip.synced_audio = \
                         _sox_keep(concatenate_audio_file, [sox_kept_channel])
                 self._merge_audio_and_video()
+                if asked_ISOs:
+                    print('WARNING: you asked for ISO files but found one audio channel only...')
                 return #########################################################
         #
         # if not returned yet from fct, either multitracks and/or multi
@@ -916,6 +918,7 @@ class AudioStitcherVideoMerger:
         # [(dev1, [mono1_ch1, mono1_ch2]), (dev2, [mono2_ch1, mono2_ch2)]] in 
         # devices_and_monofiles:
         if asked_ISOs:
+            logger.debug('will output ISO files...')
             devices_and_monofiles = [(device, _split_channels(multi_chan_audio))
                     for device, multi_chan_audio
                     in merged_audio_files_by_device]

{tictacsync-0.8a0 → tictacsync-0.9a0}/tictacsync/yaltc.py

@@ -29,8 +29,9 @@ try:
 except:
     import device_scanner
 
-TEENSY_MAX_LAG = 128/44100 # sec, duration of a default length audio block
+TEENSY_MAX_LAG = 1.01*128/44100 # sec, duration of a default length audio block
 
+# see extract_seems_TicTacCode() for duration criterion values
 
 CACHING = True
 DEL_TEMP = False
@@ -266,7 +267,7 @@ class Decoder:
             # extra_window_duration = SOUND_EXTRACT_LENGTH - 1
             # eff_w = total_w - extra_window_duration
             # logger.debug('effective_word_duration %f (two regions)'%eff_w)
-            if not 0.5 < total_w < 0.655:
+            if not 0.5 < total_w < 0.656:
                 failing_comment = 'two regions duration %f not in [0.50 0.655]\n%s'%(total_w, widths)
                 # fig, ax = plt.subplots()
                 # p(ax, sound_extract_one_bit)
@@ -276,13 +277,18 @@ class Decoder:
 
     def _plot_extract(self):
         fig, ax = plt.subplots()
-        ax.plot(self.sound_extract, marker='o', markersize='1',
+        start = self.sound_extract_position
+        i_samples = np.arange(start, start + len(self.sound_extract))
+        yt = ax.get_yaxis_transform()
+        ax.hlines(0, 0, 1,
+            transform=yt, alpha=0.3,
+        linewidth=2, colors='black')
+        ax.plot(i_samples, self.sound_extract, marker='o', markersize='1',
             linewidth=1.5,alpha=0.3, color='blue' )
-        ax.plot(self.sound_extract_one_bit*np.max(np.abs(self.sound_extract)), 
+        ax.plot(i_samples, self.sound_extract_one_bit*np.max(np.abs(self.sound_extract)), 
             marker='o', markersize='1',
             linewidth=1.5,alpha=0.3,color='red')
         xt = ax.get_xaxis_transform()
-        yt = ax.get_yaxis_transform()
         ax.hlines(self.pulse_detection_level, 0, 1,
             transform=yt, alpha=0.3,
         linewidth=2, colors='green')
@@ -295,7 +301,8 @@ class Decoder:
             custom_lines,
             'detection level, signal, detected region'.split(','),
             loc='lower right')
-        ax.set_title('Finding word and sync pulse')
+        ax.set_title('Finding word + sync pulse')
+        plt.xlabel("Position in file (samples)")
         plt.show()
 
     def get_time_in_sound_extract(self):
@@ -449,14 +456,7 @@ class Decoder:
         start = round(0.5*symbol_length) # half symbol
         end = start + symbol_length
         word_begining = whole_word[start:]
-        # word_one_bit = np.abs(word_begining)>self.pulse_detection_level
-        # N_ones = round(1.5*SYMBOL_LENGTH*1e-3*self.samplerate) # so it includes sync pulse
-        # word_one_bit = closing(word_one_bit, np.ones(N_ones))
         gt_detection_level = np.argwhere(np.abs(word_begining)>self.pulse_detection_level)
-        # print(gt_detection_level)
-        # plt.plot(word_one_bit)
-        # plt.plot(word_begining/abs(np.max(word_begining)))
-        # plt.show()
         word_start = gt_detection_level[0][0]
         word_end = gt_detection_level[-1][0]
         self.effective_word_duration = (word_end - word_start)/self.samplerate
@@ -473,7 +473,10 @@ class Decoder:
                                     1e3*TEENSY_MAX_LAG))
         logger.debug('relative audio_block gap %.2f'%(relative_gap))
         if relative_gap > 1:
-            print('bug with relative_gap')
+            print('Warning: gap between spike and word is too big for %s'%self.rec)
+            print('Audio update() gap between sync pulse and word start: ')
+            print('%.2f ms (max value %.2f)'%(1e3*gap/self.samplerate,
+                                    1e3*TEENSY_MAX_LAG))
         symbol_width_samples_theor = self.samplerate*SYMBOL_LENGTH*1e-3
         symbol_width_samples_eff = self.effective_word_duration * \
                                             self.samplerate/(N_SYMBOLS - 1)
@@ -486,14 +489,23 @@ class Decoder:
         symbols_indices = symbol_positions.round().astype(int)
         if self.do_plots:
             fig, ax = plt.subplots()
-            ax.plot(whole_word, marker='o', markersize='1',
+            ax.hlines(0, 0, 1,
+                transform=ax.get_yaxis_transform(), alpha=0.3,
+                linewidth=2, colors='black')
+            start = self.sound_extract_position
+            i_samples = np.arange(start, start + len(whole_word))
+            ax.plot(i_samples, whole_word, marker='o', markersize='1',
                 linewidth=1.5,alpha=0.3, color='blue' )
             xt = ax.get_xaxis_transform()
             for x in symbols_indices:
-                ax.vlines(x, 0, 1,
+                ax.vlines(x + start, 0, 1,
                     transform=xt,
                 linewidth=0.6, colors='green')
                 ax.set_title('Slicing the 34 bits word:')
+            plt.xlabel("Position in file (samples)")
+            ax.vlines(start, 0, 1,
+                transform=xt,
+                linewidth=0.6, colors='red')
             plt.show()
         slice_width = round(SYMBOL_LENGTH*1e-3*self.samplerate)
         slices = [whole_word[i:i+slice_width] for i in symbols_indices]

{tictacsync-0.8a0 → tictacsync-0.9a0/tictacsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.8a0
+Version: 0.9a0
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz

{tictacsync-0.8a0 → tictacsync-0.9a0}/tictacsync.egg-info/requires.txt

@@ -5,5 +5,5 @@ matplotlib>=3.7.1
 numpy>=1.24.3
 rich>=10.12.0
 lmfit
-skimage
+scikit-image
 scipy>=1.10.1