diff --git a/bin/ffx.py b/bin/ffx.py index 937bda9..3a0ac9c 100755 --- a/bin/ffx.py +++ b/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,17 +187,16 @@ 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: {' '.join(commandSequence)}") - print(f"Command Sequence: {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)