mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2025-12-30 17:29:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

FF-1018 - added variable bitrate to mp3/ogg/aac in "Convert Audio" node

Browse Source
This commit is contained in:
John Andrews
2023-07-26 17:39:19 +12:00
parent 300d4b7350
commit 9fa599594b
3 changed files with 202 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AudioNodes/AudioNodes.en.json
View File

@@ -22,6 +22,12 @@
"Fields": {
"Bitrate": "Bitrate",
"Bitrate-Help": "The bitrate for the new file, the higher the bitrate the better the quality but larger the file.",
"BitrateAac": "Bitrate",
"BitrateAac-Help": "The bitrate for the new file, the higher the bitrate the better the quality but larger the file.",
"BitrateMp3": "Bitrate",
"BitrateMp3-Help": "The bitrate for the new file, the higher the bitrate the better the quality but larger the file.",
"BitrateOgg": "Bitrate",
"BitrateOgg-Help": "The bitrate for the new file, the higher the bitrate the better the quality but larger the file.",
"Codec": "Codec",
"Codec-Help": "The audio codec to convert the file into.",
"Normalize": "Normalize",

194
AudioNodes/Nodes/ConvertNode.cs
View File

@@ -1,5 +1,6 @@
using FileFlows.Plugin;
using FileFlows.Plugin.Attributes;
using TagLib.Gif;
namespace FileFlows.AudioNodes
{
@@ -178,7 +179,51 @@ namespace FileFlows.AudioNodes
_ => Codec.ToLower()
};
if (Bitrate == 0)
int bitrate = Bitrate;
if (Codec == "mp3")
{
bitrate = BitrateMp3 ?? Bitrate;
if (bitrate is >= 10 and <= 20)
{
return new List<string>
{
"-c:a",
codec,
"-qscale:a",
(bitrate - 10).ToString()
};
}
}
else if (Codec == "ogg")
{
bitrate = BitrateOgg ?? Bitrate;
if (bitrate is >= 9 and <= 20)
{
return new List<string>
{
"-c:a",
codec,
"-qscale:a",
(bitrate - 10).ToString()
};
}
}
else if (Codec == "aac")
{
bitrate = BitrateAac ?? Bitrate;
if (bitrate is >= 11 and <= 15)
{
return new List<string>
{
"-c:a",
"libfdk_aac",
"-vbr",
(bitrate - 10).ToString()
};
}
}
if (bitrate == 0)
{
// automatic
return new List<string>
@@ -193,7 +238,7 @@ namespace FileFlows.AudioNodes
"-c:a",
codec,
"-ab",
(Bitrate == -1 ? GetSourceBitrate(args).ToString() : Bitrate + "k")
(bitrate == -1 ? GetSourceBitrate(args).ToString() : bitrate + "k")
};
}
@@ -266,7 +311,20 @@ namespace FileFlows.AudioNodes
public override FlowElementType Type => FlowElementType.Process;
[Select(nameof(BitrateOptions), 1)]
[ConditionEquals(nameof(Codec), "wav")]
public int Bitrate { get; set; }
[Select(nameof(BitrateOptionsAac), 1)]
[ConditionEquals(nameof(Codec), "aac")]
public int? BitrateAac { get; set; }
[Select(nameof(BitrateOptionsMp3), 1)]
[ConditionEquals(nameof(Codec), "MP3")]
public int? BitrateMp3 { get; set; }
[Select(nameof(BitrateOptionsOgg), 1)]
[ConditionEquals(nameof(Codec), "ogg")]
public int? BitrateOgg { get; set; }
[Boolean(3)]
public bool Normalize { get; set; }
@@ -296,7 +354,128 @@ namespace FileFlows.AudioNodes
return _BitrateOptions;
}
}
private static List<ListOption> _BitrateOptionsMp3;
public static List<ListOption> BitrateOptionsMp3
{
get
{
if (_BitrateOptionsMp3 == null)
{
_BitrateOptionsMp3 = new List<ListOption>
{
new () { Label = "Automatic", Value = 0 },
new () { Label = "Same as source", Value = -1 },
new () { Label = "Constant Bitrate", Value = "###GROUP###" },
new () { Label = "64 Kbps", Value = 64},
new () { Label = "96 Kbps", Value = 96},
new () { Label = "128 Kbps", Value = 128},
new () { Label = "160 Kbps", Value = 160},
new () { Label = "192 Kbps", Value = 192},
new () { Label = "224 Kbps", Value = 224},
new () { Label = "256 Kbps", Value = 256},
new () { Label = "288 Kbps", Value = 288},
new () { Label = "320 Kbps", Value = 320},
new () { Label = "Variable Bitrate", Value = "###GROUP###" },
new () { Label = "0 (High Quality)", Value = 10},
new () { Label = "1", Value = 11},
new () { Label = "2", Value = 12},
new () { Label = "3", Value = 13},
new () { Label = "4 (Good Quality)", Value = 14},
new () { Label = "5", Value = 15},
new () { Label = "6", Value = 16},
new () { Label = "7", Value = 17},
new () { Label = "8", Value = 18},
new () { Label = "9 (Low Quality", Value = 19},
};
}
return _BitrateOptionsMp3;
}
}
private static List<ListOption> _BitrateOptionsAac;
public static List<ListOption> BitrateOptionsAac
{
get
{
if (_BitrateOptionsAac == null)
{
_BitrateOptionsAac = new List<ListOption>
{
new () { Label = "Automatic", Value = 0 },
new () { Label = "Same as source", Value = -1 },
new () { Label = "Constant Bitrate", Value = "###GROUP###" },
new () { Label = "64 Kbps", Value = 64},
new () { Label = "96 Kbps", Value = 96},
new () { Label = "128 Kbps", Value = 128},
new () { Label = "160 Kbps", Value = 160},
new () { Label = "192 Kbps", Value = 192},
new () { Label = "224 Kbps", Value = 224},
new () { Label = "256 Kbps", Value = 256},
new () { Label = "288 Kbps", Value = 288},
new () { Label = "320 Kbps", Value = 320},
new () { Label = "Variable Bitrate", Value = "###GROUP###" },
new () { Label = "1 (Low Quality)", Value = 11},
new () { Label = "2", Value = 12},
new () { Label = "3", Value = 13},
new () { Label = "4", Value = 14},
new () { Label = "5 (High Quality)", Value = 15}
};
}
return _BitrateOptionsAac;
}
}
private static List<ListOption> _BitrateOptionsOgg;
public static List<ListOption> BitrateOptionsOgg
{
get
{
if (_BitrateOptionsOgg == null)
{
_BitrateOptionsOgg = new List<ListOption>
{
new () { Label = "Automatic", Value = 0 },
new () { Label = "Same as source", Value = -1 },
new () { Label = "Constant Bitrate", Value = "###GROUP###" },
new () { Label = "64 Kbps", Value = 64},
new () { Label = "96 Kbps", Value = 96},
new () { Label = "128 Kbps", Value = 128},
new () { Label = "160 Kbps", Value = 160},
new () { Label = "192 Kbps", Value = 192},
new () { Label = "224 Kbps", Value = 224},
new () { Label = "256 Kbps", Value = 256},
new () { Label = "288 Kbps", Value = 288},
new () { Label = "320 Kbps", Value = 320},
new () { Label = "Variable Bitrate", Value = "###GROUP###" },
new () { Label = "-1 (Low Quality)", Value = 9},
new () { Label = "0", Value = 10},
new () { Label = "1", Value = 11},
new () { Label = "2", Value = 12},
new () { Label = "3 (Good Quality)", Value = 13},
new () { Label = "4", Value = 14},
new () { Label = "5", Value = 15},
new () { Label = "6", Value = 16},
new () { Label = "7", Value = 17},
new () { Label = "8", Value = 18},
new () { Label = "9", Value = 19},
new () { Label = "10 (Highest Quality", Value = 20},
};
}
return _BitrateOptionsOgg;
}
}
public override int Execute(NodeParameters args)
{
@@ -307,12 +486,11 @@ namespace FileFlows.AudioNodes
//AudioInfo AudioInfo = GetAudioInfo(args);
//if (AudioInfo == null)
// return -1;
if (Bitrate != 0 && Bitrate != -1 && (Bitrate < 64 || Bitrate > 320))
{
args.Logger?.ILog("Bitrate not set or invalid, setting to 192kbps");
Bitrate = 192;
}
// if (Bitrate != 0 && Bitrate != -1 && (Bitrate < 64 || Bitrate > 320))
// {
// args.Logger?.ILog("Bitrate not set or invalid, setting to 192kbps");
// Bitrate = 192;
// }

16
AudioNodes/Tests/ConvertTests.cs
View File

@@ -17,16 +17,20 @@ namespace FileFlows.AudioNodes.Tests
[TestMethod]
public void Convert_FlacToAac()
{
const string file = @"/home/john/Music/Aquarium (1997)/Aqua - Aquarium - 03 - Barbie Girl.flac";
const string file = @"D:\music\unprocessed\01-billy_joel-you_may_be_right.flac";
ConvertToAAC node = new ();
var args = new FileFlows.Plugin.NodeParameters(file, new TestLogger(), false, string.Empty);
args.GetToolPathActual = (string tool) => @"C:\utils\ffmpeg\ffmpeg.exe";
args.TempPath = @"D:\music\temp";
var logger = new TestLogger();
ConvertAudio node = new ();
node.Codec = "ogg";
node.BitrateOgg = null;
node.Bitrate = 128;
var args = new FileFlows.Plugin.NodeParameters(file, logger, false, string.Empty);
args.GetToolPathActual = (string tool) => @"/usr/bin/ffmpeg";
args.TempPath = @"/home/john/temp";
new AudioFile().Execute(args); // need to read the Audio info and set it
int output = node.Execute(args);
var log = logger.ToString();
Assert.AreEqual(1, output);
}