From 3d06a49a0c9755d79e53312eb2478358b478e932 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Fri, 28 Oct 2022 19:48:19 +0200 Subject: capture-pipeline: Differentiate source/output suffix Signed-off-by: Paul Kocialkowski --- capture-pipeline | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/capture-pipeline b/capture-pipeline index ea97041..e4f0d7d 100755 --- a/capture-pipeline +++ b/capture-pipeline @@ -67,8 +67,10 @@ def timecode_string(seconds): # audio -def audio_suffix(shot): - return "." + settings_item_entry(shot, "audio-extension") +def audio_source_suffix(shot): + extension = settings_item_entry(shot, "audio-extension") or settings_item_entry(shot, "audio-source-extension") + + return "." + extension def audio_source_base(sequence, shot): base = settings_item_entry(shot, "audio-source-path") @@ -80,7 +82,7 @@ def audio_source_base(sequence, shot): def audio_source_name(sequence, shot, take): base = audio_source_base(sequence, shot) - suffix = audio_suffix(shot) + suffix = audio_source_suffix(shot) name = shot_name(shot) index = 1 @@ -101,13 +103,18 @@ def audio_source_name(sequence, shot, take): def audio_source_path(sequence, shot, take): base = audio_source_base(sequence, shot) name = audio_source_name(sequence, shot, take) - suffix = audio_suffix(shot) + suffix = audio_source_suffix(shot) if name: return os.path.join(base, name + suffix) return None +def audio_output_suffix(shot): + extension = settings_item_entry(shot, "audio-extension") or settings_item_entry(shot, "audio-output-extension") + + return "." + extension + def audio_output_base(sequence, shot): base = settings_item_entry(shot, "audio-output-path") @@ -146,7 +153,7 @@ def audio_output_prepare(sequence, shot, take, part): def audio_output_path(sequence, shot, take, part): base = audio_output_base(sequence, shot) name = audio_output_name(sequence, shot, take, part) - suffix = audio_suffix(shot) + suffix = audio_output_suffix(shot) if name: if name in sequence["audio-registry"]: @@ -242,8 +249,10 @@ def audio_process(sequence, shot, take, part): # video -def video_suffix(shot): - return "." + settings_item_entry(shot, "video-extension") +def video_source_suffix(shot): + extension = settings_item_entry(shot, "video-extension") or settings_item_entry(shot, "video-source-extension") + + return "." + extension def video_source_base(sequence, shot): base = settings_item_entry(shot, "video-source-path") @@ -255,7 +264,7 @@ def video_source_base(sequence, shot): def video_source_name(sequence, shot, take): base = video_source_base(sequence, shot) - suffix = video_suffix(shot) + suffix = video_source_suffix(shot) name = shot_name(shot) index = 1 @@ -276,13 +285,18 @@ def video_source_name(sequence, shot, take): def video_source_path(sequence, shot, take): base = video_source_base(sequence, shot) name = video_source_name(sequence, shot, take) - suffix = video_suffix(shot) + suffix = video_source_suffix(shot) if name: return os.path.join(base, name + suffix) return None +def video_output_suffix(shot): + extension = settings_item_entry(shot, "video-extension") or settings_item_entry(shot, "video-output-extension") + + return "." + extension + def video_output_base(sequence, shot): base = settings_item_entry(shot, "video-output-path") @@ -321,7 +335,7 @@ def video_output_prepare(sequence, shot, take, part): def video_output_path(sequence, shot, take, part): base = video_output_base(sequence, shot) name = video_output_name(sequence, shot, take, part) - suffix = video_suffix(shot) + suffix = video_output_suffix(shot) if name: if name in sequence["video-registry"]: -- cgit v1.2.3