mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-01-06 02:29:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

FF-388 - added opus

Browse Source
This commit is contained in:
john
2023-01-09 09:01:55 +13:00
parent f10f331c2e
commit f008934dfe
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioAddTrack.cs
View File

@@ -31,6 +31,7 @@ public class FfmpegBuilderAudioAddTrack : FfmpegBuilderNode
new ListOption { Label = "AC3", Value = "ac3"},
new ListOption { Label = "EAC3", Value = "eac3" },
new ListOption { Label = "MP3", Value = "mp3"},
new ListOption { Label = "OPUS", Value = "opus"},
};
}
return _CodecOptions;
@@ -203,6 +204,9 @@ public class FfmpegBuilderAudioAddTrack : FfmpegBuilderNode
internal static string[] GetNewAudioTrackParameters(string source, string codec, float channels, int bitrate)
{
if (codec == "opus")
codec = "libopus";
if (channels == 0)
{
// same as source

1
VideoNodes/FfmpegBuilderNodes/Audio/FfmpegBuilderAudioConvert.cs
View File

@@ -29,6 +29,7 @@ public class FfmpegBuilderAudioConverter : FfmpegBuilderNode
new ListOption { Label = "AC3", Value = "ac3"},
new ListOption { Label = "EAC3", Value = "eac3" },
new ListOption { Label = "MP3", Value = "mp3"},
new ListOption { Label = "OPUS", Value = "opus"},
};
}
return _CodecOptions;

45
VideoNodes/Tests/FfmpegBuilderTests/FfmpegBuilder_AudioConverterTests.cs
View File

@@ -8,16 +8,15 @@ using VideoNodes.Tests;
namespace FileFlows.VideoNodes.Tests.FfmpegBuilderTests;
[TestClass]
public class FfmpegBuilder_AudioConverterTests
public class FfmpegBuilder_AudioConverterTests: TestBase
{
VideoInfo vii;
NodeParameters args;
private void Prepare()
{
const string file = @"D:\videos\unprocessed\basic.mkv";
string file = Path.Combine(TestPath, "basic.mkv");
var logger = new TestLogger();
const string ffmpeg = @"C:\utils\ffmpeg\ffmpeg.exe";
var vi = new VideoInfoHelper(ffmpeg, logger);
var vi = new VideoInfoHelper(FfmpegPath, logger);
vii = vi.Read(file);
vii.AudioStreams = new List<AudioStream>
{
@@ -60,8 +59,8 @@ public class FfmpegBuilder_AudioConverterTests
}
};
args = new NodeParameters(file, logger, false, string.Empty);
args.GetToolPathActual = (string tool) => ffmpeg;
args.TempPath = @"D:\videos\temp";
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
args.Parameters.Add("VideoInfo", vii);
@@ -233,6 +232,40 @@ public class FfmpegBuilder_AudioConverterTests
// Assert.AreEqual("AAC", best.Codec);
// Assert.AreEqual(2f, best.Channels);
//}
[TestMethod]
public void FfmpegBuilder_AudioConverter_Opus_All()
{
string file = Path.Combine(TestPath, "basic.mkv");
var logger = new TestLogger();
var vi = new VideoInfoHelper(FfmpegPath, logger);
var vii = vi.Read(file);
var args = new NodeParameters(file, logger, false, string.Empty);
args.GetToolPathActual = (string tool) => FfmpegPath;
args.TempPath = TempPath;
args.Parameters.Add("VideoInfo", vii);
FfmpegBuilderStart ffStart = new();
ffStart.PreExecute(args);
Assert.AreEqual(1, ffStart.Execute(args));
FfmpegBuilderAudioConverter ffAudioConvert = new();
ffAudioConvert.Codec = "opus";
ffAudioConvert.PreExecute(args);
int result = ffAudioConvert.Execute(args);
Assert.AreEqual(1, result);
FfmpegBuilderExecutor ffExecutor = new();
ffExecutor.HardwareDecoding = true;
ffExecutor.PreExecute(args);
result = ffExecutor.Execute(args);
string log = logger.ToString();
Assert.AreEqual(1, result);
var newInfo = vi.Read(args.WorkingFile);
Assert.AreEqual("opus", newInfo.AudioStreams[0].Codec);
}
}
#endif