face_features

dbm_lib/config/config_raw_feature.py

@@ -194,6 +194,9 @@ class ConfigRawReader(object):
             self.neu_exp = config['raw_feature']['neu_exp']
             self.cai_exp = config['raw_feature']['cai_exp']
             self.com_exp = config['raw_feature']['com_exp']
+            self.com_lower_exp = config['raw_feature']['com_lower_exp']
+            self.com_upper_exp = config['raw_feature']['com_upper_exp']
+            self.pai_exp = config['raw_feature']['pai_exp']
             self.hap_exp_full = config['raw_feature']['hap_exp_full']
             self.sad_exp_full = config['raw_feature']['sad_exp_full']
             self.sur_exp_full = config['raw_feature']['sur_exp_full']
@@ -206,6 +209,9 @@ class ConfigRawReader(object):
             self.neu_exp_full = config['raw_feature']['neu_exp_full']
             self.cai_exp_full = config['raw_feature']['cai_exp_full']
             self.com_exp_full = config['raw_feature']['com_exp_full']
+            self.com_lower_exp_full = config['raw_feature']['com_lower_exp_full']
+            self.com_upper_exp_full = config['raw_feature']['com_upper_exp_full']
+            self.pai_exp_full = config['raw_feature']['pai_exp_full']
             self.fac_AsymMaskMouth = config['raw_feature']['fac_AsymMaskMouth']
             self.fac_AsymMaskEye = config['raw_feature']['fac_AsymMaskEye']
             self.fac_AsymMaskEyebrow = config['raw_feature']['fac_AsymMaskEyebrow']

dbm_lib/controller/process_feature.py

@@ -152,13 +152,13 @@ def process_nlp(video_uri, out_dir, dbm_group, tran_tog, r_config, deep_path):
     speech_features.run_speech_feature(video_uri, out_dir, r_config, tran_tog)
     
 
-def remove_file(file_path):
+def remove_file(file_path, file_ext = '.wav'):
     """
     removing wav file
     """
     file_dir = dirname(file_path)
     file_name, _ = splitext(basename(file_path))
-    wav_file = glob.glob(join(file_dir, file_name + '.wav'))
+    wav_file = glob.glob(join(file_dir, file_name + file_ext))
 
     if len(wav_file)> 0:
         os.remove(wav_file[0])

dbm_lib/dbm_features/raw_features/util/video_util.py

@@ -135,10 +135,11 @@ def calc_of_for_video(of,face_cfg,fe_cfg):
         Creating dataframe for emotion expressivity
     """
     new_cols = [fe_cfg.hap_exp,fe_cfg.sad_exp,fe_cfg.sur_exp,fe_cfg.fea_exp,fe_cfg.ang_exp,fe_cfg.dis_exp,fe_cfg.con_exp,
-               fe_cfg.neg_exp,fe_cfg.pos_exp,fe_cfg.neu_exp,fe_cfg.cai_exp,fe_cfg.com_exp,fe_cfg.happ_occ,fe_cfg.sad_occ,
-               fe_cfg.sur_occ,fe_cfg.fea_occ,fe_cfg.ang_occ,fe_cfg.dis_occ,fe_cfg.con_occ,fe_cfg.hap_exp_full,
-                fe_cfg.sad_exp_full,fe_cfg.sur_exp_full,fe_cfg.fea_exp_full,fe_cfg.ang_exp_full,fe_cfg.dis_exp_full,
-                fe_cfg.con_exp_full,fe_cfg.neg_exp_full,fe_cfg.pos_exp_full,fe_cfg.neu_exp_full,fe_cfg.cai_exp_full,
+               fe_cfg.pai_exp,fe_cfg.neg_exp,fe_cfg.pos_exp,fe_cfg.neu_exp,fe_cfg.com_lower_exp,fe_cfg.com_upper_exp,
+                fe_cfg.cai_exp,fe_cfg.com_exp,fe_cfg.happ_occ,fe_cfg.sad_occ,fe_cfg.sur_occ,fe_cfg.fea_occ,fe_cfg.ang_occ,
+                fe_cfg.dis_occ,fe_cfg.con_occ,fe_cfg.hap_exp_full,fe_cfg.sad_exp_full,fe_cfg.sur_exp_full,fe_cfg.fea_exp_full,
+                fe_cfg.ang_exp_full,fe_cfg.dis_exp_full,fe_cfg.con_exp_full,fe_cfg.pai_exp_full,fe_cfg.neg_exp_full,
+                fe_cfg.pos_exp_full,fe_cfg.neu_exp_full,fe_cfg.cai_exp_full,fe_cfg.com_lower_exp_full,fe_cfg.com_upper_exp_full,
                 fe_cfg.com_exp_full]
     of[new_cols] = pd.DataFrame([[0] * len(new_cols)], index=of.index)
     of[fe_cfg.err_reason] = 'Pass'
@@ -167,6 +168,12 @@ def calc_of_for_video(of,face_cfg,fe_cfg):
     emotion_exp(face_cfg.cai,of,[fe_cfg.cai_exp,fe_cfg.cai_exp_full],fe_cfg.err_reason)
     #Composite Expressivity
     emotion_exp(face_cfg.ACTION_UNITS,of,[fe_cfg.com_exp,fe_cfg.com_exp_full],fe_cfg.err_reason)
+    #Composite lower face expressivity
+    emotion_exp(face_cfg.LOWER_ACTION_UNITS,of,[fe_cfg.com_lower_exp,fe_cfg.com_lower_exp_full],fe_cfg.err_reason)
+    #Composite upper face Expressivity
+    emotion_exp(face_cfg.UPPER_ACTION_UNITS,of,[fe_cfg.com_upper_exp,fe_cfg.com_upper_exp_full],fe_cfg.err_reason)
+    #Composite pain expressivity
+    emotion_exp(face_cfg.pain,of,[fe_cfg.pai_exp,fe_cfg.pai_exp_full],fe_cfg.err_reason) 
     #AU happiness presence
     emotion_pres(face_cfg.happiness,of,fe_cfg.happ_occ,fe_cfg.err_reason)
     #AU Sad presence

dbm_lib/dbm_features/raw_features/video/face_config/face_config_reader.py

@@ -29,7 +29,9 @@ class ConfigFaceReader(object):
             self.ACTION_UNITS = config['cdx_face_config']['ACTION_UNITS']
             self.NEG_ACTION_UNITS = config['cdx_face_config']['NEG_ACTION_UNITS']
             self.POS_ACTION_UNITS = config['cdx_face_config']['POS_ACTION_UNITS']
-            self.NET_ACTION_UNITS = config['cdx_face_config']['NET_ACTION_UNITS']            
+            self.NET_ACTION_UNITS = config['cdx_face_config']['NET_ACTION_UNITS']  
+            self.LOWER_ACTION_UNITS = config['cdx_face_config']['LOWER_ACTION_UNITS']
+            self.UPPER_ACTION_UNITS = config['cdx_face_config']['UPPER_ACTION_UNITS']
             self.happiness = config['cdx_face_config']['happiness']
             self.sadness = config['cdx_face_config']['sadness']
             self.surprise = config['cdx_face_config']['surprise']
@@ -37,6 +39,7 @@ class ConfigFaceReader(object):
             self.anger = config['cdx_face_config']['anger']
             self.disgust = config['cdx_face_config']['disgust']
             self.contempt = config['cdx_face_config']['contempt']
+            self.pain = config['cdx_face_config']['pain']
             self.cai = config['cdx_face_config']['CAI']
             self.SELECTED_FEATURES = config['cdx_face_config']['SELECTED_FEATURES'].split(',')
             self.face_expr_dir = config['cdx_face_config']['face_expr_dir']