Merge branch 'main' of gitea.maveno.de:Javanaut/ffx
This commit is contained in:
15
bin/ffx.py
15
bin/ffx.py
@@ -169,6 +169,8 @@ for aStream in audioStreams:
|
||||
if channels == 6:
|
||||
audioTokens += [f"-c:a:{audioStreamIndex}",
|
||||
'libopus',
|
||||
f"-filter:a:{audioStreamIndex}",
|
||||
"channelmap=FL-FL|FR-FR|FC-FC|LFE-LFE|SL-BL|SR-BR:5.1",
|
||||
f"-b:a:{audioStreamIndex}",
|
||||
ac3Bandwidth]
|
||||
|
||||
@@ -185,16 +187,15 @@ for quality in qualities:
|
||||
|
||||
commandSequence = commandTokens + mappingTokens + generateAV1Tokens(quality, preset) + audioTokens
|
||||
|
||||
if cropStart:
|
||||
commandSequence += generateCropTokens(cropStart, cropLength)
|
||||
|
||||
if len(qualities) > 1:
|
||||
commandSequence += generateOutputTokens(outputFilename, quality)
|
||||
else:
|
||||
commandSequence += generateOutputTokens(outputFilename)
|
||||
|
||||
if cropStart:
|
||||
commandSequence += generateCropTokens(cropStart, cropLength)
|
||||
|
||||
|
||||
print(f"Command Sequence: {commandSequence}")
|
||||
print(f"Command: {' '.join(commandSequence)}")
|
||||
|
||||
executeProcess(commandSequence)
|
||||
|
||||
@@ -210,7 +211,7 @@ for quality in qualities:
|
||||
commandSequence1 += nullTokens
|
||||
|
||||
|
||||
print(f"Command Sequence 1: {commandSequence1}")
|
||||
print(f"Command 1: {' '.join(commandSequence1)}")
|
||||
|
||||
if os.path.exists(TEMP_FILE_NAME):
|
||||
os.remove(TEMP_FILE_NAME)
|
||||
@@ -230,7 +231,7 @@ for quality in qualities:
|
||||
commandSequence2 += generateOutputTokens(outputFilename)
|
||||
|
||||
|
||||
print(f"Command Sequence 2: {commandSequence2}")
|
||||
print(f"Command 2: {' '.join(commandSequence2)}")
|
||||
|
||||
executeProcess(commandSequence2)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user