global refactoring and fixes,

removed support of extracted(aligned) PNG faces. Use old builds to convert from PNG to JPG. fanseg model file in facelib/ is renamed
2020-03-13 08:09:00 +04:00
parent 921b464d5b
commit 61472cdaf7
82 changed files with 3838 additions and 3812 deletions
@@ -66,9 +66,7 @@ def restore_faceset_metadata_folder(input_path):
            elif filepath.suffix == '.jpg':
                cv2_imwrite (str(filepath), img, [int(cv2.IMWRITE_JPEG_QUALITY), 100] )

-        if filepath.suffix == '.png':
-            DFLPNG.embed_dfldict( str(filepath), dfl_dict )
-        elif filepath.suffix == '.jpg':
+        if filepath.suffix == '.jpg':
            DFLJPG.embed_dfldict( str(filepath), dfl_dict )
        else:
            continue
@@ -118,42 +116,6 @@ def remove_fanseg_folder(input_path):
        filepath = Path(filepath)
        remove_fanseg_file(filepath)

-def convert_png_to_jpg_file (filepath):
-    filepath = Path(filepath)
-
-    if filepath.suffix != '.png':
-        return
-
-    dflpng = DFLPNG.load (str(filepath) )
-    if dflpng is None:
-        io.log_err ("%s is not a dfl png image file" % (filepath.name) )
-        return
-
-    dfl_dict = dflpng.getDFLDictData()
-
-    img = cv2_imread (str(filepath))
-    new_filepath = str(filepath.parent / (filepath.stem + '.jpg'))
-    cv2_imwrite ( new_filepath, img, [int(cv2.IMWRITE_JPEG_QUALITY), 100])
-
-    DFLJPG.embed_data( new_filepath,
-                       face_type=dfl_dict.get('face_type', None),
-                       landmarks=dfl_dict.get('landmarks', None),
-                       ie_polys=dfl_dict.get('ie_polys', None),
-                       source_filename=dfl_dict.get('source_filename', None),
-                       source_rect=dfl_dict.get('source_rect', None),
-                       source_landmarks=dfl_dict.get('source_landmarks', None) )
-
-    filepath.unlink()
-
-def convert_png_to_jpg_folder (input_path):
-    input_path = Path(input_path)
-
-    io.log_info ("Converting PNG to JPG...\r\n")
-
-    for filepath in io.progress_bar_generator( pathex.get_image_paths(input_path), "Converting"):
-        filepath = Path(filepath)
-        convert_png_to_jpg_file(filepath)
-
 def add_landmarks_debug_images(input_path):
    io.log_info ("Adding landmarks debug images...")

@@ -236,3 +198,42 @@ def recover_original_aligned_filename(input_path):
            fs.rename (fd)
        except:
            io.log_err ('fail to rename %s' % (fs.name) )
+
+
+"""
+def convert_png_to_jpg_file (filepath):
+    filepath = Path(filepath)
+
+    if filepath.suffix != '.png':
+        return
+
+    dflpng = DFLPNG.load (str(filepath) )
+    if dflpng is None:
+        io.log_err ("%s is not a dfl png image file" % (filepath.name) )
+        return
+
+    dfl_dict = dflpng.getDFLDictData()
+
+    img = cv2_imread (str(filepath))
+    new_filepath = str(filepath.parent / (filepath.stem + '.jpg'))
+    cv2_imwrite ( new_filepath, img, [int(cv2.IMWRITE_JPEG_QUALITY), 100])
+
+    DFLJPG.embed_data( new_filepath,
+                       face_type=dfl_dict.get('face_type', None),
+                       landmarks=dfl_dict.get('landmarks', None),
+                       ie_polys=dfl_dict.get('ie_polys', None),
+                       source_filename=dfl_dict.get('source_filename', None),
+                       source_rect=dfl_dict.get('source_rect', None),
+                       source_landmarks=dfl_dict.get('source_landmarks', None) )
+
+    filepath.unlink()
+
+def convert_png_to_jpg_folder (input_path):
+    input_path = Path(input_path)
+
+    io.log_info ("Converting PNG to JPG...\r\n")
+
+    for filepath in io.progress_bar_generator( pathex.get_image_paths(input_path), "Converting"):
+        filepath = Path(filepath)
+        convert_png_to_jpg_file(filepath)
+"""