tictacsync 0.2a8__tar.gz → 0.3a1__tar.gz

{tictacsync-0.2a8/tictacsync.egg-info → tictacsync-0.3a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.2a8
+Version: 0.3a1
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz
@@ -83,7 +83,7 @@ To also produce _synced_ ISO audio files, specify `--isos` . A directory named `
 
 When called with the `-p` flag, zoomable plots will be produced for diagnostic purpose (close the plotting window for the 2nd one) and the decoded starting time will be output to stdin:
 
-    > tictacsync -p tictacsync/tests/dailies/loose/MVI_0024.MP4
+    > tictacsync -p dailies/loose/MVI_0024.MP4
 
 Typical first plot produced :
 

{tictacsync-0.2a8 → tictacsync-0.3a1}/README.md

@@ -60,7 +60,7 @@ To also produce _synced_ ISO audio files, specify `--isos` . A directory named `
 
 When called with the `-p` flag, zoomable plots will be produced for diagnostic purpose (close the plotting window for the 2nd one) and the decoded starting time will be output to stdin:
 
-    > tictacsync -p tictacsync/tests/dailies/loose/MVI_0024.MP4
+    > tictacsync -p dailies/loose/MVI_0024.MP4
 
 Typical first plot produced :
 

{tictacsync-0.2a8 → tictacsync-0.3a1}/setup.py

@@ -31,7 +31,7 @@ setup(
         'multi2polywav = tictacsync.multi2polywav:main',
         ]
         },
-    version = '0.2a8',
+    version = '0.3a1',
     description = "command for syncing audio video recordings",
     long_description_content_type='text/markdown',
     long_description = long_descr,

{tictacsync-0.2a8 → tictacsync-0.3a1}/tictacsync/device_scanner.py

@@ -58,28 +58,6 @@ def print_grby(grby):
         for e in keylist:
             print(' ', e)
 
-def media_at_path(p):
-        # return Media object for mediafile using ffprobe
-        dev_UID, dt = get_device_ffprobe_UID(p)
-        if dt == 'CAM':
-            streams = ffmpeg.probe(p)['streams']
-            audio_streams = [
-                stream 
-                for stream
-                in streams
-                if stream['codec_type']=='audio'
-                ]
-            if len(audio_streams) > 1:
-                raise Exception('ffprobe gave multiple audio streams?')
-            audio_str = audio_streams[0]
-            n = audio_str['channels']
-            # pprint(ffmpeg.probe(p))
-        else:
-            n = sox.file_info.channels(_pathname(p)) # eg 2
-        logger.debug('for file %s dev_UID established %s'%(p.name, dev_UID))
-        return Media(p,
-            Device(UID=dev_UID, folder=p.parent, name=None, dev_type=dt,
-                    n_chan=n, tracks=None))
 
 @dataclass
 class Tracks:
@@ -111,8 +89,33 @@ class Media:
     """
     path: Path
     device: Device
-
-
+def media_at_path(input_structure, p):
+    # return Media object for mediafile using ffprobe
+    dev_UID, dt = get_device_ffprobe_UID(p)
+    dev_name = None 
+    if input_structure == 'folder_is_device':
+        dev_name = p.parent.name
+        if dev_UID is None:
+            dev_UID = hash(dev_name)
+    if dt == 'CAM':
+        streams = ffmpeg.probe(p)['streams']
+        audio_streams = [
+            stream 
+            for stream
+            in streams
+            if stream['codec_type']=='audio'
+            ]
+        if len(audio_streams) > 1:
+            raise Exception('ffprobe gave multiple audio streams?')
+        audio_str = audio_streams[0]
+        n = audio_str['channels']
+        # pprint(ffmpeg.probe(p))
+    else:
+        n = sox.file_info.channels(_pathname(p)) # eg 2
+    logger.debug('for file %s dev_UID established %s'%(p.name, dev_UID))
+    return Media(p,
+        Device(UID=dev_UID, folder=p.parent, name=dev_name, dev_type=dt,
+                n_chan=n, tracks=None))
 
 def get_device_ffprobe_UID(file):
     """
@@ -250,7 +253,7 @@ class Scanner:
             and 'SyncedMedia' not in p.parts
         ]
         for p in paths:
-            new_media = media_at_path(p) # dev UID set here
+            new_media = media_at_path(self.input_structure, p) # dev UID set here
             self.found_media_files.append(new_media)
         # files from devices without UID or name
         def _same(l):
@@ -289,7 +292,7 @@ class Scanner:
         logger.debug('Scanner.found_media_files = %s'%self.found_media_files)
         if self.input_structure == 'folder_is_device':
             self._check_folders_have_same_device()
-            self._use_folder_as_device_name()
+            # self._use_folder_as_device_name()
             devices = set([m.device for m in self.found_media_files])
             audio_devices = [d for d in devices if d.dev_type == 'REC']
             for recorder in audio_devices:
@@ -353,16 +356,16 @@ class Scanner:
             logger.debug('no tracks.txt file found')
             return None
 
-    def _use_folder_as_device_name(self):
-        """
-        For each media in self.found_media_files replace existing Device.name by
-        folder name.
+    # def _use_folder_as_device_name(self):
+    #     """
+    #     For each media in self.found_media_files replace existing Device.name by
+    #     folder name.
 
-        Returns nothing
-        """
-        for m in self.found_media_files:
-            m.device.name = m.path.parent.name
-        logger.debug(self.found_media_files)
+    #     Returns nothing
+    #     """
+    #     for m in self.found_media_files:
+    #         m.device.name = m.path.parent.name
+    #     logger.debug(self.found_media_files)
 
     def _check_folders_have_same_device(self):
         """

{tictacsync-0.2a8 → tictacsync-0.3a1}/tictacsync/entry.py

@@ -71,7 +71,7 @@ def process_files(medias):
 
 def process_single(file, args):
     # argument is a single file
-    m = device_scanner.media_at_path(Path(file))
+    m = device_scanner.media_at_path(None, Path(file))
     a_rec = yaltc.Recording(m)
     time = a_rec.get_start_time(plots=args.plotting)
     if time != None:
@@ -126,9 +126,10 @@ def main():
     # 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=lambda r: r["function"] == "build_audio_and_write_video")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_audio_devices")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_get_mix")
+    # logger.add(sys.stdout, filter=lambda r: r["function"] == "_sox_mix")
     top_dir = args.directory[0]
     if os.path.isfile(top_dir):
         file = top_dir

{tictacsync-0.2a8 → tictacsync-0.3a1}/tictacsync/remergemix.py

@@ -7,7 +7,7 @@ import shutil
 
 
 logger.remove()
-OUT_DIR = 'SyncedMedia'
+# OUT_DIR = 'SyncedMedia'
 
 def _pathname(tempfile_or_path) -> str:
     if isinstance(tempfile_or_path, str):
@@ -129,7 +129,7 @@ def main():
                 "directory",
                 type=str,
                 nargs='+',
-                help="path of media directory containing SyncedMedia/",
+                help="path of media directory containing Synced videos and their ISOs",
                 default='.'
                 )
     args = parser.parse_args()

{tictacsync-0.2a8 → tictacsync-0.3a1}/tictacsync/timeline.py

@@ -10,6 +10,7 @@ from itertools import groupby
 # import opentimelineio as otio
 from datetime import timedelta
 import pprint, shutil, os
+from subprocess import Popen, PIPE
 
 from inspect import currentframe, getframeinfo
 try:
@@ -19,6 +20,7 @@ except:
 
 CLUSTER_GAP = 0.5 # secs between multicam clusters
 DEL_TEMP = False
+DB_OSX_NORM = -6 #dB
 OUT_DIR_DEFAULT = 'SyncedMedia'
 
 # utility for accessing pathnames
@@ -60,6 +62,51 @@ def _extr_channel(source, dest, channel):
     status = sox_transform.build(str(source), str(dest))
     logger.debug('sox status %s'%status)
 
+def _sox_keep(audio_file, kept_channels) -> tempfile.NamedTemporaryFile:
+    """
+    Returns a NamedTemporaryFile containing the selected kept_channels
+
+    Building dict according to pysox.remix format.
+    https://pysox.readthedocs.io/en/latest/api.html#sox.transform.Transformer.remix
+    eg: 4 channels with TicTacCode_channel at #2 
+    returns {1: [1], 2: [3], 3: [4]}
+    ie the number of channels drops by one and chan 2 is missing
+    excluded_channels is a list of Zero Based indexing chan numbers
+
+    """
+    audio_file = _pathname(audio_file)
+    nchan = sox.file_info.channels(audio_file)
+    logger.debug('in file of %i chan, have to keep %s'%
+        (nchan, kept_channels))
+    all_channels = range(1, nchan + 1) # from 1 to nchan included
+    # list of list for pysox API
+    # eg [[1], [3], [4]]
+    kept_channels = [[n] for n in kept_channels]
+    sox_remix_dict = dict(zip(all_channels, kept_channels))
+    # {1: [1], 2: [3], 3: [4]} -> from 4 to 3 chan and chan 2 is dropped
+    output_fh = tempfile.NamedTemporaryFile(suffix='.wav', delete=DEL_TEMP)
+    out_file = _pathname(output_fh)
+    logger.debug('sox in and out files: %s %s'%(audio_file, out_file))
+    # sox_transform.set_output_format(channels=1)
+    sox_transform = sox.Transformer()
+    sox_transform.remix(sox_remix_dict)
+    logger.debug('sox remix transform: %s'%sox_transform)
+    logger.debug('sox remix dict: %s'%sox_remix_dict)
+    status = sox_transform.build(audio_file, out_file, return_output=True )
+    logger.debug('sox.build exit code %s'%str(status))
+    p = Popen('ffprobe %s -hide_banner'%audio_file,
+        shell=True, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    logger.debug('remixed input_file ffprobe:\n%s'%(stdout +
+        stderr).decode('utf-8'))
+    p = Popen('ffprobe %s -hide_banner'%out_file,
+        shell=True, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    logger.debug('remixed out_file ffprobe:\n%s'%(stdout +
+        stderr).decode('utf-8'))
+    return output_fh
+
+
 def _split_channels(multi_chan_audio:Path) -> list:
     nchan = sox.file_info.channels(_pathname(multi_chan_audio))
     source = _pathname(multi_chan_audio)
@@ -78,11 +125,10 @@ def _split_channels(multi_chan_audio:Path) -> list:
     logger.debug('paths %s'%paths)
     return paths
 
-
 def _sox_combine(paths) -> Path:
     """
-    Combines files referred by the list of Path into a new temporary files
-    passed on return each files are stacked in a different channel, so 
+    Combines (stacks) files referred by the list of Path into a new temporary
+    files passed on return each files are stacked in a different channel, so
     len(paths) == n_channels
     """
     if len(paths) == 1: # one device only, nothing to stack
@@ -117,13 +163,26 @@ def _sox_mix(paths:list) -> tempfile.NamedTemporaryFile:
     """
     mix files referred by the list of Path into a new temporary files passed on return
     """
+    def _sox_norm(tempf):
+        normed_tempfile = tempfile.NamedTemporaryFile(suffix='.wav',
+                        delete=DEL_TEMP)
+        tfm = sox.Transformer()
+        tfm.norm(DB_OSX_NORM)
+        status = tfm.build(_pathname(tempf),_pathname(normed_tempfile))
+        logger.debug('sox.build status for norm(): %s'%status)
+        if status != True:
+            print('Error, sox did not normalize file in _sox_mix()')
+            sys.exit(1)
+        return normed_tempfile
+    paths = [_sox_norm(p) for p in paths]
     cbn = sox.Combiner()
     N = len(paths)
     if N == 1: # nothing to mix
+        logger.debug('one file: nothing to mix')
         return paths[0]
     cbn.set_input_format(file_type=['wav']*N)
     filenames = [_pathname(p) for p in paths]
-    logger.debug('files to mix %s'%filenames)
+    logger.debug('%i files to mix %s'%(N, filenames))
     mixed_tempf = tempfile.NamedTemporaryFile(suffix='.wav',delete=DEL_TEMP)
     status = cbn.build(filenames,
                 _pathname(mixed_tempf),
@@ -135,7 +194,7 @@ def _sox_mix(paths:list) -> tempfile.NamedTemporaryFile:
         sys.exit(1)
     normed_tempfile = tempfile.NamedTemporaryFile(suffix='.wav',delete=DEL_TEMP)
     tfm = sox.Transformer()
-    tfm.norm(-6)
+    tfm.norm(DB_OSX_NORM)
     status = tfm.build(_pathname(mixed_tempf),_pathname(normed_tempfile))
     logger.debug('sox.build status for norm(): %s'%status)
     if status != True:
@@ -216,8 +275,11 @@ class AudioStitcherVideoMerger:
         return list(self.edited_audio.keys())
 
     def _get_audio_devices(self):
-        # ex {'RCR_A', 'RCR_B', 'RCR_C'} if multisound
-        return set([r.device for r in self.get_matched_audio_recs()])
+        devices = set([r.device for r in self.get_matched_audio_recs()])
+        logger.debug('get_matched_audio_recs: %s'%
+            pprint.pformat(self.get_matched_audio_recs()))
+        logger.debug('devices %s'%devices)
+        return devices
 
     def _get_all_recordings_for(self, device):
         # return recordings for a particular device, sorted by time
@@ -433,20 +495,14 @@ class AudioStitcherVideoMerger:
         # audio_rec.edited_version = output_fh
         self.edited_audio[audio_rec] = output_fh
 
-
     def _write_ISOs(self, edited_audio_all_devices):
         """
         Writes isolated audio files that were synced to synced_clip_file,
         each track will have its dedicated monofile, named sequentially or with
         the name find in TRACKSFN if any, see Scanner._get_tracks_from_file()
 
-        synced_clip_file:
-            video to which audio has been merged
-        device:
-            instance of device_scanner.Device
-        dev_joined_audio:
-            NamedTemporaryFile for the joined synced (multi channel) audio for
-            a specific device
+        edited_audio_all_devices:
+            a list of (name, mono_tempfile)
 
         Returns nothing, output is written to filesystem as below.
         ISOs subfolders structure when user invokes the --isos flag:
@@ -508,16 +564,52 @@ class AudioStitcherVideoMerger:
         # ISO_multi_chan = ISOdir / 'ISO_multi_chan.wav'
         # logger.debug('temp file: %s'%(ISO_multi_chan))
         # logger.debug('will split audio to %s'%(ISOdir))
-        for name, audio_tempfile in edited_audio_all_devices:
+        for name, mono_tmpfl in edited_audio_all_devices:
              # pad(start_duration: float = 0.0, end_duration: float = 0.0)[source]
             destination = ISOdir/('%s.wav'%name)
-            audio_tempfile_trimpad = _fit_length(audio_tempfile)
-            shutil.copy(_pathname(audio_tempfile_trimpad), destination)
+            mono_tmpfl_trimpad = _fit_length(mono_tmpfl)
+            shutil.copy(_pathname(mono_tmpfl_trimpad), destination)
             logger.debug('destination:%s'%destination)
         # # mixNnormed = _sox_mix(tempfiles)
         # # print('516', _pathname(mixNnormed))
         # os.remove(ISO_multi_chan)
 
+    def _get_mix(self, device, multichan_tmpfl) -> tempfile.NamedTemporaryFile:
+        """        
+        If device has an associated Tracks description that declares a (mono or
+        stereo) mix track, returns a tmpfl containing the corresponding
+        tracks. If not, mix all the tracks with sox.
+
+        """
+        if device.tracks != None:
+            mix_tracks = device.tracks.mix
+            if len(mix_tracks) > 0:
+                logger.debug('%s has mix %s'%(device.name, mix_tracks))
+                logger.debug('device %s'%device)
+                if 'ttc' in device.tracks.rawtrx:
+                    sox_TTC_chan = device.tracks.rawtrx.index('ttc')
+                elif 'tc' in device.tracks.rawtrx:
+                    sox_TTC_chan = device.tracks.rawtrx.index('tc')
+                else:
+                    print('Error: no tc or ttc tag in track.txt')
+                    sys.exit(1)
+                sox_TTC_chan += 1 # sox NZBIDX
+                logger.debug('TTC chan %i'%sox_TTC_chan)
+                # redo indexing since tracks.txt numbers refere to complete
+                # files and here audio file had TTC and muted channels
+                # removed.
+                shift = 0
+                if mix_tracks[0] > sox_TTC_chan:
+                    shift += 1
+                for unused_tr in device.tracks.unused:
+                    if mix_tracks[0] > unused_tr:
+                        shift += 1
+                mix_tracks = [t-shift for t in mix_tracks]
+                logger.debug('new mix_tracks: %s'%mix_tracks)
+                return _sox_keep(multichan_tmpfl, mix_tracks)
+            else: # no tracks declaration, mix programmatically
+                return _sox_mix(_split_channels(multichan_tmpfl))
+
     def build_audio_and_write_video(self, top_dir, output_dir,
                                     write_multicam_structure,
                                     asked_ISOs):
@@ -532,7 +624,7 @@ class AudioStitcherVideoMerger:
         asked_ISOs: bool flag specified as CLI argument
 
         For each audio devices found overlapping self.ref_recording: pad, trim
-        or stretch audio files calling _get_concatenated_audiofile_for(), and
+        or stretch audio files by calling _get_concatenated_audiofile_for(), and
         put them in merged_audio_files_by_device. More than one audio recorder
         can be used for a shot: that's why merged_audio_files_by_device is a
         list
@@ -560,6 +652,7 @@ class AudioStitcherVideoMerger:
         synced_clip_file = synced_clip_dir/\
             Path(self.ref_recording.new_rec_name).name
         logger.debug('editing files for %s'%synced_clip_file)
+        self.ref_recording.final_synced_file = synced_clip_file # relative
         # collecting edited audio by device, in (Device, tempfile) pairs:
         merged_audio_files_by_device = [
                             (d, self._get_concatenated_audiofile_for(d)) 
@@ -567,45 +660,77 @@ class AudioStitcherVideoMerger:
         if len(merged_audio_files_by_device) == 0:
             # no audio file overlaps for this clip
             return
-        # split audio channels in mono wav tempfiles:    
-        edited_audio_all_devices = []
-        for device, multi_chan_audio in merged_audio_files_by_device:
-            mono_files = _split_channels(multi_chan_audio)
-            logger.debug('%i mono files for %s'%(len(mono_files), device.name))
-            dev_audio_tuples = [(device, idx, m) for idx, m
-                                            in enumerate(mono_files)]
-            edited_audio_all_devices += dev_audio_tuples
+        if len(merged_audio_files_by_device) == 1:
+            # only one audio recorder was used, pick singleton in list
+            dev, concatenate_audio_file = merged_audio_files_by_device[0]
+            logger.debug('one audio device only: %s'%dev)
+            # check if this sole recorder is stereo
+            if dev.n_chan == 2:
+                # stereo minus TTC chan = mono, check consistency:
+                nchan_sox = sox.file_info.channels(
+                    _pathname(concatenate_audio_file))
+                logger.debug('nchan_sox: %i mono?'%nchan_sox)
+                if not nchan_sox == 1:
+                    raise Exception('Error in channel processing')
+                # all OK, merge and return
+                logger.debug('simply mono to merge')
+                self.ref_recording.synced_audio = concatenate_audio_file
+                self._merge_audio_and_video()
+                return
+        # if still here, either multitracks and/or multi recorders so check if a
+        # mix has been done on location and identified as is in atracks.txt
+        # file. Split audio channels in mono wav tempfiles at the same time
+        #
         multiple_recorders = len(merged_audio_files_by_device) > 1
         logger.debug('multiple_recorder: %s'%multiple_recorders)
-        # replace device, idx pair with track name (+ device name if many)
-        def _trnm(dev, idx): # used in the list comprehension just below
-            if dev.tracks == None:
-                tag = 'chan%s'%str(idx+1).zfill(2)
-            else:
-                audio_tags = [tag for tag in dev.tracks.rawtrx
-                    if tag not in ['ttc','0','tc']]
-                tag = audio_tags[idx]
-            if multiple_recorders:
-                tag += '_' + dev.name
-            return tag
-        edited_audio_all_devices = [(_trnm(dev, idx), audio_tempfile)
-                    for dev, idx, audio_tempfile in edited_audio_all_devices]
-        logger.debug('edited_audio_all_devices %s'%edited_audio_all_devices)
-        video_path = self.ref_recording.AVpath
-        # stacked audio contains all audio recorders if many
-        mixed_audio = _sox_combine([audio for _, audio
-                in merged_audio_files_by_device]) # all devices
-        logger.debug('will merge with %s'%(_pathname(mixed_audio)))
-        self.ref_recording.synced_audio = mixed_audio
-        nchan = sox.file_info.channels(_pathname(mixed_audio))
-        logger.debug('mixed_audio n chan: %i'%nchan)
-        self.ref_recording.final_synced_file = synced_clip_file # relative
+        # dev_mixes_mix contains all audio recorders if many
+        mixes = [self._get_mix(device, multi_chan_audio)
+                for device, multi_chan_audio
+                in merged_audio_files_by_device]
+        logger.debug('thera are %i dev mixes'%len(mixes))
+        dev_mixes_mix = _sox_mix(mixes)
+        # dev_mixes_mix = _sox_combine([audio for _, audio
+        #         in merged_audio_files_by_device]) # all devices
+        logger.debug('will merge with %s'%(_pathname(dev_mixes_mix)))
+        self.ref_recording.synced_audio = dev_mixes_mix
+        logger.debug('dev_mixes_mix n chan: %i'%
+            sox.file_info.channels(_pathname(dev_mixes_mix)))
         self._merge_audio_and_video()
+        # devices_and_monofiles is list of (device, [monofiles])
+        # [(dev1, multichan1), (dev2, multichan2)] in
+        # merged_audio_files_by_device -> 
+        # [(dev1, [mono1_ch1, mono1_ch2]), (dev2, [mono2_ch1, mono2_ch2)]] in 
+        # devices_and_monofiles:
         if asked_ISOs:
-            self._write_ISOs(edited_audio_all_devices)
+            devices_and_monofiles = [(device, _split_channels(multi_chan_audio))
+                    for device, multi_chan_audio
+                    in merged_audio_files_by_device]
+            logger.debug('devices_and_monofiles: %s'%
+                pprint.pformat(devices_and_monofiles))
+            def _trnm(dev, idx): # used in the list comprehension just below
+                # generates track name for later if asked_ISOs
+                # idx is from 0 to nchan-1 for this device
+                if dev.tracks == None:
+                    tag = 'chan%s'%str(idx+1).zfill(2)
+                else:
+                    audio_tags = [tag for tag in dev.tracks.rawtrx
+                        if tag not in ['ttc','0','tc']]
+                    tag = audio_tags[idx]
+                if multiple_recorders:
+                    tag += '_' + dev.name
+                return tag
+            # replace device, idx pair with track name (+ device name if many)
+            # loop over devices than loop over tracks
+            names_audio_tempfiles = []
+            for dev, mono_tmpfiles_list in devices_and_monofiles:
+                for idx, monotf in enumerate(mono_tmpfiles_list):
+                    names_audio_tempfiles.append((_trnm(dev, idx), monotf))
+            logger.debug('names_audio_tempfiles %s'%names_audio_tempfiles)
+            self._write_ISOs(names_audio_tempfiles)
         logger.debug('merged_audio_files_by_device %s'%
             merged_audio_files_by_device)
-        for idx, pair in enumerate(merged_audio_files_by_device): # This loop for logging purpose only.
+        # This loop below for logging purpose only:
+        for idx, pair in enumerate(merged_audio_files_by_device):
             # dev_joined_audio is mono, stereo or even polywav from multitrack 
             # recorders. For one video there could be more than one dev_joined_audio
             # if multiple audio recorders where used during the take.
@@ -617,15 +742,6 @@ class AudioStitcherVideoMerger:
                 (_pathname(dev_joined_audio), nchan))
             logger.debug('duration %f s'%
                 sox.file_info.duration(_pathname(dev_joined_audio)))
-        # generates ISOs too
-        # if asked_ISOs:
-        #     print('Writing ISO files for:')
-        #     for idx, pair in enumerate(merged_audio_files_by_device):
-        #         device, dev_joined_audio = pair
-        #         logger.debug('device %i, dev_joined_audio %s %s'%
-        #             (idx, device, _pathname(dev_joined_audio)))
-        #         self._write_ISOs_for(synced_clip_file,
-        #             device, dev_joined_audio)
 
     def _keep_VIDEO_only(self, video_path):
         # return file handle to a temp video file formed from the video_path
@@ -642,12 +758,15 @@ class AudioStitcherVideoMerger:
 
     def _merge_audio_and_video(self):
         """      
-        Calls ffmpeg to join audio and video.
+        Calls ffmpeg to join video in self.ref_recording.AVpath to
+        audio in self.ref_recording.synced_audio
 
         On entry, ref_recording.final_synced_file is a Path to an non existing
         file (contrarily to ref_recording.synced_audio).
-        On exit, ref_recording.final_synced_file points to the final synced
-        video file. Returns nothing.
+        On exit, self.ref_recording.final_synced_file points to the final synced
+        video file.
+
+        Returns nothing.
         """
         synced_clip_file = self.ref_recording.final_synced_file
         video_path = self.ref_recording.AVpath
@@ -699,7 +818,6 @@ class AudioStitcherVideoMerger:
             print(e.stderr.decode('UTF-8'))
             sys.exit(1)
 
-
 class Matcher:
     """
     Matcher looks for any video in self.recordings and for each one finds out

{tictacsync-0.2a8 → tictacsync-0.3a1}/tictacsync/yaltc.py

@@ -791,11 +791,12 @@ class Decoder:
         # LSB is leftmost in TicTacCode
 
     def _demod_values_are_OK(self, values_dict):
+        # TODO: use _get_timedate_from_dict rather (catching any ValueError)
         ranges = {
             'seconds': range(60),
             'minutes': range(60),
             'hours': range(24),
-            'day': range(1,32),
+            'day': range(1,32), # 32 ?
             'month': range(1,13),
             }
         for key in ranges:
@@ -1253,14 +1254,18 @@ class Recording:
             return self.decoder.get_time_in_sound_extract(plots)
 
     def _get_timedate_from_dict(self, time_dict):
-        python_datetime = datetime(
-            time_dict['year offset'] + YEAR_ZERO,
-            time_dict['month'],
-            time_dict['day'],
-            time_dict['hours'],
-            time_dict['minutes'],
-            time_dict['seconds'],
-            tzinfo=timezone.utc)
+        try:
+            python_datetime = datetime(
+                time_dict['year offset'] + YEAR_ZERO,
+                time_dict['month'],
+                time_dict['day'],
+                time_dict['hours'],
+                time_dict['minutes'],
+                time_dict['seconds'],
+                tzinfo=timezone.utc)
+        except ValueError as e:
+            print('Error converting date in _get_timedate_from_dict',e)
+            sys.exit(1)
         python_datetime += timedelta(seconds=1) # PPS precedes NMEA sequ
         return python_datetime
 
@@ -1288,6 +1293,7 @@ class Recording:
         """
         if t1 == None or t2 == None:
             return False
+        logger.debug('t1 : %s t2: %s'%(t1, t2))
         datetime_1 = self._get_timedate_from_dict(t1)
         datetime_2 = self._get_timedate_from_dict(t2)
         # if datetime_2 < datetime_1:

{tictacsync-0.2a8 → tictacsync-0.3a1/tictacsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tictacsync
-Version: 0.2a8
+Version: 0.3a1
 Summary: command for syncing audio video recordings
 Home-page: https://tictacsync.org/
 Author: Raymond Lutz
@@ -83,7 +83,7 @@ To also produce _synced_ ISO audio files, specify `--isos` . A directory named `
 
 When called with the `-p` flag, zoomable plots will be produced for diagnostic purpose (close the plotting window for the 2nd one) and the decoded starting time will be output to stdin:
 
-    > tictacsync -p tictacsync/tests/dailies/loose/MVI_0024.MP4
+    > tictacsync -p dailies/loose/MVI_0024.MP4
 
 Typical first plot produced :