tictacsync 0.91a0__py3-none-any.whl → 0.96a0__py3-none-any.whl

tictacsync/yaltc.py

@@ -35,8 +35,7 @@ TEENSY_MAX_LAG = 1.01*128/44100 # sec, duration of a default length audio block
 
 CACHING = True
 DEL_TEMP = False
-DB_RMS_SILENCE_SOX = -58
-MAXDRIFT = 10e-3 # in sec, normally 10e-3 (10 ms)
+MAXDRIFT = 15e-3 # in sec, for end of clip
 
 
 ################## pasted from FSKfreqCalculator.py output:
@@ -46,7 +45,7 @@ SYMBOL_LENGTH = 14.286 # ms, from FSKfreqCalculator.py
 N_SYMBOLS = 35 # including sync pulse
 ##################
 
-MINIMUM_LENGTH = 4 # sec
+MINIMUM_LENGTH = 8 # sec
 TRIAL_TIMES = [ # in seconds
             (3.5, -2),
             (3.5, -3.5),
@@ -233,7 +232,7 @@ class Decoder:
 
         Uses the conditions below:
 
-            Extract duration is 1.143 s.
+            Extract duration is 1.143 s. (ie one sec + 1 symbol duration)
             In self.word_props (list of morphology.regionprops):
                 if one region, duration should be in [0.499 0.512] sec
                 if two regions, total duration should be in [0.50 0.655]
@@ -244,13 +243,19 @@ class Decoder:
         props = self.words_props
         if len(props) not in [1,2]:
             failing_comment = 'len(props) not in [1,2]: %i'%len(props)
+        else:
+            logger.debug('len(props), %i, is in [1,2]'%len(props))
         if len(props) == 1:
+            logger.debug('one region')
             w = _width(props[0])/self.samplerate
             # self.effective_word_duration = w
             # logger.debug('effective_word_duration %f (one region)'%w)
             if not 0.499 < w < 0.512: # TODO: move as TOP OF FILE PARAMS
                 failing_comment = '_width %f not in [0.499 0.512]'%w
+            else:
+                logger.debug('0.499 < width < 0.512, %f'%w)
         else: # 2 regions
+            logger.debug('two regions')
             widths = [_width(p)/self.samplerate for p in props] # in sec
             total_w = sum(widths)
             # extra_window_duration = SOUND_EXTRACT_LENGTH - 1
@@ -260,6 +265,8 @@ class Decoder:
                 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)
+            else:
+                logger.debug('0.5 < total_w < 0.656, %f'%total_w)
         logger.debug('failing_comment: %s'%(
             'none' if failing_comment=='' else failing_comment))
         return failing_comment == '' # no comment = extract seems TicTacCode
@@ -558,25 +565,24 @@ class Recording:
             implicitly True for each video recordings (but not set)
 
         device_relative_speed : float
-
             the ratio of the recording device clock speed relative to the
             video recorder clock device, in order to correct clock drift with
             pysox tempo transform. If value < 1.0 then the recording is
             slower than video recorder. Updated by each
-            AudioStitcherVideoMerger instance so the value can change
+            MediaMerger instance so the value can change
             depending on the video recording . A mean is calculated for all
             recordings of the same device in
-            AudioStitcherVideoMerger._get_concatenated_audiofile_for()
+            MediaMerger._get_concatenated_audiofile_for()
 
         time_position : float
             The time (in seconds) at which the recording starts relative to the
-            video recording. Updated by each AudioStitcherVideoMerger
+            video recording. Updated by each MediaMerger
             instance so the value can change depending on the video
             recording (a video or main sound).
 
         final_synced_file : a pathlib.Path
             contains the path of the merged video file after the call to
-            AudioStitcher.build_audio_and_write_video if the Recording is a
+            AudioStitcher.build_audio_and_write_merged_media if the Recording is a
             video recording, relative to the working directory
             
         synced_audio : pathlib.Path
@@ -593,13 +599,15 @@ class Recording:
 
     def __init__(self, media, do_plots=False):
         """
+        Set AVfilename string and check if file exists, does not read any
+        media data right away but uses ffprobe to parses the file and sets
+        probe attribute.
+
+        Logs a warning and sets Recording.decoder to None if ffprobe cant
+        interpret the file or if file has no audio. If file contains audio,
+        initialise Recording.decoder(but doesnt try to decode anything yet).
+
         If multifile recording, AVfilename is sox merged audio file;
-        Set AVfilename string and check if file exists, does not read
-        any media data right away but uses ffprobe to parses the file and
-        sets probe attribute. 
-        Logs a warning if ffprobe cant interpret the file or if file
-        has no audio; if file contains audio, instantiates a Decoder object
-        (but doesnt try to decode anything yet)
 
         Parameters
         ----------
@@ -673,6 +681,7 @@ class Recording:
             print('Recording init failed: %s'%recording_init_fail)
             self.probe = None
             self.decoder = None
+            return
         logger.debug('ffprobe found: %s'%self.probe)
         logger.debug('n audio chan: %i'%self.get_audio_channels_nbr())
         self._read_audio_data()
@@ -708,7 +717,8 @@ class Recording:
             self.audio_data.shape))
 
     def __repr__(self):
-        return 'Recording of %s'%_pathname(self.new_rec_name)
+        # return 'Recording of %s'%_pathname(self.new_rec_name)
+        return _pathname(self.new_rec_name)
 
     def _check_for_camera_error_correction(self):
         # look for a file number
@@ -780,20 +790,21 @@ class Recording:
     def get_corrected_duration(self):
         """
         uses device_relative_speed to compute corrected duration. Updated by
-        each AudioStitcherVideoMerger object in
-        AudioStitcherVideoMerger._get_concatenated_audiofile_for()
+        each MediaMerger object in
+        MediaMerger._get_concatenated_audiofile_for()
         """
         return self.get_duration()/self.device_relative_speed
 
     def needs_dedrifting(self):
         rel_sp = self.device_relative_speed
-        if rel_sp > 1:
-            delta = (rel_sp - 1)*self.get_original_duration()
-        else:
-            delta = (1 - rel_sp)*self.get_original_duration()
+        # if rel_sp > 1:
+        #     delta = (rel_sp - 1)*self.get_original_duration()
+        # else:
+        #     delta = (1 - rel_sp)*self.get_original_duration()
+        delta = abs((1 - rel_sp)*self.get_original_duration())
         logger.debug('%s delta drift %.2f ms'%(str(self), delta*1e3))
         if delta > MAXDRIFT:
-            print('[gold1]%s[/gold1] will get drift correction: delta of [gold1]%.3f[/gold1] ms is too big'%
+            print('\n[gold1]%s[/gold1] will get drift correction: delta of [gold1]%.3f[/gold1] ms is too big'%
                 (self.AVpath, delta*1e3))
         return delta > MAXDRIFT, delta
 
@@ -915,7 +926,7 @@ class Recording:
     def set_time_position_to(self, video_clip):
         """
         Sets self.time_position, the time (in seconds) at which the recording
-        starts relative to the video recording. Updated by each AudioStitcherVideoMerger
+        starts relative to the video recording. Updated by each MediaMerger
         instance so the value can change depending on the video
         recording (a video or main sound).
 
@@ -942,9 +953,12 @@ class Recording:
         if successful, returns a datetime.datetime instance;
         if not returns None.
         """
-        logger.debug('for recording %s, recording.start_time %s'%(self,
+        logger.debug('for %s, recording.start_time %s'%(self,
                                                         self.start_time))
+        if self.decoder is None:
+            return None # ffprobe failes or file too short, see __init__
         if self.start_time is not None:
+            logger.debug('Recording.start_time already found %s'%self.start_time)
             return self.start_time #############################################
         cached_times = {}
         def find_time(t_sec):
@@ -969,8 +983,8 @@ class Recording:
                                         len(TRIAL_TIMES)))
             # time_around_beginning = self._find_time_around(near_beg)
             time_around_beginning = find_time(near_beg)
-            if self.TicTacCode_channel is None:
-                return None ####################################################
+            # if self.TicTacCode_channel is None:
+            #     return None ####################################################
             logger.debug('Trial #%i, end at %f'%(i+1, near_end))
             # time_around_end = self._find_time_around(near_end)
             time_around_end = find_time(near_end)
@@ -1048,6 +1062,7 @@ class Recording:
         return int(ppm)
 
     def get_speed_ratio(self, videoclip):
+        # ratio between real samplerates of audio and videoclip
         nominal = self.get_samplerate()
         true = self.true_samplerate
         ratio = true/nominal
@@ -1057,19 +1072,19 @@ class Recording:
         return ratio/ratio_ref
 
     def get_samplerate(self):
-        # return int samplerate (nominal)
+        # returns int samplerate (nominal)
         string = self._ffprobe_audio_stream()['sample_rate']
         logger.debug('ffprobe samplerate: %s'%string)
-        return eval(string) # eg eval(24000/1001)
+        return eval(string)
 
     def get_framerate(self):
-        # return int samplerate (nominal)
         string = self._ffprobe_video_stream()['avg_frame_rate']
         return eval(string) # eg eval(24000/1001)
 
-    def get_timecode(self, with_offset=0):
-        # returns a HHMMSS:FR string
+    def get_start_timecode_string(self, with_offset=0):
+        # returns a HH:MM:SS:FR string
         start_datetime = self.get_start_time()
+        # logger.debug('CLI_offset %s'%CLI_offset)
         logger.debug('start_datetime %s'%start_datetime)
         start_datetime += timedelta(seconds=with_offset)
         logger.debug('shifted start_datetime %s (offset %f)'%(start_datetime,

{tictacsync-0.91a0.dist-info → tictacsync-0.96a0.dist-info}/METADATA

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

tictacsync-0.96a0.dist-info/RECORD

@@ -0,0 +1,16 @@
+tictacsync/LTCcheck.py,sha256=IEfpB_ZajWuRTWtqji0H-B2g7GQvWmGVjfT0Icumv7o,15704
+tictacsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tictacsync/device_scanner.py,sha256=3ji6LR_HelylsEU12vI2ZAzOtODA7pdUglIXLJUjIPY,29810
+tictacsync/entry.py,sha256=P5l4b8QO5e7j_b_coKZtYi8snPI23gy9V5GojeMddDw,15394
+tictacsync/multi2polywav.py,sha256=BsZxUjZo2Px6opKpFlgcvdZuUKDANEVTdapuWrX1jKw,7287
+tictacsync/remergemix.py,sha256=bRyi1hyNcyM1rTkHh8DmSsIQjYpwPprxSyyVipnxz30,9909
+tictacsync/remrgmx.py,sha256=uGsylyXEWSQE19pU-JaX6p-po8V4C1O5fBr58dVGpT0,765
+tictacsync/synciso.py,sha256=XmUcdUF9rl4VdCm7XW4PeYWYWM0vgAY9dC2hapoul9g,4821
+tictacsync/timeline.py,sha256=fv_-oQYBXdY5db2Kse3FM_aQaj_Tg4LKC2unWEQ24A4,68036
+tictacsync/yaltc.py,sha256=7zMu0BxqNsHTB9RHLPgjer-puA13J1tRbgcuJJ_en_g,53233
+tictacsync-0.96a0.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
+tictacsync-0.96a0.dist-info/METADATA,sha256=M6yUlQJJQZ3QgyydgVybTo2kfdXgprhpOyJpCTfNDL4,5502
+tictacsync-0.96a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+tictacsync-0.96a0.dist-info/entry_points.txt,sha256=g3tdFFrVRcrKpuyKOCLUVBMgYfV65q9kpLZUOD_XCKg,139
+tictacsync-0.96a0.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
+tictacsync-0.96a0.dist-info/RECORD,,

tictacsync-0.91a0.dist-info/RECORD

@@ -1,15 +0,0 @@
-tictacsync/LTCcheck.py,sha256=IEfpB_ZajWuRTWtqji0H-B2g7GQvWmGVjfT0Icumv7o,15704
-tictacsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tictacsync/device_scanner.py,sha256=lvWps5XPvzubnTqisFWjdRUpxsM9YMRYMp-xQu7H6Os,27515
-tictacsync/entry.py,sha256=TgiFdwTKWvtj7xU-556nkwDo4OqAjJ55g97Jt-lSeBg,11377
-tictacsync/multi2polywav.py,sha256=k7VU-yjO1_0DbygWNytYvaExbiAs3_0-n0UmgGTa8wM,7282
-tictacsync/remergemix.py,sha256=FJTMipIS0O7mMl_tr8BhuYqWvanSydvjGkFCEd-jaDk,9829
-tictacsync/synciso.py,sha256=XmUcdUF9rl4VdCm7XW4PeYWYWM0vgAY9dC2hapoul9g,4821
-tictacsync/timeline.py,sha256=0K1haVu7qUbyQmb0AsVoOB3CO8_OevHxpcJENx0kf48,57763
-tictacsync/yaltc.py,sha256=2pMyDv69x56p3zq11L34PcqS_xC3-HwMPEDXGc7QhDg,52560
-tictacsync-0.91a0.dist-info/LICENSE,sha256=ZAOPXLh1zlQAnhHUd7oLslKM01YZ5UiAu3STYjwIxck,1068
-tictacsync-0.91a0.dist-info/METADATA,sha256=fnBgd-2zImEjHYIctys5-wF1TY4G-vxhCmdMz1wePk4,5502
-tictacsync-0.91a0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tictacsync-0.91a0.dist-info/entry_points.txt,sha256=g3tdFFrVRcrKpuyKOCLUVBMgYfV65q9kpLZUOD_XCKg,139
-tictacsync-0.91a0.dist-info/top_level.txt,sha256=eaCWG-BsYTRR-gLTJbK4RfcaXajr0gjQ6wG97MkGRrg,11
-tictacsync-0.91a0.dist-info/RECORD,,