From e1cd7288bf48f8c92ddcc240f05d10b28af1957f Mon Sep 17 00:00:00 2001 From: Pablo Prietz Date: Wed, 8 Nov 2017 12:10:53 +0100 Subject: [PATCH 1/2] Disable Marker Auto Trim Marks --- pupil_src/launchables/player.py | 4 ++-- pupil_src/shared_modules/batch_exporter.py | 5 +++-- pupil_src/shared_modules/exporter.py | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pupil_src/launchables/player.py b/pupil_src/launchables/player.py index bccf0bde8b..ef810551c7 100644 --- a/pupil_src/launchables/player.py +++ b/pupil_src/launchables/player.py @@ -92,7 +92,7 @@ def player(rec_dir, ipc_pub_url, ipc_sub_url, from seek_control import Seek_Control from video_export_launcher import Video_Export_Launcher from offline_surface_tracker import Offline_Surface_Tracker - from marker_auto_trim_marks import Marker_Auto_Trim_Marks + # from marker_auto_trim_marks import Marker_Auto_Trim_Marks from fixation_detector import Offline_Fixation_Detector from batch_exporter import Batch_Exporter from log_display import Log_Display @@ -111,7 +111,7 @@ def player(rec_dir, ipc_pub_url, ipc_sub_url, Vis_Cross, Vis_Watermark, Vis_Eye_Video_Overlay, Vis_Scan_Path, Offline_Fixation_Detector, Video_Export_Launcher, Offline_Surface_Tracker, Raw_Data_Exporter, - Batch_Exporter, Annotation_Player, Log_History, Marker_Auto_Trim_Marks, + Batch_Exporter, Annotation_Player, Log_History, Pupil_From_Recording, Offline_Pupil_Detection, Gaze_From_Recording, Offline_Calibration] + runtime_plugins diff --git a/pupil_src/shared_modules/batch_exporter.py b/pupil_src/shared_modules/batch_exporter.py index 04532472b4..b3c05d18eb 100644 --- a/pupil_src/shared_modules/batch_exporter.py +++ b/pupil_src/shared_modules/batch_exporter.py @@ -65,7 +65,7 @@ def __init__(self, g_pool): self.exports = [] self.new_exports = [] self.active_exports = [] - default_path = os.path.expanduser('~/') + default_path = os.path.expanduser('~/work/pupil/recordings/demo') self.destination_dir = default_path self.source_dir = default_path @@ -187,7 +187,8 @@ def recent_events(self, events): logger.info("starting new job") if self.active_exports: self.workers[i] = self.active_exports.pop(0) - self.workers[i].start() + if not self.workers[i].is_alive(): + self.workers[i].start() else: self.run = False diff --git a/pupil_src/shared_modules/exporter.py b/pupil_src/shared_modules/exporter.py index 2cdf606b3c..c0c23a5524 100644 --- a/pupil_src/shared_modules/exporter.py +++ b/pupil_src/shared_modules/exporter.py @@ -54,7 +54,7 @@ def export(should_terminate, frames_to_export, current_frame, rec_dir, user_dir, start_frame=None, end_frame=None, plugin_initializers=(), out_file_path=None, pre_computed={}): logger = logging.getLogger(__name__+' with pid: '+str(os.getpid())) - logger.info('Starting video export with pid: {}'.format(os.getpid())) + print('Starting video export with pid: {}'.format(os.getpid())) try: update_recording_to_recent(rec_dir) @@ -194,11 +194,11 @@ def export(should_terminate, frames_to_export, current_frame, rec_dir, user_dir, effective_fps = float(current_frame.value)/duration result = "Export done: Exported {} frames to {}. This took {} seconds. Exporter ran at {} frames per second." - logger.info(result.format(current_frame.value, out_file_path, duration, effective_fps)) + print(result.format(current_frame.value, out_file_path, duration, effective_fps)) except: from time import sleep import traceback trace = traceback.format_exc() - logger.error('Process Export (pid: {}) crashed with trace:\n{}'.format(os.getpid(), trace)) + print('Process Export (pid: {}) crashed with trace:\n{}'.format(os.getpid(), trace)) sleep(1.0) From 4c5eb7f59c45debd6853cb99903b195d8e145e5a Mon Sep 17 00:00:00 2001 From: Pablo Prietz Date: Thu, 9 Nov 2017 10:11:53 +0100 Subject: [PATCH 2/2] Disable Batch Exporter until refactor --- pupil_src/launchables/player.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pupil_src/launchables/player.py b/pupil_src/launchables/player.py index ef810551c7..dc44d785f5 100644 --- a/pupil_src/launchables/player.py +++ b/pupil_src/launchables/player.py @@ -94,7 +94,7 @@ def player(rec_dir, ipc_pub_url, ipc_sub_url, from offline_surface_tracker import Offline_Surface_Tracker # from marker_auto_trim_marks import Marker_Auto_Trim_Marks from fixation_detector import Offline_Fixation_Detector - from batch_exporter import Batch_Exporter + # from batch_exporter import Batch_Exporter from log_display import Log_Display from annotations import Annotation_Player from raw_data_exporter import Raw_Data_Exporter @@ -111,7 +111,7 @@ def player(rec_dir, ipc_pub_url, ipc_sub_url, Vis_Cross, Vis_Watermark, Vis_Eye_Video_Overlay, Vis_Scan_Path, Offline_Fixation_Detector, Video_Export_Launcher, Offline_Surface_Tracker, Raw_Data_Exporter, - Batch_Exporter, Annotation_Player, Log_History, + Annotation_Player, Log_History, Pupil_From_Recording, Offline_Pupil_Detection, Gaze_From_Recording, Offline_Calibration] + runtime_plugins