kopia lustrzana https://github.com/corrscope/corrscope
Rename cfg.audio_path to master_audio
rodzic
648829b4d9
commit
3bc7fdf81d
|
@ -49,12 +49,12 @@ class _FFmpegCommand:
|
|||
self.ovgen_cfg = ovgen_cfg
|
||||
|
||||
self.templates += ffmpeg_input_video(ovgen_cfg) # video
|
||||
if self.ovgen_cfg.audio_path:
|
||||
self.templates += ffmpeg_input_audio(audio_path=ovgen_cfg.audio_path) # audio
|
||||
if self.ovgen_cfg.master_audio:
|
||||
self.templates += ffmpeg_input_audio(audio_path=ovgen_cfg.master_audio) # audio
|
||||
|
||||
def add_output(self, cfg: 'Union[FFmpegOutputConfig, FFplayOutputConfig]') -> None:
|
||||
self.templates.append(cfg.video_template) # video
|
||||
if self.ovgen_cfg.audio_path:
|
||||
if self.ovgen_cfg.master_audio:
|
||||
self.templates.append(cfg.audio_template) # audio
|
||||
|
||||
def popen(self, process_args=None, **kwargs) -> subprocess.Popen:
|
||||
|
|
|
@ -19,7 +19,7 @@ RENDER_PROFILING = True
|
|||
@register_config
|
||||
class Config:
|
||||
wave_dir: str
|
||||
audio_path: Optional[str]
|
||||
master_audio: Optional[str]
|
||||
fps: int
|
||||
|
||||
time_visible_ms: int
|
||||
|
@ -45,13 +45,13 @@ _FPS = 60 # f_s
|
|||
|
||||
@click.command()
|
||||
@click.argument('wave-dir', type=Folder)
|
||||
@click.option('--audio', '--audio-path', type=File, default=None)
|
||||
@click.option('--audio', '--master-audio', type=File, default=None)
|
||||
@click.option('--fps', default=_FPS)
|
||||
@click.option('--output', default='output.mp4')
|
||||
def main(wave_dir: str, audio_path: Optional[str], fps: int, output: str):
|
||||
def main(wave_dir: str, master_audio: Optional[str], fps: int, output: str):
|
||||
cfg = Config(
|
||||
wave_dir=wave_dir,
|
||||
audio_path=audio_path,
|
||||
master_audio=master_audio,
|
||||
fps=fps,
|
||||
|
||||
time_visible_ms=25,
|
||||
|
|
Ładowanie…
Reference in New Issue