mirror of
https://github.com/rosenbjerg/FFMpegCore.git
synced 2025-12-16 11:05:44 +00:00
Compare commits
No commits in common. "cd258991bd528ee1e215ca126a0e9731a5247b29" and "0c467e3a0563f9a315d171553e1d5982b56c63ed" have entirely different histories.
cd258991bd
...
0c467e3a05
6 changed files with 11 additions and 9 deletions
|
|
@ -1 +1 @@
|
||||||
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
|
[assembly: Parallelize(Scope = ExecutionScope.ClassLevel)]
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ public class FFMpegArgumentProcessorTest
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZZZ_Processor_GlobalOptions_GetUsed()
|
public void Processor_GlobalOptions_GetUsed()
|
||||||
{
|
{
|
||||||
var globalWorkingDir = "Whatever";
|
var globalWorkingDir = "Whatever";
|
||||||
var processor = CreateArgumentProcessor();
|
var processor = CreateArgumentProcessor();
|
||||||
|
|
@ -43,7 +43,7 @@ public class FFMpegArgumentProcessorTest
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZZZ_Processor_Options_CanBeOverridden_And_Configured()
|
public void Processor_Options_CanBeOverridden_And_Configured()
|
||||||
{
|
{
|
||||||
var globalConfig = "Whatever";
|
var globalConfig = "Whatever";
|
||||||
|
|
||||||
|
|
@ -73,7 +73,7 @@ public class FFMpegArgumentProcessorTest
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZZZ_Options_Global_And_Session_Options_Can_Differ()
|
public void Options_Global_And_Session_Options_Can_Differ()
|
||||||
{
|
{
|
||||||
var globalWorkingDir = "Whatever";
|
var globalWorkingDir = "Whatever";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<Nullable>disable</Nullable>
|
<Nullable>disable</Nullable>
|
||||||
<LangVersion>default</LangVersion>
|
<LangVersion>default</LangVersion>
|
||||||
<OrderTestsByNameInClass>true</OrderTestsByNameInClass>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,15 @@ public class FFMpegOptionsTest
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void ZZZ_Options_Set_Programmatically()
|
public void Options_Set_Programmatically()
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GlobalFFOptions.Configure(new FFOptions { BinaryFolder = "Whatever" });
|
GlobalFFOptions.Configure(new FFOptions { BinaryFolder = "Whatever" });
|
||||||
Assert.AreEqual("Whatever", GlobalFFOptions.Current.BinaryFolder);
|
Assert.AreEqual(
|
||||||
|
"Whatever",
|
||||||
|
GlobalFFOptions.Current.BinaryFolder
|
||||||
|
);
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -824,6 +824,7 @@ public class VideoTest
|
||||||
using var outputFile = new TemporaryFile("out.mp4");
|
using var outputFile = new TemporaryFile("out.mp4");
|
||||||
var dataReceived = false;
|
var dataReceived = false;
|
||||||
|
|
||||||
|
GlobalFFOptions.Configure(opt => opt.Encoding = Encoding.UTF8);
|
||||||
var success = FFMpegArguments
|
var success = FFMpegArguments
|
||||||
.FromFileInput(TestResources.Mp4Video)
|
.FromFileInput(TestResources.Mp4Video)
|
||||||
.WithGlobalOptions(options => options
|
.WithGlobalOptions(options => options
|
||||||
|
|
@ -831,7 +832,6 @@ public class VideoTest
|
||||||
.OutputToFile(outputFile, false, opt => opt
|
.OutputToFile(outputFile, false, opt => opt
|
||||||
.WithDuration(TimeSpan.FromSeconds(2)))
|
.WithDuration(TimeSpan.FromSeconds(2)))
|
||||||
.NotifyOnError(_ => dataReceived = true)
|
.NotifyOnError(_ => dataReceived = true)
|
||||||
.Configure(opt => opt.Encoding = Encoding.UTF8)
|
|
||||||
.ProcessSynchronously();
|
.ProcessSynchronously();
|
||||||
|
|
||||||
Assert.IsTrue(dataReceived);
|
Assert.IsTrue(dataReceived);
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
{
|
{
|
||||||
"BinaryFolder": ""
|
"RootDirectory": ""
|
||||||
}
|
}
|
||||||
Loading…
Add table
Reference in a new issue