CalvinBackup/facefusion
1
0
Fork 0
mirror of https://github.com/facefusion/facefusion.git synced 2026-09-21 23:10:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into v4

Browse Source 
# Conflicts:
#	facefusion/metadata.py
#	facefusion/uis/assets/overrides.css
#	facefusion/vision.py
#	facefusion/workflows/core.py
#	facefusion/workflows/to_video.py
#	tests/test_cli_age_modifier.py
#	tests/test_cli_background_remover.py
#	tests/test_cli_expression_restorer.py
#	tests/test_cli_face_debugger.py
#	tests/test_cli_face_editor.py
#	tests/test_cli_face_enhancer.py
#	tests/test_cli_face_swapper.py
#	tests/test_cli_frame_colorizer.py
#	tests/test_cli_frame_enhancer.py
#	tests/test_cli_lip_syncer.py
#	tests/test_ffmpeg.py
#	tests/test_vision.py
This commit is contained in:
henryruhs
2026-09-01 15:23:53 +02:00
parent 1362afa8b7 435521dca8
commit 8e6178269b
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
facefusion/ffprobe.py
+8 -7
View File
@@ -96,11 +96,11 @@ def extract_static_video_metadata(video_path : str) -> VideoMetadata:
def extract_video_metadata(video_path : str) -> VideoMetadata: def extract_video_metadata(video_path : str) -> VideoMetadata:
video_entries = probe_video_entries(video_path, [ 'width', 'height', 'r_frame_rate', 'color_transfer' ]) video_entries = probe_video_entries(video_path, [ 'width', 'height', 'avg_frame_rate', 'r_frame_rate', 'color_transfer' ])
format_entries = probe_format_entries(video_path, [ 'duration', 'bit_rate' ]) format_entries = probe_format_entries(video_path, [ 'duration', 'bit_rate' ])
duration = float(format_entries.get('duration')) duration = float(format_entries.get('duration'))
fps = extract_video_fps(video_entries.get('r_frame_rate')) fps = extract_video_fps(video_entries)
frame_total = round(duration * fps) frame_total = round(duration * fps)
width = int(video_entries.get('width')) width = int(video_entries.get('width'))
height = int(video_entries.get('height')) height = int(video_entries.get('height'))
@@ -120,11 +120,12 @@ def extract_video_metadata(video_path : str) -> VideoMetadata:
return video_metadata return video_metadata
def extract_video_fps(frame_rate : str) -> Fps: def extract_video_fps(video_entries : Dict[str, str]) -> Fps:
if frame_rate and '/' in frame_rate: for frame_rate in [ video_entries.get('avg_frame_rate'), video_entries.get('r_frame_rate') ]:
numerator, denominator = frame_rate.split('/') if frame_rate and '/' in frame_rate:
numerator, denominator = frame_rate.split('/')
if int(numerator) and int(denominator): if int(numerator) and int(denominator):
return int(numerator) / int(denominator) return int(numerator) / int(denominator)
return 0.0 return 0.0
facefusion/installer.py
+3 -3
View File
@@ -19,15 +19,15 @@ LOCALES =\
} }
ONNXRUNTIME_SET =\ ONNXRUNTIME_SET =\
{ {
'default': ('onnxruntime', '1.28.0') 'default': ('onnxruntime', '1.29.0')
} }
if is_windows() or is_linux(): if is_windows() or is_linux():
ONNXRUNTIME_SET['cuda@12'] = ('onnxruntime-gpu', '1.24.4') ONNXRUNTIME_SET['cuda@12'] = ('onnxruntime-gpu', '1.24.4')
ONNXRUNTIME_SET['cuda@13'] = ('onnxruntime-gpu', '1.28.0') ONNXRUNTIME_SET['cuda@13'] = ('onnxruntime-gpu', '1.29.0')
ONNXRUNTIME_SET['openvino'] = ('onnxruntime-openvino', '1.24.1') ONNXRUNTIME_SET['openvino'] = ('onnxruntime-openvino', '1.24.1')
if is_windows(): if is_windows():
ONNXRUNTIME_SET['directml'] = ('onnxruntime-directml', '1.24.4') ONNXRUNTIME_SET['directml'] = ('onnxruntime-directml', '1.24.4')
ONNXRUNTIME_SET['qnn'] = ('onnxruntime-qnn', '2.4.0') ONNXRUNTIME_SET['qnn'] = ('onnxruntime-qnn', '2.5.0')
if is_linux(): if is_linux():
ONNXRUNTIME_SET['migraphx'] = ('onnxruntime-migraphx', '1.27.1') ONNXRUNTIME_SET['migraphx'] = ('onnxruntime-migraphx', '1.27.1')
ONNXRUNTIME_SET['rocm'] = ('onnxruntime-rocm', '1.22.2.post3') ONNXRUNTIME_SET['rocm'] = ('onnxruntime-rocm', '1.22.2.post3')
requirements.txt
+1 -1
View File
@@ -1,6 +1,6 @@
numpy==2.4.6 numpy==2.4.6
onnx==1.22.0 onnx==1.22.0
onnxruntime==1.28.0 onnxruntime==1.29.0
opencv-python-headless==5.0.0.93 opencv-python-headless==5.0.0.93
psutil==7.2.2 psutil==7.2.2
python-multipart==0.0.28 python-multipart==0.0.28