Skip to content

Commit

Permalink
Merge pull request #12 from NationalLibraryOfNorway/beta-develop
Browse files Browse the repository at this point in the history
Update v0.9.3
  • Loading branch information
EmilJohan authored Jul 26, 2024
2 parents 94f96db + bf713f0 commit f11dbef
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/Build&Release.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
name: Build with PyInstaller and Create Release

on:
push:
branches:
- master
pull_request:
branches:
- master
Expand Down
10 changes: 8 additions & 2 deletions Smelt.py
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,10 @@ def handle_audio_operations(self):
Handle audio processing operations.
"""
self.construct_audio_commands()
self.execute_ffmpeg_commands(['ffmpeg_lossless_audio_cmd', 'ffmpeg_audio_cmd'])
if self.mezzaninfilCheckBox.isChecked():
self.execute_ffmpeg_commands(['ffmpeg_lossless_audio_cmd', 'ffmpeg_audio_cmd'])
else:
self.execute_ffmpeg_commands(['ffmpeg_audio_cmd'])

def construct_dpx_commands(self):
"""
Expand Down Expand Up @@ -885,6 +888,9 @@ def construct_dpx_commands(self):
"""
base_filename = os.path.basename(self.images_path)
prefix = re.match(r'^\D*', base_filename).group()

start_number = extract_number(self.images_path)

ffmpeg_input_pattern = os.path.join(self.folder_path, '{}%06d.dpx'.format(prefix))

self.ffmpeg_base = [
Expand All @@ -897,7 +903,7 @@ def construct_dpx_commands(self):
'-f', 'image2',
'-vsync', '0',
'-framerate', self.fps,
'-start_number', '0',
'-start_number', str(start_number),
'-i', ffmpeg_input_pattern,
]

Expand Down

0 comments on commit f11dbef

Please sign in to comment.