Alex/FFMpegCore
1
0
Fork 0
mirror of https://github.com/rosenbjerg/FFMpegCore.git synced 2024-11-10 08:34:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

More cleanup

Browse source
This commit is contained in:
Malte Rosenbjerg 2020-02-12 20:45:16 +01:00
parent 8ee92a40ab
commit ecf7a711f4
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FFMpegCore.Test/ArgumentBuilderTest.cs
View file

@ -53,7 +53,7 @@ public void Builder_BuildString_Scale()
public void Builder_BuildString_AudioCodec() public void Builder_BuildString_AudioCodec()
{ {
var str = GetArgumentsString(new AudioCodecArgument(AudioCodec.Aac, AudioQuality.Normal)); var str = GetArgumentsString(new AudioCodecArgument(AudioCodec.Aac, AudioQuality.Normal));
Assert.AreEqual(str, "-i \"input.mp4\" -codec:a aac -b:a 128k -strict experimental \"output.mp4\""); Assert.AreEqual(str, "-i \"input.mp4\" -c:a aac -b:a 128k \"output.mp4\"");
} }
[TestMethod] [TestMethod]
@ -204,7 +204,7 @@ public void Builder_BuildString_Codec()
{ {
var str = GetArgumentsString(new VideoCodecArgument(VideoCodec.LibX264)); var str = GetArgumentsString(new VideoCodecArgument(VideoCodec.LibX264));
Assert.AreEqual(str, "-i \"input.mp4\" -codec:v libx264 -pix_fmt yuv420p \"output.mp4\""); Assert.AreEqual(str, "-i \"input.mp4\" -c:v libx264 -pix_fmt yuv420p \"output.mp4\"");
} }
[TestMethod] [TestMethod]
@ -212,7 +212,7 @@ public void Builder_BuildString_Codec_Override()
{ {
var str = GetArgumentsString(new VideoCodecArgument(VideoCodec.LibX264), new OverrideArgument()); var str = GetArgumentsString(new VideoCodecArgument(VideoCodec.LibX264), new OverrideArgument());
Assert.AreEqual(str, "-i \"input.mp4\" -codec:v libx264 -pix_fmt yuv420p -y \"output.mp4\""); Assert.AreEqual(str, "-i \"input.mp4\" -c:v libx264 -pix_fmt yuv420p -y \"output.mp4\"");
} }
[TestMethod] [TestMethod]

6
FFMpegCore/FFMPEG/Argument/ArgumentStringifier.cs
View file

@ -24,7 +24,7 @@ internal static string Audio(AudioCodec codec, int bitrate)
internal static string Audio(AudioCodec codec) internal static string Audio(AudioCodec codec)
{ {
return $"-codec:a {codec.ToString().ToLower()} "; return $"-c:a {codec.ToString().ToLower()} ";
} }
internal static string Audio(AudioQuality bitrate) internal static string Audio(AudioQuality bitrate)
@ -34,12 +34,12 @@ internal static string Audio(AudioQuality bitrate)
internal static string Audio(int bitrate) internal static string Audio(int bitrate)
{ {
return $"-b:a {bitrate}k -strict experimental "; return $"-b:a {bitrate}k ";
} }
internal static string Video(VideoCodec codec, int bitrate = 0) internal static string Video(VideoCodec codec, int bitrate = 0)
{ {
var video = $"-codec:v {codec.ToString().ToLower()} -pix_fmt yuv420p "; var video = $"-c:v {codec.ToString().ToLower()} -pix_fmt yuv420p ";
if (bitrate > 0) if (bitrate > 0)
{ {

18
FFMpegCore/FFMPEG/FFMpeg.cs
View file

@ -99,11 +99,9 @@ public Bitmap Snapshot(VideoInfo source, FileInfo output, Size? size = null, Tim
Bitmap result; Bitmap result;
using (var bmp = (Bitmap) Image.FromFile(output.FullName)) using (var bmp = (Bitmap) Image.FromFile(output.FullName))
{ {
using (var ms = new MemoryStream()) using var ms = new MemoryStream();
{ bmp.Save(ms, ImageFormat.Png);
bmp.Save(ms, ImageFormat.Png); result = new Bitmap(ms);
result = new Bitmap(ms);
}
} }
if (output.Exists && !persistSnapshotOnFileSystem) if (output.Exists && !persistSnapshotOnFileSystem)
@ -499,13 +497,13 @@ private bool RunProcess(ArgumentContainer container, FileInfo output)
Process.Close(); Process.Close();
if (File.Exists(output.FullName)) if (File.Exists(output.FullName))
using (var file = File.Open(output.FullName, FileMode.Open)) {
using var file = File.Open(output.FullName, FileMode.Open);
if (file.Length == 0)
{ {
if (file.Length == 0) throw new FFMpegException(FFMpegExceptionType.Process, _errorOutput);
{
throw new FFMpegException(FFMpegExceptionType.Process, _errorOutput);
}
} }
}
else else
{ {
throw new FFMpegException(FFMpegExceptionType.Process, _errorOutput); throw new FFMpegException(FFMpegExceptionType.Process, _errorOutput);

2
FFMpegCore/FFMpegCore.csproj
View file

@ -129,7 +129,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Instances" Version="1.1.0" /> <PackageReference Include="Instances" Version="1.2.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="RunProcessAsTask" Version="1.2.4" /> <PackageReference Include="RunProcessAsTask" Version="1.2.4" />