Update difpoint/inference.py

difpoint/inference.py

@@ -403,7 +403,7 @@ class Inferencer(object):
                 x_d_0_info = x_d_i_info
             
 
-            if self.inf_cfg.infer_params.flag_relative_motion:
+            if self.inf_cfg.flag_relative_motion:
                 R_new = (R_d_i.cpu().numpy() @ R_d_0.permute(0, 2, 1).cpu().numpy()) @ R_s
                 delta_new = x_s_info['exp'].reshape(1, 21, -1) + (x_d_i_info['exp'] - x_d_0_info['exp'])
                 scale_new = x_s_info['scale'] * (x_d_i_info['scale'] / x_d_0_info['scale'])
@@ -424,19 +424,22 @@ class Inferencer(object):
             x_d_i_new = x_d_i_new.cpu().numpy()
 
             # Algorithm 1:
-            if not self.inf_cfg.infer_params.flag_stitching and not self.inf_cfg.infer_params.flag_eye_retargeting and not self.inf_cfg.infer_params.flag_lip_retargeting:
-                pass
-            elif self.inf_cfg.infer_params.flag_stitching and not self.inf_cfg.infer_params.flag_eye_retargeting and not self.inf_cfg.infer_params.flag_lip_retargeting:
+            if not self.inf_cfg.flag_stitching and not self.inf_cfg.flag_eye_retargeting and not self.inf_cfg.flag_lip_retargeting:
+                # without stitching or retargeting
+                if flag_lip_zero:
+                    x_d_i_new += lip_delta_before_animation.reshape(-1, x_s.shape[1], 3)
+                else:
+                    pass
+            elif self.inf_cfg.flag_stitching and not self.inf_cfg.flag_eye_retargeting and not self.inf_cfg.flag_lip_retargeting:
                 # with stitching and without retargeting
-                x_d_i_new = self.live_portrait_pipeline.live_portrait_wrapper.stitching(x_s, x_d_i_new)
+                if flag_lip_zero:
+                    x_d_i_new = self.live_portrait_pipeline.live_portrait_wrapper.stitching(x_s, x_d_i_new) + lip_delta_before_animation.reshape(-1, x_s.shape[1], 3)
+                else:
+                    x_d_i_new = self.live_portrait_pipeline.live_portrait_wrapper.stitching(x_s, x_d_i_new)
             else:
                 eyes_delta, lip_delta = None, None
-                if self.inf_cfg.infer_params.flag_eye_retargeting:
-                    pass
-                if self.inf_cfg.infer_params.flag_lip_retargeting:
-                    pass
 
-                if self.inf_cfg.infer_params.flag_relative_motion:  # use x_s
+                if self.inf_cfg.flag_relative_motion:  # use x_s
                     x_d_i_new = x_s + \
                                 (eyes_delta.reshape(-1, x_s.shape[1], 3) if eyes_delta is not None else 0) + \
                                 (lip_delta.reshape(-1, x_s.shape[1], 3) if lip_delta is not None else 0)
@@ -445,9 +448,10 @@ class Inferencer(object):
                                 (eyes_delta.reshape(-1, x_s.shape[1], 3) if eyes_delta is not None else 0) + \
                                 (lip_delta.reshape(-1, x_s.shape[1], 3) if lip_delta is not None else 0)
 
-                if self.inf_cfg.infer_params.flag_stitching:
+                if self.inf_cfg.flag_stitching:
                     x_d_i_new = self.live_portrait_pipeline.live_portrait_wrapper.stitching(x_s, x_d_i_new)
 
+
             out = self.live_portrait_pipeline.live_portrait_wrapper.warp_decode(f_s, x_s, x_d_i_new)
             I_p_i = self.live_portrait_pipeline.live_portrait_wrapper.parse_output(out['out'])[0]
             I_p_lst.append(I_p_i)