Skip to content

Industry leading face manipulation platform

no, jpeg IS a format

henryruhs964fab87242f
diff --git a/facefusion/choices.py b/facefusion/choices.py
index 9a448f87..f8ff95db 100755
--- a/facefusion/choices.py
+++ b/facefusion/choices.py
@@ -44,7 +44,7 @@ audio_type_set : AudioTypeSet =\
image_type_set : ImageTypeSet =\
{
'bmp': 'image/bmp',
- 'jpg': 'image/jpeg',
+ 'jpeg': 'image/jpeg',
'png': 'image/png',
'webp': 'image/webp'
}
@@ -59,7 +59,7 @@ video_type_set : VideoTypeSet =\
audio_formats : List[AudioFormat] = list(audio_type_set.keys())
image_formats : List[ImageFormat] = list(image_type_set.keys())
video_formats : List[VideoFormat] = list(video_type_set.keys())
-temp_frame_formats : List[ImageFormat] = [ 'bmp', 'jpg', 'png' ]
+temp_frame_formats : List[ImageFormat] = [ 'bmp', 'jpeg', 'png' ]
output_audio_encoders : List[AudioEncoder] = [ 'aac', 'libmp3lame', 'libopus', 'libvorbis' ]
output_video_encoders : List[VideoEncoder] = [ 'libx264', 'libx265', 'libvpx-vp9', 'h264_nvenc', 'hevc_nvenc', 'h264_amf', 'hevc_amf', 'h264_qsv', 'hevc_qsv', 'h264_videotoolbox', 'hevc_videotoolbox' ]
diff --git a/facefusion/filesystem.py b/facefusion/filesystem.py
index afa4f313..f40c0121 100644
--- a/facefusion/filesystem.py
+++ b/facefusion/filesystem.py
@@ -32,8 +32,8 @@ def get_file_format(file_path : str) -> Optional[str]:
file_extension = get_file_extension(file_path)
if file_extension:
- if file_extension == '.jpeg':
- return 'jpg'
+ if file_extension == '.jpg':
+ return 'jpeg'
return file_extension.lower().lstrip('.')
return None
diff --git a/facefusion/typing.py b/facefusion/typing.py
index 1c7977fc..b08898f7 100755
--- a/facefusion/typing.py
+++ b/facefusion/typing.py
@@ -110,9 +110,9 @@ FaceMaskRegion = Literal['skin', 'left-eyebrow', 'right-eyebrow', 'left-eye', 'r
FaceMaskRegionSet = Dict[FaceMaskRegion, int]
AudioFormat = Literal['mp3', 'ogg', 'wav']
-ImageFormat = Literal['bmp', 'jpg', 'png', 'webp']
+ImageFormat = Literal['bmp', 'jpeg', 'png', 'webp']
VideoFormat = Literal['avi', 'mkv', 'mov', 'mp4', 'webm']
-TempFrameFormat = Literal['bmp', 'jpg', 'png']
+TempFrameFormat = Literal['bmp', 'jpeg', 'png']
AudioTypeSet = Dict[AudioFormat, str]
ImageTypeSet = Dict[ImageFormat, str]
VideoTypeSet = Dict[VideoFormat, str]
diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py
index f12c9aac..fc2ef245 100644
--- a/tests/test_filesystem.py
+++ b/tests/test_filesystem.py
@@ -29,8 +29,8 @@ def test_get_file_extension() -> None:
def test_get_file_format() -> None:
- assert get_file_format('source.jpg') == 'jpg'
- assert get_file_format('source.jpeg') == 'jpg'
+ assert get_file_format('source.jpg') == 'jpeg'
+ assert get_file_format('source.jpeg') == 'jpeg'
assert get_file_format('source.mp3') == 'mp3'
assert get_file_format('invalid') is None