tictacsync 0.82a0__tar.gz → 0.95a0__tar.gz

{tictacsync-0.82a0/tictacsync.egg-info → tictacsync-0.95a0}/PKG-INFO

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

{tictacsync-0.82a0 → tictacsync-0.95a0}/setup.py

@@ -32,7 +32,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.82a',
+    version = '0.95a',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.82a0 → tictacsync-0.95a0}/tictacsync/device_scanner.py

@@ -69,6 +69,7 @@ class Tracks:
     others: list #of all other tags: (tag, track#) tuples
     rawtrx: list # list of strings read from file
     error_msg: str # 'None' if none
+    lag_values: list # list of lag in ms, entry is None if not specified. 
 
 @dataclass
 class Device:
@@ -109,7 +110,13 @@ def media_at_path(input_structure, p):
             if stream['codec_type']=='audio'
             ]
         if len(audio_streams) > 1:
-            raise Exception('ffprobe gave multiple audio streams?')
+            print('for [gold1]%s[/gold1], ffprobe gave multiple audio streams, quitting.'%p)
+            quit()
+            # raise Exception('ffprobe gave multiple audio streams?')
+        if len(audio_streams) == 0:
+            print('ffprobe gave no audio stream for [gold1]%s[/gold1], quitting.'%p)
+            quit()
+            # raise Exception('ffprobe gave no audio stream for %s, quitting'%p)
         audio_str = audio_streams[0]
         n = audio_str['channels']
         # pprint(ffmpeg.probe(p))
@@ -146,6 +153,7 @@ def get_device_ffprobe_UID(file):
         print(e.stderr, file)
         return None, None #-----------------------------------------------------
         # fall back to folder name
+    logger.debug('ffprobe %s'%probe)
     streams = probe['streams']
     codecs = [stream['codec_type'] for stream in streams]
     device_type = 'CAM' if 'video' in codecs else 'REC'
@@ -155,6 +163,7 @@ def get_device_ffprobe_UID(file):
         probe_lines = [l for l in probe_string.split('\n') 
                 if '_time' not in l 
                 and 'time_' not in l 
+                and 'location' not in l 
                 and 'date' not in l ]
         # this removes any metadata related to the file
         # but keeps metadata related to the device
@@ -302,12 +311,12 @@ class Scanner:
             audio_devices = [d for d in devices if d.dev_type == 'REC']
             for recorder in audio_devices:
                 recorder.tracks = self._get_tracks_from_file(recorder)
+                if recorder.tracks:
+                    if not all([lv == None for lv in recorder.tracks.lag_values]):
+                        logger.debug('%s has lag_values %s'%(
+                                recorder.name, recorder.tracks.lag_values))
         no_name_devices = [m.device for m in self.found_media_files
             if not m.device.name]
-        # if no_name_devices:
-        #     pprint_no_name = pformat([(d, self.get_media_for_device(d)) for d in no_name_devices])
-        #     print('those are anon devices%s\n'%pprint_no_name)
-        #     logger.debug('those media have anon device%s'%no_name_devices)
         for anon_dev in no_name_devices:
             medias = self.get_media_for_device(anon_dev)
             guess_name = _try_name(medias)
@@ -321,7 +330,7 @@ class Scanner:
 
     def _get_tracks_from_file(self, device) -> Tracks:
         """        
-        Look for track names in TRACKSFN file, possibly stored inside the
+        Look for eventual track names in TRACKSFN file, stored inside the
         recorder folder alongside the audio files. If there, returns a Tracks
         object, if not returns None. 
         """        
@@ -477,14 +486,16 @@ class Scanner:
         read track names for naming separated ISOs
         from tracks_file.
 
+        tokens looked for: mix mixL mixR 0 ttc
+
         repeting prefixes signals a stereo track
         and entries will correspondingly panned into
         a stero mix named mixL.wav and mixR.wav
 
-        mic1 L # space is optionnal and will be removed
-        mic1 R
-        mic2 L
-        mic2 R
+        xyz L # spaces are ignored |
+        zyz R                      | stereo pair
+        abc L
+        abc R
 
         mixL
 
@@ -502,41 +513,56 @@ class Scanner:
             ch = [c for c in chaine if c != ' ']
             return ''.join(ch)
         def _WO_LR(chaine):
-            ch = [c for c in chaine if c not in 'lr']
+            ch = [c for c in chaine if c not in 'LR']
             return ''.join(ch)
         def _seemsStereoMic(tag):
             # is tag likely a stereo pair tag?
-            # should start with 'mic' and end with 'l' or 'r'
-            return tag[:3]=='mic' and tag[-1] in 'lr'
+            # should start with 'mic' and end with 'L' or 'R'
+            return tag[:3]=='mic' and tag[-1] in 'LR'
         file=open(tracks_file,"r")
         whole_txt = file.read()
         logger.debug('all_lines:\n%s'%whole_txt)
-        tracks_lines = [l.split('#')[0] for l in whole_txt.splitlines() if len(l) > 0 ]
-        tracks_lines = [_WOspace(l).lower() for l in tracks_lines if len(l) > 0 ]
+        tracks_lines = [l.split('#')[0] for l in whole_txt.splitlines()
+                                        if len(l) > 0 ]
+        tracks_lines = [_WOspace(l) for l in tracks_lines if len(l) > 0 ]
         rawtrx = tracks_lines
+        # add index with tuples, starting at 1
+        logger.debug('tracks_lines whole: %s'%tracks_lines)
+        def _detach_lag_value(line):
+            # look for ";number" ending any line, returns a two-list
+            splt = line.split(';')
+            if len(splt) == 1:
+                splt += [None]
+                if len(splt) != 2:
+                    # error
+                    print('Text error in %s, line %s has too many ";"'%(
+                            tracks_file, line))
+            return splt
+        tracks_lines, lag_values = zip(*[_detach_lag_value(l) for l 
+                                                    in tracks_lines])
+        logger.debug('tracks_lines WO lag: %s'%[tracks_lines])
+        logger.debug('lag_values: %s'%[lag_values])
         tracks_lines = [(t,ix+1) for ix,t in enumerate(tracks_lines)]
-        # tracks_lines = [l for l in tracks_lines if l not in ['ttc', '0']]
-        # track_names = [l.split()[0] for l in tracks_lines if l != 'ttc']
-        logger.debug('tracks_lines: %s'%tracks_lines)
         # first check for stereo mic pairs (could be more than one pair):
         spairs = [e for e in tracks_lines if _seemsStereoMic(e[0])]
         # spairs is stereo pairs candidates
         msg = 'Confusing stereo pair tags: %s'%' '.join([e[0]
                                                 for e in spairs])
-        error_output_stereo = Tracks(None,[],[],[],[],[],msg)
+        error_output_stereo = Tracks(None,[],[],[],[],[],msg,[])
         if len(spairs)%2 == 1: # not pairs?, quit.
             return error_output_stereo
         logger.debug('_seemsStereoM: %s'%spairs)
-        output_tracks = Tracks(None,[],[],[],[],rawtrx,None)
-        def _LR(p):
-            # p = (('mic1l', 1), ('mic1r', 2))
-            # check if L then R
-            p1, p2 = p
-            return p1[0][-1] == 'l' and p2[0][-1] == 'r'
+        output_tracks = Tracks(None,[],[],[],[],rawtrx,None,[])
+        output_tracks.lag_values = lag_values
+        # def _LR(p):
+        #     # p = (('mic1l', 1), ('mic1r', 2))
+        #     # check if L then R
+        #     p1, p2 = p
+        #     return p1[0][-1] == 'l' and p2[0][-1] == 'r'
         if spairs:
             even_idxes = range(0,len(spairs),2)
             paired = [(spairs[i], spairs[i+1]) for i in even_idxes]
-            # eg [(('mic1l', 1), ('mic1r', 2)), (('mic2l', 3), ('mic2r', 4))]
+            # eg [(('mic1L', 1), ('mic1R', 2)), (('mic2L', 3), ('mic2R', 4))]
             def _mic_same(p):
                 # p = (('mic1l', 1), ('mic1r', 2))
                 # check if mic1 == mic1
@@ -546,16 +572,22 @@ class Scanner:
             logger.debug('mic_prefix_OK: %s'%mic_prefix_OK)
             if not mic_prefix_OK:
                 return error_output_stereo
-            mic_LR_OK = all([_LR(p) for p in paired])
-            logger.debug('mic_LR_OK %s'%mic_LR_OK)
-            if not mic_LR_OK:
-                return error_output_stereo
+            # mic_LR_OK = all([_LR(p) for p in paired])
+            # logger.debug('mic_LR_OK %s'%mic_LR_OK)
+            # if not mic_LR_OK:
+            #     return error_output_stereo
             def _stereo_mic_pref_chan(p):
-                # p = (('mic1l', 1), ('mic1r', 2))
+                # p = (('mic1R', 1), ('mic1L', 2))
                 # returns ('mic1', (1,2))
                 first, second = p
                 mic_prefix = _WO_LR(first[0])
-                return (mic_prefix, (first[1], second[1]) )
+                # check if first token last char 
+                if p[0][0][-1] == 'L':
+                    logger.debug('sequence %s is L+R'%[p])
+                    return (mic_prefix, (first[1], second[1]) )
+                else:
+                    logger.debug('sequence %s is R+L'%[p])
+                    return (mic_prefix, (second[1], first[1]) )                    
             grouped_stereo_mic_channels = [_stereo_mic_pref_chan(p) for p
                                             in paired]
             logger.debug('grouped_stereo_mic_channels: %s'%

{tictacsync-0.82a0 → tictacsync-0.95a0}/tictacsync/entry.py

@@ -1,4 +1,4 @@
-# print('Loading modules...', end='')
+print('Loading modules...', end='')
 
 # I know, the following is ugly, but I need those try's to
 # run the command in my dev setting AND from
@@ -16,11 +16,11 @@ except:
     import timeline
     import multi2polywav
 
-import argparse
+import argparse, tempfile
 from loguru import logger
 from pathlib import Path
 # import os, sys
-import os, sys
+import os, sys, sox
 from rich.progress import track
 # from pprint import pprint
 from rich.console import Console
@@ -29,6 +29,8 @@ from rich.table import Table
 from rich import print
 from pprint import pprint 
 
+DEL_TEMP = False
+
 av_file_extensions = \
 """MOV webm mkv flv flv vob ogv ogg drc gif gifv mng avi MTS M2TS TS mov qt
 wmv yuv rm rmvb viv asf amv mp4 m4p m4v mpg mp2 mpeg mpe mpv mpg mpeg m2v
@@ -40,7 +42,7 @@ logger.level("DEBUG", color="<yellow>")
 
 def process_files_with_progress_bars(medias):
     recordings = []
-    rec_with_yaltc = []
+    rec_with_TTC = []
     times = []
     for m in track(medias,
             description="1/4 Initializing Recordings:"):
@@ -49,29 +51,32 @@ def process_files_with_progress_bars(medias):
     for r in track(recordings,
             description="2/4  Looking for TicTacCode:"):
         if r.seems_to_have_TicTacCode_at_beginning():
-            rec_with_yaltc.append(r)
-    for r in track(rec_with_yaltc,
+            rec_with_TTC.append(r)
+    for r in track(rec_with_TTC,
             description="3/4     Finding start times:"):
         times.append(r.get_start_time())
-    return recordings, rec_with_yaltc, times
+    return recordings, rec_with_TTC, times
 
 def process_files(medias):
     recordings = []
-    rec_with_yaltc = []
+    rec_with_TTC = []
     times = []
     for m in medias:
         recordings.append(yaltc.Recording(m))
     for r in recordings:
         # print('%s duration %.2fs'%(r.AVpath.name, r.get_duration()))
         if r.seems_to_have_TicTacCode_at_beginning():
-            rec_with_yaltc.append(r)
-    for r in rec_with_yaltc:
+            rec_with_TTC.append(r)
+    for r in rec_with_TTC:
         times.append(r.get_start_time())
-    return recordings, rec_with_yaltc, times
+    return recordings, rec_with_TTC, times
 
 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)
@@ -94,43 +99,93 @@ def process_single(file, args):
             print('Start time couldnt be determined')
     sys.exit(1)
 
+def process_lag_adjustement(media_object):
+    # trim channels that are lagging (as stated in tracks.txt)
+    # replace the old file, and rename the old one with .wavbk
+    # if .wavbk exist, process was done already, so dont process
+    # returns nothing
+    lags = media_object.device.tracks.lag_values
+    logger.debug('will process %s lags'%[lags])
+    channels = timeline._split_channels(media_object.path)
+    # add bk to file on filesystem, but media_object.path is unchanged (?)
+    backup_name = str(media_object.path) + 'bk'
+    if Path(backup_name).exists():
+        logger.debug('%s exists, so return now.'%backup_name)
+        return
+    media_object.path.replace(backup_name)
+    logger.debug('channels %s'%channels)
+    def _trim(lag, chan_file):
+        if lag == None:
+            return chan_file
+        else:
+            logger.debug('process %s for lag of %s'%(chan_file, lag))            
+            sox_transform = sox.Transformer()
+            sox_transform.trim(float(lag)*1e-3)
+            output_fh = tempfile.NamedTemporaryFile(suffix='.wav', delete=DEL_TEMP)
+            out_file = timeline._pathname(output_fh)
+            input_file = timeline._pathname(chan_file)
+            logger.debug('sox in and out files: %s %s'%(input_file, out_file))
+            logger.debug('calling sox_transform.build()')
+            status = sox_transform.build(input_file, out_file, return_output=True )
+            logger.debug('sox.build exit code %s'%str(status))
+        return output_fh
+    new_channels = [_trim(*e) for e in zip(lags, channels)]
+    logger.debug('new_channels %s'%new_channels)
+    trimmed_multichanfile = timeline._sox_combine(new_channels)
+    logger.debug('trimmed_multichanfile %s'%timeline._pathname(trimmed_multichanfile))
+    Path(timeline._pathname(trimmed_multichanfile)).replace(media_object.path)
+
 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')
-    parser.add_argument('-v', action='store_true', default=False,
-                    dest='verbose_output',
-                    help='Set verbose ouput')
+    parser.add_argument('-v',
+                        action='store_true',  #ie default False
+                        dest='verbose_output',
+                        help='Set verbose ouput')
     parser.add_argument('-o', nargs=1,
-                    help='where to write synced clips')
-    parser.add_argument('-p', action='store_true', default=False,
+                    help='Where to write the SyncedMedia folder [default to "path" ]')
+    parser.add_argument('-t','--timelineoffset',
+                    nargs=1,
+                    default=['00:00:00:00'],
+                    dest='timelineoffset',
+                    help='When processing multicam, where to place clips on NLE timeline (HH:MM:SS:FF)')
+    parser.add_argument('-p',
+                    action='store_true',
                     dest='plotting',
-                    help='Make plots')
-    parser.add_argument('--isos', action='store_true', default=False,
+                    help='Produce plots')
+    parser.add_argument('--isos',
+                    action='store_true',
                     dest='write_ISOs',
                     help='Write ISO sound files')
-    parser.add_argument('--nosync', action='store_true',
+    parser.add_argument('--nosync',
+                    action='store_true',
                     dest='nosync',
-                    help='just scan and decode')
-    parser.add_argument('--terse', action='store_true',
+                    help='Just scan and decode')
+    parser.add_argument('--terse',
+                    action='store_true',
                     dest='terse',
-                    help='terse output')
+                    help='Terse output')
     args = parser.parse_args()
+    # print(args)
+    if len(args.timelineoffset) != 1:
+        print('--timelineoffset needs one value, got %s'%args.timelineoffset)
+        quit()
     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"] == "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]
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "process_lag_adjustement")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_dedrift_rec")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "scan_media_and_build_devices_UID")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_parse_track_values")
+    top_dir = args.path[0]
     if os.path.isfile(top_dir):
         file = top_dir
         process_single(file, args)
@@ -148,7 +203,13 @@ def main():
         sys.exit(1)
     multi2polywav.poly_all(top_dir)
     scanner = device_scanner.Scanner(top_dir, stay_silent=args.terse)
-    scanner.scan_media_and_build_devices_UID() 
+    scanner.scan_media_and_build_devices_UID()
+    for m in scanner.found_media_files:
+        if m.device.tracks:
+            if not all([lv == None for lv in m.device.tracks.lag_values]):
+                logger.debug('%s has lag_values %s'%(
+                        m.path, m.device.tracks.lag_values))
+                process_lag_adjustement(m)                
     if not args.terse:
         if scanner.input_structure == 'folder_is_device':
             print('\nDetected structured folders', end='')
@@ -159,10 +220,8 @@ def main():
         else:
             print('\nDetected loose structure')
             if scanner.CAM_numbers() > 1:
-                print('\nNote: different CAMs are present, will sync audio')
-                print('for each of them but if you want to set their')
-                print('respective timecode for NLE timeline alignement')
-                print('you should regroup clips by CAM under their own DIR.')
+                print('\nNote: different CAMs are present, will sync audio for each of them but if you want to set their')
+                print('respective timecode for NLE timeline alignement you should regroup clips by CAM under their own DIR.')
         print('\nFound [gold1]%i[/gold1] media files '%(
             len(scanner.found_media_files)), end='')
         print('from [gold1]%i[/gold1] devices:\n'%(
@@ -173,25 +232,18 @@ def main():
             for m in medias[:-1]:
                 print('[gold1]%s[/gold1]'%m.path.name, end=', ')
             print('[gold1]%s[/gold1]'%medias[-1].path.name)
-        # print('\nThese recordings will be analysed for timestamps:\n')
-        # for m in (scanner.found_media_files):
-        #     print('   ', '[gold1]%s[/gold1]'%m.path.name)
         print()
-    if args.verbose_output or args.terse: # verbose or terse, so no progress bars
-        rez = process_files(scanner.found_media_files)
-    else: 
-        rez = process_files_with_progress_bars(scanner.found_media_files)
-    recordings, rec_with_yaltc, times = rez
+    rez = process_files(scanner.found_media_files)
+    recordings, rec_with_TTC, times = rez
     recordings_with_time =  [
         rec 
-        for rec in rec_with_yaltc
+        for rec in rec_with_TTC
         if rec.get_start_time()
         ]
     if not args.terse:    
-        print('\n\n')
         table = Table(title="tictacsync results")
         table.add_column("Recording\n", justify="center", style='gold1')
-        table.add_column("TicTacCode\nChannel", justify="center", style='gold1')
+        table.add_column("TTC chan\n (1st=#0)", justify="center", style='gold1')
         # 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')
@@ -199,7 +251,7 @@ def main():
         table.add_column("Date\n", justify="center", style='gold1')
         rec_WO_time = [
             rec.AVpath.name
-            for rec in rec_with_yaltc
+            for rec in rec_with_TTC
             if not rec.get_start_time()
             ]
         if rec_WO_time:
@@ -226,9 +278,6 @@ def main():
         print()
     n_devices = scanner.get_devices_number()
     OUT_struct_for_mcam = scanner.top_dir_has_multicam
-    # if n_devices > 2:
-    #     print('\nMerging for more than 2 devices is not implemented yet, quitting...')
-    #     sys.exit(1)
     if len(recordings_with_time) < 2:
         if not args.terse:
             print('\nNothing to sync, exiting.\n')
@@ -244,32 +293,25 @@ def main():
         print('Warning, can\'t write ISOs without structured folders: [gold1]--isos[/gold1] option ignored.\n')
         asked_ISOs = False
     output_dir = args.o
-    if args.verbose_output or args.terse: # verbose, so no progress bars
-        for stitcher in matcher.video_mergers:
-            stitcher.build_audio_and_write_video(top_dir, arg_out_dir,
-            OUT_struct_for_mcam,
-            asked_ISOs,)
-    else:
-        print() 
-        for stitcher in track(matcher.video_mergers,
-            description="4/4         Merging sound to videos:"):
-            stitcher.build_audio_and_write_video(top_dir, arg_out_dir,
-                    OUT_struct_for_mcam,
-                    asked_ISOs,)
+    # if args.verbose_output or args.terse: # verbose, so no progress bars
+    for merger in matcher.video_mergers:
+        merger.build_audio_and_write_video(top_dir, arg_out_dir,
+        OUT_struct_for_mcam,
+        asked_ISOs,)
     if not args.terse:
         print("\n")
     # find out where files were wrtitten
-    a_stitcher = matcher.video_mergers[0]
+    a_merger = matcher.video_mergers[0]
     print('\nWrote output in folder [gold1]%s[/gold1]'%(
-            a_stitcher.synced_clip_dir))
-    for stitcher in matcher.video_mergers:
-        print('[gold1]%s[/gold1]'%stitcher.videoclip.AVpath.name, end='')
-        for audio in stitcher.get_matched_audio_recs():
+            a_merger.synced_clip_dir))
+    for merger in matcher.video_mergers:
+        print('[gold1]%s[/gold1]'%merger.videoclip.AVpath.name, end='')
+        for audio in merger.get_matched_audio_recs():
             print(' + [gold1]%s[/gold1]'%audio.AVpath.name, end='')
-        new_file = stitcher.videoclip.final_synced_file.parts
-        print(' became [gold1]%s[/gold1]'%stitcher.videoclip.final_synced_file.name)
+        new_file = merger.videoclip.final_synced_file.parts
+        print(' became [gold1]%s[/gold1]'%merger.videoclip.final_synced_file.name)
         # matcher._build_otio_tracks_for_cam()
-    matcher.shrink_gaps_between_takes()
+    matcher.shrink_gaps_between_takes(args.timelineoffset)
     sys.exit(0)
     
 if __name__ == '__main__':

{tictacsync-0.82a0 → tictacsync-0.95a0}/tictacsync/multi2polywav.py

@@ -1,4 +1,4 @@
-import argparse, wave, subprocess
+import argparse, wave, subprocess, sys
 from loguru import logger
 from pathlib import Path
 from itertools import groupby