Converter:

Session is now saved to the model folder.

blur and erode ranges are increased to -400+400

hist-match-bw is now replaced with seamless2 mode.

Added 'ebs' color transfer mode (works only on Windows).

FANSEG model (used in FAN-x mask modes) is retrained with new model configuration
and now produces better precision and less jitter

utils/DFLJPG.py

@@ -168,7 +168,8 @@ class DFLJPG(object):
                              source_landmarks=None,
                              image_to_face_mat=None,
                              fanseg_mask=None,
-                             pitch_yaw_roll=None,                             
+                             pitch_yaw_roll=None,
+                             eyebrows_expand_mod=None,
                              **kwargs
                    ):
 
@@ -193,7 +194,8 @@ class DFLJPG(object):
                                 'source_landmarks': source_landmarks,
                                 'image_to_face_mat': image_to_face_mat,
                                 'fanseg_mask' : fanseg_mask,
-                                'pitch_yaw_roll' : pitch_yaw_roll
+                                'pitch_yaw_roll' : pitch_yaw_roll,
+                                'eyebrows_expand_mod' : eyebrows_expand_mod
                              })
 
         try:
@@ -211,6 +213,7 @@ class DFLJPG(object):
                                 image_to_face_mat=None,
                                 fanseg_mask=None,
                                 pitch_yaw_roll=None,
+                                eyebrows_expand_mod=None,
                                 **kwargs
                     ):
         if face_type is None: face_type = self.get_face_type()
@@ -222,6 +225,8 @@ class DFLJPG(object):
         if image_to_face_mat is None: image_to_face_mat = self.get_image_to_face_mat()
         if fanseg_mask is None: fanseg_mask = self.get_fanseg_mask()
         if pitch_yaw_roll is None: pitch_yaw_roll = self.get_pitch_yaw_roll()
+        if eyebrows_expand_mod is None: eyebrows_expand_mod = self.get_eyebrows_expand_mod()
+
         DFLJPG.embed_data (filename, face_type=face_type,
                                      landmarks=landmarks,
                                      ie_polys=ie_polys,
@@ -230,7 +235,12 @@ class DFLJPG(object):
                                      source_landmarks=source_landmarks,
                                      image_to_face_mat=image_to_face_mat,
                                      fanseg_mask=fanseg_mask,
-                                     pitch_yaw_roll=pitch_yaw_roll)
+                                     pitch_yaw_roll=pitch_yaw_roll,
+                                     eyebrows_expand_mod=eyebrows_expand_mod)
+
+    def remove_ie_polys(self):
+        self.dfl_dict['ie_polys'] = None
+
     def remove_fanseg_mask(self):
         self.dfl_dict['fanseg_mask'] = None
 
@@ -300,4 +310,6 @@ class DFLJPG(object):
         return None
     def get_pitch_yaw_roll(self):
         return self.dfl_dict.get ('pitch_yaw_roll', None)
-    
+    def get_eyebrows_expand_mod(self):
+        return self.dfl_dict.get ('eyebrows_expand_mod', None)
+

utils/DFLPNG.py

@@ -285,6 +285,7 @@ class DFLPNG(object):
                              image_to_face_mat=None,
                              fanseg_mask=None,
                              pitch_yaw_roll=None,
+                             eyebrows_expand_mod=None,
                              **kwargs
                    ):
 
@@ -309,7 +310,8 @@ class DFLPNG(object):
                                 'source_landmarks': source_landmarks,
                                 'image_to_face_mat':image_to_face_mat,
                                 'fanseg_mask' : fanseg_mask,
-                                'pitch_yaw_roll' : pitch_yaw_roll
+                                'pitch_yaw_roll' : pitch_yaw_roll,
+                                'eyebrows_expand_mod' : eyebrows_expand_mod,
                              })
 
         try:
@@ -327,6 +329,7 @@ class DFLPNG(object):
                                         image_to_face_mat=None,
                                         fanseg_mask=None,
                                         pitch_yaw_roll=None,
+                                        eyebrows_expand_mod=None,
                                         **kwargs
                         ):
         if face_type is None: face_type = self.get_face_type()
@@ -338,6 +341,8 @@ class DFLPNG(object):
         if image_to_face_mat is None: image_to_face_mat = self.get_image_to_face_mat()
         if fanseg_mask is None: fanseg_mask = self.get_fanseg_mask()
         if pitch_yaw_roll is None: pitch_yaw_roll = self.get_pitch_yaw_roll()
+        if eyebrows_expand_mod is None: eyebrows_expand_mod = self.get_eyebrows_expand_mod()
+
         DFLPNG.embed_data (filename, face_type=face_type,
                                      landmarks=landmarks,
                                      ie_polys=ie_polys,
@@ -346,7 +351,11 @@ class DFLPNG(object):
                                      source_landmarks=source_landmarks,
                                      image_to_face_mat=image_to_face_mat,
                                      fanseg_mask=fanseg_mask,
-                                     pitch_yaw_roll=pitch_yaw_roll)
+                                     pitch_yaw_roll=pitch_yaw_roll,
+                                     eyebrows_expand_mod=eyebrows_expand_mod)
+
+    def remove_ie_polys(self):
+        self.dfl_dict['ie_polys'] = None
 
     def remove_fanseg_mask(self):
         self.dfl_dict['fanseg_mask'] = None
@@ -406,5 +415,8 @@ class DFLPNG(object):
         return None
     def get_pitch_yaw_roll(self):
         return self.dfl_dict.get ('pitch_yaw_roll', None)
+    def get_eyebrows_expand_mod(self):
+        return self.dfl_dict.get ('eyebrows_expand_mod', None)
+
     def __str__(self):
         return "<PNG length={length} chunks={}>".format(len(self.chunks), **self.__dict__)