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

Init

Browse source
This commit is contained in:
Malte Rosenbjerg 2020-12-03 20:47:20 +01:00
parent 96e0a03630
commit 8b45a6b680
10 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
FFMpegCore.Test/VideoTest.cs
View file

@ -312,6 +312,23 @@ await FFMpegArguments
.ProcessAsynchronously();
});
}
[TestMethod, Timeout(10000)]
public void Video_StreamFile_OutputToMemoryStream()
{
// using var input = File.OpenRead(VideoLibrary.LocalVideo.FullName);
var output = new MemoryStream();
FFMpegArguments
// .FromFileInput(VideoLibrary.LocalVideo.FullName)
.FromPipeInput(new StreamPipeSource(File.OpenRead(VideoLibrary.LocalVideoWebm.FullName)), options => options.ForceFormat("webm"))
.OutputToPipe(new StreamPipeSink(output), options => options
.ForceFormat("mp4"))
.ProcessSynchronously();
output.Position = 0;
var result = FFProbe.Analyse(output);
Console.WriteLine(result.Duration);
}
[TestMethod, Timeout(10000)]
public void Video_ToMP4_Args_StreamOutputPipe_Failure()

3
FFMpegCore/FFMpeg/Arguments/InputPipeArgument.cs
View file

@ -17,7 +17,7 @@ public InputPipeArgument(IPipeSource writer) : base(PipeDirection.Out)
Writer = writer;
}
public override string Text => $"-y {Writer.GetFormat()} -i \"{PipePath}\"";
public override string Text => $"{(!string.IsNullOrEmpty(Writer.Format) ? $"-f {Writer.Format} " : string.Empty)}-i \"{PipePath}\"";
protected override async Task ProcessDataAsync(CancellationToken token)
{
@ -25,6 +25,7 @@ protected override async Task ProcessDataAsync(CancellationToken token)
if (!Pipe.IsConnected)
throw new TaskCanceledException();
await Writer.WriteAsync(Pipe, token).ConfigureAwait(false);
Pipe.Disconnect();
}
}
}

1
FFMpegCore/FFMpeg/Arguments/OutputPipeArgument.cs
View file

@ -22,6 +22,7 @@ protected override async Task ProcessDataAsync(CancellationToken token)
if (!Pipe.IsConnected)
throw new TaskCanceledException();
await Reader.ReadAsync(Pipe, token).ConfigureAwait(false);
Pipe.Disconnect();
}
}
}

1
FFMpegCore/FFMpeg/Arguments/PipeArgument.cs
View file

@ -43,7 +43,6 @@ public async Task During(CancellationToken cancellationToken = default)
catch (TaskCanceledException)
{
}
Pipe.Disconnect();
}
protected abstract Task ProcessDataAsync(CancellationToken token);

8
FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs
View file

@ -65,8 +65,8 @@ void OnCancelEvent(object sender, EventArgs args)
{
errorCode = t.Result;
cancellationTokenSource.Cancel();
_ffMpegArguments.Post();
}), _ffMpegArguments.During(cancellationTokenSource.Token));
// _ffMpegArguments.Post();
}), _ffMpegArguments.During(cancellationTokenSource.Token).ContinueWith(t => _ffMpegArguments.Post()));
}
catch (Exception e)
{
@ -111,8 +111,8 @@ await Task.WhenAll(instance.FinishedRunning().ContinueWith(t =>
{
errorCode = t.Result;
cancellationTokenSource.Cancel();
_ffMpegArguments.Post();
}), _ffMpegArguments.During(cancellationTokenSource.Token)).ConfigureAwait(false);
// _ffMpegArguments.Post();
}), _ffMpegArguments.During(cancellationTokenSource.Token).ContinueWith(t => _ffMpegArguments.Post())).ConfigureAwait(false);
}
catch (Exception e)
{

2
FFMpegCore/FFMpeg/Pipes/IPipeSource.cs
View file

@ -8,7 +8,7 @@ namespace FFMpegCore.Pipes
/// </summary>
public interface IPipeSource
{
string GetFormat();
string Format { get; }
Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken);
}
}

11
FFMpegCore/FFMpeg/Pipes/RawVideoPipeSource.cs
View file

@ -11,9 +11,10 @@ namespace FFMpegCore.Pipes
/// </summary>
public class RawVideoPipeSource : IPipeSource
{
public string StreamFormat { get; private set; } = null!;
public int Width { get; private set; }
public int Height { get; private set; }
public string Format { get; private set; }
public int FrameRate { get; set; } = 25;
private bool _formatInitialized;
private readonly IEnumerator<IVideoFrame> _framesEnumerator;
@ -35,14 +36,14 @@ public string GetFormat()
if (!_framesEnumerator.MoveNext())
throw new InvalidOperationException("Enumerator is empty, unable to get frame");
}
StreamFormat = _framesEnumerator.Current!.Format;
Format = _framesEnumerator.Current!.Format;
Width = _framesEnumerator.Current!.Width;
Height = _framesEnumerator.Current!.Height;
_formatInitialized = true;
}
return $"-f rawvideo -r {FrameRate} -pix_fmt {StreamFormat} -s {Width}x{Height}";
return $"-f rawvideo -r {FrameRate} -pix_fmt {Format} -s {Width}x{Height}";
}
public async Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken)
@ -62,10 +63,10 @@ public async Task WriteAsync(System.IO.Stream outputStream, CancellationToken ca
private void CheckFrameAndThrow(IVideoFrame frame)
{
if (frame.Width != Width || frame.Height != Height || frame.Format != StreamFormat)
if (frame.Width != Width || frame.Height != Height || frame.Format != Format)
throw new FFMpegException(FFMpegExceptionType.Operation, "Video frame is not the same format as created raw video stream\r\n" +
$"Frame format: {frame.Width}x{frame.Height} pix_fmt: {frame.Format}\r\n" +
$"Stream format: {Width}x{Height} pix_fmt: {StreamFormat}");
$"Stream format: {Width}x{Height} pix_fmt: {Format}");
}
}
}

6
FFMpegCore/FFMpeg/Pipes/StreamPipeSource.cs
View file

@ -10,15 +10,13 @@ public class StreamPipeSource : IPipeSource
{
public System.IO.Stream Source { get; }
public int BlockSize { get; } = 4096;
public string StreamFormat { get; } = string.Empty;
public string Format { get; }
public StreamPipeSource(System.IO.Stream source)
{
Source = source;
}
public Task WriteAsync(System.IO.Stream outputStream, CancellationToken cancellationToken) => Source.CopyToAsync(outputStream, BlockSize, cancellationToken);
public string GetFormat() => StreamFormat;
}
}

2
FFMpegCore/FFMpegCore.csproj.DotSettings Normal file
View file

@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/CodeInspection/NamespaceProvider/NamespaceFoldersToSkip/=ffmpeg/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

2
FFMpegCore/FFProbe/FFProbe.cs
View file

@ -106,7 +106,7 @@ private static Instance PrepareInstance(string filePath, int outputCapacity)
{
FFProbeHelper.RootExceptionCheck();
FFProbeHelper.VerifyFFProbeExists();
var arguments = $"-print_format json -show_format -sexagesimal -show_streams \"{filePath}\"";
var arguments = $"-loglevel error -print_format json -show_format -sexagesimal -show_streams \"{filePath}\"";
var instance = new Instance(FFMpegOptions.Options.FFProbeBinary(), arguments) {DataBufferCapacity = outputCapacity};
return instance;
}