mirrors/facefusion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix audio handling and add test for 48000kHz audio

Browse Source
This commit is contained in:
Kazuki Nakai 2024-10-10 20:51:44 +09:00
parent aa6fc6dded
commit 4e4e432870
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
facefusion/ffmpeg.py
View File

@ -135,32 +135,31 @@ def read_audio_buffer(target_path : str, sample_rate : int, channel_total : int)
def restore_audio(target_path : str, output_path : str, output_video_fps : Fps) -> bool:
trim_frame_start = state_manager.get_item('trim_frame_start')
trim_frame_end = state_manager.get_item('trim_frame_end')
temp_file_path = get_temp_file_path(target_path)
commands = [ '-i', temp_file_path ]
trim_frame_start = state_manager.get_item('trim_frame_start')
trim_frame_end = state_manager.get_item('trim_frame_end')
audio_encoder = state_manager.get_item('output_audio_encoder') # {{ edit_1 }}
temp_file_path = get_temp_file_path(target_path)
commands = ['-i', temp_file_path]
if isinstance(trim_frame_start, int):
start_time = trim_frame_start / output_video_fps
commands.extend([ '-ss', str(start_time) ])
if isinstance(trim_frame_end, int):
end_time = trim_frame_end / output_video_fps
commands.extend([ '-to', str(end_time) ])
if isinstance(trim_frame_start, int):
start_time = trim_frame_start / output_video_fps
commands.extend(['-ss', str(start_time)])
if isinstance(trim_frame_end, int):
end_time = trim_frame_end / output_video_fps
commands.extend(['-to', str(end_time)])
audio_encoder = state_manager.get_item('output_audio_encoder') or 'aac'
commands.extend([
commands.extend([
'-i', target_path,
'-c:v', 'copy',
'-c:a', audio_encoder,
'-ar', '48000', # Sample rate set to 48 kHz
'-ar', '48000', # サンプルレートを48 kHzに設定
'-map', '0:v:0',
'-map', '1:a:0',
'-shortest',
'-y', output_path
])
])
return run_ffmpeg(commands).returncode == 0
return run_ffmpeg(commands).returncode == 0
def replace_audio(target_path : str, audio_path : str, output_path : str) -> bool:

5
tests/test_audio_48000kHz.py
View File

@ -15,8 +15,11 @@ class TestRestoreAudio(unittest.TestCase):
'output_audio_encoder': 'aac'
}.get(key)
# この行を追加して output_audio_encoder を設定
mock_state_manager.set_item('output_audio_encoder', 'aac') # {{ edit_1 }}
# Mocking get_temp_file_path to return a fake temp file path
mock_get_temp_file_path.return_value = '/fake/temp/path.mp4'
mock_get_temp_file_path.return_value = '/fake/temp/path.mp4'
# Mocking run_ffmpeg to return a mock process with a return code of 0 (success)
mock_process = MagicMock()