Industry leading face manipulation platform
Undo non-fixes
henryruhs48aaba278645
diff --git a/facefusion/ffmpeg.py b/facefusion/ffmpeg.pyindex 928bc327..46cce236 100644--- a/facefusion/ffmpeg.py+++ b/facefusion/ffmpeg.py@@ -160,7 +160,6 @@ def restore_audio(target_path : str, output_path : str, trim_frame_start : int,output_audio_encoder = state_manager.get_item('output_audio_encoder')output_audio_quality = state_manager.get_item('output_audio_quality')output_audio_volume = state_manager.get_item('output_audio_volume')- output_video_encoder = state_manager.get_item('output_video_encoder')target_video_fps = detect_video_fps(target_path)temp_file_path = get_temp_file_path(target_path)temp_video_duration = detect_video_duration(temp_file_path)@@ -169,10 +168,10 @@ def restore_audio(target_path : str, output_path : str, trim_frame_start : int,ffmpeg_builder.set_input(temp_file_path),ffmpeg_builder.select_media_range(trim_frame_start, trim_frame_end, target_video_fps),ffmpeg_builder.set_input(target_path),+ ffmpeg_builder.copy_video_encoder(),ffmpeg_builder.set_audio_encoder(output_audio_encoder),ffmpeg_builder.set_audio_quality(output_audio_encoder, output_audio_quality),ffmpeg_builder.set_audio_volume(output_audio_volume),- ffmpeg_builder.set_video_encoder(output_video_encoder),ffmpeg_builder.select_media_stream('0:v:0'),ffmpeg_builder.select_media_stream('1:a:0'),ffmpeg_builder.set_video_duration(temp_video_duration),@@ -185,17 +184,16 @@ def replace_audio(target_path : str, audio_path : str, output_path : str) -> boooutput_audio_encoder = state_manager.get_item('output_audio_encoder')output_audio_quality = state_manager.get_item('output_audio_quality')output_audio_volume = state_manager.get_item('output_audio_volume')- output_video_encoder = state_manager.get_item('output_video_encoder')temp_file_path = get_temp_file_path(target_path)temp_video_duration = detect_video_duration(temp_file_path)commands = ffmpeg_builder.chain(ffmpeg_builder.set_input(temp_file_path),ffmpeg_builder.set_input(audio_path),+ ffmpeg_builder.copy_video_encoder(),ffmpeg_builder.set_audio_encoder(output_audio_encoder),ffmpeg_builder.set_audio_quality(output_audio_encoder, output_audio_quality),ffmpeg_builder.set_audio_volume(output_audio_volume),- ffmpeg_builder.set_video_encoder(output_video_encoder),ffmpeg_builder.set_video_duration(temp_video_duration),ffmpeg_builder.force_output(output_path))diff --git a/tests/test_ffmpeg.py b/tests/test_ffmpeg.pyindex d75c3c81..814b08e8 100644--- a/tests/test_ffmpeg.py+++ b/tests/test_ffmpeg.py@@ -31,7 +31,6 @@ def before_all() -> None:state_manager.init_item('output_audio_encoder', 'aac')state_manager.init_item('output_audio_quality', 80)state_manager.init_item('output_audio_volume', 100)- state_manager.init_item('output_video_encoder', 'libx264')@pytest.fixture(scope = 'function', autouse = True)