diff --git a/dbm_lib/dbm_features/raw_features/audio/formant_freq.py b/dbm_lib/dbm_features/raw_features/audio/formant_freq.py index 2d2eff92..64568ac7 100644 --- a/dbm_lib/dbm_features/raw_features/audio/formant_freq.py +++ b/dbm_lib/dbm_features/raw_features/audio/formant_freq.py @@ -18,7 +18,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -formant_dir = 'audio/formant_freq' +formant_dir = 'acoustic/formant_freq' csv_ext = '_formant.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/audio/gne.py b/dbm_lib/dbm_features/raw_features/audio/gne.py index 245597c9..00a98f81 100644 --- a/dbm_lib/dbm_features/raw_features/audio/gne.py +++ b/dbm_lib/dbm_features/raw_features/audio/gne.py @@ -19,8 +19,8 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -gne_dir = 'audio/glottal_noise' -ff_dir = 'audio/pitch' +gne_dir = 'acoustic/glottal_noise' +ff_dir = 'acoustic/pitch' csv_ext = '_gne.csv' def gne_ratio(sound): diff --git a/dbm_lib/dbm_features/raw_features/audio/hnr.py b/dbm_lib/dbm_features/raw_features/audio/hnr.py index 18fff61e..d3dfec72 100644 --- a/dbm_lib/dbm_features/raw_features/audio/hnr.py +++ b/dbm_lib/dbm_features/raw_features/audio/hnr.py @@ -18,7 +18,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -hnr_dir = 'audio/harmonic_noise' +hnr_dir = 'acoustic/harmonic_noise' csv_ext = '_hnr.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/audio/intensity.py b/dbm_lib/dbm_features/raw_features/audio/intensity.py index abdd52f1..383267f8 100644 --- a/dbm_lib/dbm_features/raw_features/audio/intensity.py +++ b/dbm_lib/dbm_features/raw_features/audio/intensity.py @@ -17,7 +17,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -intensity_dir = 'audio/intensity' +intensity_dir = 'acoustic/intensity' csv_ext = '_intensity.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/audio/jitter.py b/dbm_lib/dbm_features/raw_features/audio/jitter.py index 0b759ee8..443e15ae 100644 --- a/dbm_lib/dbm_features/raw_features/audio/jitter.py +++ b/dbm_lib/dbm_features/raw_features/audio/jitter.py @@ -20,8 +20,8 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -jitter_dir = 'audio/jitter' -ff_dir = 'audio/pitch' +jitter_dir = 'acoustic/jitter' +ff_dir = 'acoustic/pitch' csv_ext = '_jitter.csv' def audio_jitter(sound): diff --git a/dbm_lib/dbm_features/raw_features/audio/mfcc.py b/dbm_lib/dbm_features/raw_features/audio/mfcc.py index 48c43f5d..505b3205 100644 --- a/dbm_lib/dbm_features/raw_features/audio/mfcc.py +++ b/dbm_lib/dbm_features/raw_features/audio/mfcc.py @@ -19,7 +19,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -mfcc_dir = 'audio/mfcc' +mfcc_dir = 'acoustic/mfcc' csv_ext = '_mfcc.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/audio/pause_segment.py b/dbm_lib/dbm_features/raw_features/audio/pause_segment.py index 8849eca6..b5c43534 100644 --- a/dbm_lib/dbm_features/raw_features/audio/pause_segment.py +++ b/dbm_lib/dbm_features/raw_features/audio/pause_segment.py @@ -20,7 +20,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -pause_seg_dir = 'audio/pause_segment' +pause_seg_dir = 'acoustic/pause_segment' csv_ext = '_pausechar.csv' def get_timing_cues(seg_starts_sec, seg_ends_sec, r_config): diff --git a/dbm_lib/dbm_features/raw_features/audio/pitch_freq.py b/dbm_lib/dbm_features/raw_features/audio/pitch_freq.py index 48464233..66f35718 100644 --- a/dbm_lib/dbm_features/raw_features/audio/pitch_freq.py +++ b/dbm_lib/dbm_features/raw_features/audio/pitch_freq.py @@ -18,7 +18,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -ff_dir = 'audio/pitch' +ff_dir = 'acoustic/pitch' csv_ext = '_pitch.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/audio/shimmer.py b/dbm_lib/dbm_features/raw_features/audio/shimmer.py index 56d39454..c33f163b 100644 --- a/dbm_lib/dbm_features/raw_features/audio/shimmer.py +++ b/dbm_lib/dbm_features/raw_features/audio/shimmer.py @@ -21,8 +21,8 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -shimmer_dir = 'audio/shimmer' -ff_dir = 'audio/pitch' +shimmer_dir = 'acoustic/shimmer' +ff_dir = 'acoustic/pitch' csv_ext = '_shimmer.csv' def audio_shimmer(sound): diff --git a/dbm_lib/dbm_features/raw_features/audio/voice_frame_score.py b/dbm_lib/dbm_features/raw_features/audio/voice_frame_score.py index 3e2ecf1d..1d8d0bb3 100644 --- a/dbm_lib/dbm_features/raw_features/audio/voice_frame_score.py +++ b/dbm_lib/dbm_features/raw_features/audio/voice_frame_score.py @@ -17,7 +17,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -vfs_dir = 'audio/voice_frame_score' +vfs_dir = 'acoustic/voice_frame_score' csv_ext = '_voiceprev.csv' error_txt = 'error: length less than 0.064' diff --git a/dbm_lib/dbm_features/raw_features/movement/eye_gaze.py b/dbm_lib/dbm_features/raw_features/movement/eye_gaze.py index a574a2d9..c52893db 100644 --- a/dbm_lib/dbm_features/raw_features/movement/eye_gaze.py +++ b/dbm_lib/dbm_features/raw_features/movement/eye_gaze.py @@ -135,7 +135,7 @@ def run_eye_gaze(video_uri, out_dir, r_config): #filtering path to generate input & output path input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: diff --git a/dbm_lib/dbm_features/raw_features/movement/facial_tremor.py b/dbm_lib/dbm_features/raw_features/movement/facial_tremor.py index 7753eb0b..929cc19f 100644 --- a/dbm_lib/dbm_features/raw_features/movement/facial_tremor.py +++ b/dbm_lib/dbm_features/raw_features/movement/facial_tremor.py @@ -142,7 +142,7 @@ def fac_tremor_process(video_uri, out_dir, r_config, model_output=False): # try: input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_video_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface_lmk/*.csv')) if len(of_csv_path)>0: of_csv = of_csv_path[0] diff --git a/dbm_lib/dbm_features/raw_features/movement/head_motion.py b/dbm_lib/dbm_features/raw_features/movement/head_motion.py index 59179c2e..709b4f6c 100644 --- a/dbm_lib/dbm_features/raw_features/movement/head_motion.py +++ b/dbm_lib/dbm_features/raw_features/movement/head_motion.py @@ -182,7 +182,7 @@ def run_head_movement(video_uri, out_dir, r_config): #filtering path to generate input & output path input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: diff --git a/dbm_lib/dbm_features/raw_features/nlp/speech_features.py b/dbm_lib/dbm_features/raw_features/nlp/speech_features.py index 3f0cfba7..4217a968 100644 --- a/dbm_lib/dbm_features/raw_features/nlp/speech_features.py +++ b/dbm_lib/dbm_features/raw_features/nlp/speech_features.py @@ -18,9 +18,9 @@ from dbm_lib.dbm_features.raw_features.util import nlp_util as n_util logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -speech_dir = 'nlp/speech_feature' +speech_dir = 'speech/speech_feature' speech_ext = '_nlp.csv' -transcribe_ext = 'nlp/transcribe/*_transcribe.csv' +transcribe_ext = 'speech/deepspeech/*_transcribe.csv' def run_speech_feature(video_uri, out_dir, r_config, tran_tog): """ diff --git a/dbm_lib/dbm_features/raw_features/nlp/transcribe.py b/dbm_lib/dbm_features/raw_features/nlp/transcribe.py index f567e967..0e23d824 100644 --- a/dbm_lib/dbm_features/raw_features/nlp/transcribe.py +++ b/dbm_lib/dbm_features/raw_features/nlp/transcribe.py @@ -17,7 +17,7 @@ from dbm_lib.dbm_features.raw_features.util import nlp_util as n_util logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -formant_dir = 'nlp/transcribe' +formant_dir = 'speech/deepspeech' csv_ext = '_transcribe.csv' error_txt = 'error: length less than 0.1' diff --git a/dbm_lib/dbm_features/raw_features/util/util.py b/dbm_lib/dbm_features/raw_features/util/util.py index 8ee050cc..7ed15c11 100644 --- a/dbm_lib/dbm_features/raw_features/util/util.py +++ b/dbm_lib/dbm_features/raw_features/util/util.py @@ -86,7 +86,7 @@ def compute_open_face_features(input_filepath, bn, _ = os.path.splitext(os.path.basename(input_filepath)) if not output_directory: - output_directory = os.path.join(os.path.dirname(input_filepath), bn + '_OF_features') + output_directory = os.path.join(os.path.dirname(input_filepath), bn + '_openface') output_csv = os.path.join(output_directory, bn + '.csv') if not os.path.isfile(output_csv) or clobber: diff --git a/dbm_lib/dbm_features/raw_features/video/face_asymmetry.py b/dbm_lib/dbm_features/raw_features/video/face_asymmetry.py index 025c9497..4249abcb 100644 --- a/dbm_lib/dbm_features/raw_features/video/face_asymmetry.py +++ b/dbm_lib/dbm_features/raw_features/video/face_asymmetry.py @@ -25,7 +25,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -face_asym_dir = 'video/face_asymmetry' +face_asym_dir = 'facial/face_asymmetry' csv_ext = '_facasym.csv' cv2_color_purple = (254,19,188) @@ -339,7 +339,7 @@ def run_face_asymmetry(video_uri, out_dir, f_cfg): cfr = ConfigFaceReader() input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: of_csv = of_csv_path[0] diff --git a/dbm_lib/dbm_features/raw_features/video/face_au.py b/dbm_lib/dbm_features/raw_features/video/face_au.py index 79015abb..3a3f3338 100644 --- a/dbm_lib/dbm_features/raw_features/video/face_au.py +++ b/dbm_lib/dbm_features/raw_features/video/face_au.py @@ -19,7 +19,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -face_au_dir = 'video/face_au' +face_au_dir = 'facial/face_au' csv_ext = '_facau.csv' @@ -74,7 +74,7 @@ def run_face_au(video_uri, out_dir, f_cfg): cfr = ConfigFaceReader() input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: df_of = pd.read_csv(of_csv_path[0], error_bad_lines=False) diff --git a/dbm_lib/dbm_features/raw_features/video/face_emotion_expressivity.py b/dbm_lib/dbm_features/raw_features/video/face_emotion_expressivity.py index e1b16be8..d47966cf 100644 --- a/dbm_lib/dbm_features/raw_features/video/face_emotion_expressivity.py +++ b/dbm_lib/dbm_features/raw_features/video/face_emotion_expressivity.py @@ -19,7 +19,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -face_expr_dir = 'video/face_expressivity' +face_expr_dir = 'facial/face_expressivity' csv_ext = '_facemo.csv' #Openface feature extraction @@ -69,7 +69,7 @@ def run_face_expressivity(video_uri, out_dir, f_cfg): cfr = ConfigFaceReader() input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: df_of = pd.read_csv(of_csv_path[0], error_bad_lines=False) diff --git a/dbm_lib/dbm_features/raw_features/video/face_landmark.py b/dbm_lib/dbm_features/raw_features/video/face_landmark.py index 26a01d40..cc309508 100644 --- a/dbm_lib/dbm_features/raw_features/video/face_landmark.py +++ b/dbm_lib/dbm_features/raw_features/video/face_landmark.py @@ -19,7 +19,7 @@ from dbm_lib.dbm_features.raw_features.util import util as ut logging.basicConfig(level=logging.INFO) logger=logging.getLogger() -face_lmk_dir = 'video/face_landmark' +face_lmk_dir = 'facial/face_landmark' csv_ext = '_faclmk.csv' def extract_col_nm_lmk(cols): @@ -98,7 +98,7 @@ def run_face_landmark(video_uri, out_dir, f_cfg): cfr = ConfigFaceReader() input_loc, out_loc, fl_name = ut.filter_path(video_uri, out_dir) - of_csv_path = glob.glob(join(out_loc, fl_name + '_OF_features/*.csv')) + of_csv_path = glob.glob(join(out_loc, fl_name + '_openface/*.csv')) if len(of_csv_path)>0: df_of = pd.read_csv(of_csv_path[0], error_bad_lines=False) diff --git a/dbm_lib/dbm_features/raw_features/video/open_face_process.py b/dbm_lib/dbm_features/raw_features/video/open_face_process.py index d42819e2..6f2e3847 100644 --- a/dbm_lib/dbm_features/raw_features/video/open_face_process.py +++ b/dbm_lib/dbm_features/raw_features/video/open_face_process.py @@ -33,9 +33,9 @@ def batch_open_face(filepaths,video_url, input_dir, out_dir, of_path, video_trac (itreable[str]) list of .csv files """ if video_tracking: - suffix = '_OF_video_features' + suffix = '_openface_lmk' else: - suffix = '_OF_features' + suffix = '_openface' csv_files = [] diff --git a/resources/features/derived_feature.yml b/resources/features/derived_feature.yml index a18d1bb2..43ee0e78 100644 --- a/resources/features/derived_feature.yml +++ b/resources/features/derived_feature.yml @@ -134,13 +134,13 @@ derive_feature: ang_exp: ['mean', 'std'] dis_exp: ['mean', 'std'] con_exp: ['mean', 'std'] - happ_occ: ['mean', 'std', 'pct'] - sad_occ: ['mean', 'std', 'pct'] - sur_occ: ['mean', 'std', 'pct'] - fea_occ: ['mean', 'std', 'pct'] - ang_occ: ['mean', 'std', 'pct'] - dis_occ: ['mean', 'std', 'pct'] - con_occ: ['mean', 'std', 'pct'] + happ_occ: ['pct'] + sad_occ: ['pct'] + sur_occ: ['pct'] + fea_occ: ['pct'] + ang_occ: ['pct'] + dis_occ: ['pct'] + con_occ: ['pct'] pos_exp: ['mean', 'std', 'pct'] neg_exp: ['mean', 'std', 'pct'] neu_exp: ['mean', 'std', 'pct']