tictacsync 0.5a0__tar.gz → 0.7a0__tar.gz

{tictacsync-0.5a0/tictacsync.egg-info → tictacsync-0.7a0}/PKG-INFO

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

{tictacsync-0.5a0 → tictacsync-0.7a0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "rb") as f:
     long_descr = f.read().decode("utf-8")
 
 long_description = 'CLI for syncing audio video \
-	files containing an audio YaLTC sync track.'
+	files containing an audio TicTacCode sync track.'
 
 setup(
     name = "tictacsync",
@@ -31,7 +31,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.5a',
+    version = '0.7a',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.5a0 → tictacsync-0.7a0}/tictacsync/entry.py

@@ -72,8 +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))
-    a_rec = yaltc.Recording(m)
-    time = a_rec.get_start_time(plots=args.plotting)
+    a_rec = yaltc.Recording(m, do_plots=args.plotting)
+    time = a_rec.get_start_time()
+    # time = a_rec.get_start_time(plots=args.plotting)
     if time != None:
         frac_time = int(time.microsecond / 1e2)
         d = '%s.%s'%(time.strftime("%Y-%m-%d %H:%M:%S"),frac_time)
@@ -124,10 +125,9 @@ def main():
     if args.verbose_output:
         logger.add(sys.stderr, level="DEBUG")
     # logger.add(sys.stdout, filter="__main__")
-    # logger.add(sys.stdout, filter="device_scanner")
-    # logger.add(sys.stdout, filter="yaltc") _extract_sound_to_merge
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "media_at_path")
-    # logger.add(sys.stdout, filter=lambda r: r["function"] == "scan_media_and_build_devices_UID")
+    # 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"] == "_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]
@@ -195,7 +195,7 @@ def main():
         # table.add_column("Device\n", justify="center", style='gold1')
         table.add_column("UTC times\nstart:end", justify="center", style='gold1')
         table.add_column("Clock drift\n(ppm)", justify="right", style='gold1')
-        table.add_column("SN ratio\n(dB)", justify="center", style='gold1')
+        # table.add_column("SN ratio\n(dB)", justify="center", style='gold1')
         table.add_column("Date\n", justify="center", style='gold1')
         rec_WO_time = [
             rec.AVpath.name
@@ -218,7 +218,7 @@ def main():
                 times_range,
                 # '%.6f'%(r.true_samplerate/1e3),
                 '%2i'%(r.get_samplerate_drift()),
-                '%.0f'%r.decoder.SN_ratio,
+                # '%.0f'%r.decoder.SN_ratio,
                 date
                 )
         console = Console()

{tictacsync-0.5a0 → tictacsync-0.7a0}/tictacsync/timeline.py

@@ -1111,6 +1111,7 @@ class Matcher:
                             videoclip))
             audio_stitch = AudioStitcherVideoMerger(videoclip)
             for audio in audio_recs:
+                logger.debug('checking %s'%audio)
                 if self._does_overlap(videoclip, audio):
                     audio_stitch.add_matched_audio(audio)
                     logger.debug('recording %s overlaps,'%(audio))
@@ -1125,9 +1126,14 @@ class Matcher:
 
     def _does_overlap(self, videoclip, audio_rec):
         A1, A2 = audio_rec.get_start_time(), audio_rec.get_end_time()
+        logger.debug('audio str stp: %s %s'%(A1,A2))
         R1, R2 = videoclip.get_start_time(), videoclip.get_end_time()
-        no_overlap = (A2 < R1) or (A1 > R2)
-        return not no_overlap
+        logger.debug('video str stp: %s %s'%(R1,R2))
+        case1 = A1 < R1 < A2
+        case2 = A1 < R2 < A2
+        case3 = R1 < A1 < R2
+        case4 = R1 < A2 < R2
+        return case1 or case2 or case3 or case4
 
     def shrink_gaps_between_takes(self, with_gap=CLUSTER_GAP):
         """