mirror of
https://github.com/rosenbjerg/FFMpegCore.git
synced 2024-11-10 08:34:12 +01:00
Snapshot improvements
completely in-memory is now possible
Former-commit-id: ca89cac2f0
This commit is contained in:
parent
aadcb6b5e1
commit
18cb87559d
2 changed files with 61 additions and 42 deletions
|
@ -3,6 +3,7 @@
|
|||
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Imaging;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
|
@ -427,7 +428,7 @@ public void Video_ToOGV_MultiThread()
|
|||
}
|
||||
|
||||
[TestMethod]
|
||||
public void Video_Snapshot()
|
||||
public void Video_Snapshot_InMemory()
|
||||
{
|
||||
var output = Input.OutputLocation(ImageType.Png);
|
||||
|
||||
|
@ -435,7 +436,7 @@ public void Video_Snapshot()
|
|||
{
|
||||
var input = FFProbe.Analyse(Input.FullName);
|
||||
|
||||
using var bitmap = FFMpeg.Snapshot(input, output);
|
||||
using var bitmap = FFMpeg.Snapshot(input);
|
||||
Assert.AreEqual(input.PrimaryVideoStream.Width, bitmap.Width);
|
||||
Assert.AreEqual(input.PrimaryVideoStream.Height, bitmap.Height);
|
||||
Assert.AreEqual(bitmap.RawFormat, ImageFormat.Png);
|
||||
|
@ -455,11 +456,12 @@ public void Video_Snapshot_PersistSnapshot()
|
|||
{
|
||||
var input = FFProbe.Analyse(Input.FullName);
|
||||
|
||||
using var bitmap = FFMpeg.Snapshot(input, output, persistSnapshotOnFileSystem: true);
|
||||
FFMpeg.Snapshot(input, output);
|
||||
|
||||
var bitmap = Image.FromFile(output);
|
||||
Assert.AreEqual(input.PrimaryVideoStream.Width, bitmap.Width);
|
||||
Assert.AreEqual(input.PrimaryVideoStream.Height, bitmap.Height);
|
||||
Assert.AreEqual(bitmap.RawFormat, ImageFormat.Png);
|
||||
Assert.IsTrue(File.Exists(output));
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
|
|
@ -7,29 +7,68 @@
|
|||
using FFMpegCore.Enums;
|
||||
using FFMpegCore.Exceptions;
|
||||
using FFMpegCore.Helpers;
|
||||
using FFMpegCore.Pipes;
|
||||
|
||||
namespace FFMpegCore
|
||||
{
|
||||
public static class FFMpeg
|
||||
{
|
||||
/// <summary>
|
||||
/// Saves a 'png' thumbnail from the input video.
|
||||
/// Saves a 'png' thumbnail from the input video to drive
|
||||
/// </summary>
|
||||
/// <param name="source">Source video file.</param>
|
||||
/// <param name="output">Output video file</param>
|
||||
/// <param name="source">Source video analysis</param>
|
||||
/// <param name="output">Output video file path</param>
|
||||
/// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
|
||||
/// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
|
||||
/// <param name="persistSnapshotOnFileSystem">By default, it deletes the created image on disk. If set to true, it won't delete the image</param>
|
||||
/// <returns>Bitmap with the requested snapshot.</returns>
|
||||
public static Bitmap Snapshot(MediaAnalysis source, string output, Size? size = null, TimeSpan? captureTime = null,
|
||||
bool persistSnapshotOnFileSystem = false)
|
||||
public static bool Snapshot(MediaAnalysis source, string output, Size? size = null, TimeSpan? captureTime = null)
|
||||
{
|
||||
if (captureTime == null)
|
||||
captureTime = TimeSpan.FromSeconds(source.Duration.TotalSeconds / 3);
|
||||
captureTime ??= TimeSpan.FromSeconds(source.Duration.TotalSeconds / 3);
|
||||
|
||||
if (Path.GetExtension(output) != FileExtension.Png)
|
||||
output = Path.GetFileNameWithoutExtension(output) + FileExtension.Png;
|
||||
|
||||
size = PrepareSnapshotSize(source, size);
|
||||
|
||||
return FFMpegArguments
|
||||
.FromInputFiles(source.Path)
|
||||
.WithVideoCodec(VideoCodec.Png)
|
||||
.WithFrameOutputCount(1)
|
||||
.Resize(size)
|
||||
.Seek(captureTime)
|
||||
.OutputToFile(output)
|
||||
.ProcessSynchronously();
|
||||
}
|
||||
/// <summary>
|
||||
/// Saves a 'png' thumbnail to an in-memory bitmap
|
||||
/// </summary>
|
||||
/// <param name="source">Source video file.</param>
|
||||
/// <param name="captureTime">Seek position where the thumbnail should be taken.</param>
|
||||
/// <param name="size">Thumbnail size. If width or height equal 0, the other will be computed automatically.</param>
|
||||
/// <returns>Bitmap with the requested snapshot.</returns>
|
||||
public static Bitmap Snapshot(MediaAnalysis source, Size? size = null, TimeSpan? captureTime = null)
|
||||
{
|
||||
captureTime ??= TimeSpan.FromSeconds(source.Duration.TotalSeconds / 3);
|
||||
|
||||
size = PrepareSnapshotSize(source, size);
|
||||
|
||||
using var ms = new MemoryStream();
|
||||
FFMpegArguments
|
||||
.FromInputFiles(source.Path)
|
||||
.WithVideoCodec(VideoCodec.Png)
|
||||
.WithFrameOutputCount(1)
|
||||
.Resize(size)
|
||||
.Seek(captureTime)
|
||||
.ForceFormat("rawvideo")
|
||||
.OutputToPipe(new StreamPipeDataReader(ms))
|
||||
.ProcessSynchronously();
|
||||
|
||||
ms.Position = 0;
|
||||
return new Bitmap(ms);
|
||||
}
|
||||
|
||||
private static Size? PrepareSnapshotSize(MediaAnalysis source, Size? size)
|
||||
{
|
||||
if (size == null || (size.Value.Height == 0 && size.Value.Width == 0))
|
||||
size = new Size(source.PrimaryVideoStream.Width, source.PrimaryVideoStream.Height);
|
||||
|
||||
|
@ -39,42 +78,20 @@ public static Bitmap Snapshot(MediaAnalysis source, string output, Size? size =
|
|||
{
|
||||
var ratio = source.PrimaryVideoStream.Width / (double) size.Value.Width;
|
||||
|
||||
size = new Size((int)(source.PrimaryVideoStream.Width * ratio), (int)(source.PrimaryVideoStream.Height * ratio));
|
||||
size = new Size((int) (source.PrimaryVideoStream.Width * ratio),
|
||||
(int) (source.PrimaryVideoStream.Height * ratio));
|
||||
}
|
||||
|
||||
if (size.Value.Height == 0)
|
||||
{
|
||||
var ratio = source.PrimaryVideoStream.Height / (double) size.Value.Height;
|
||||
|
||||
size = new Size((int)(source.PrimaryVideoStream.Width * ratio), (int)(source.PrimaryVideoStream.Height * ratio));
|
||||
size = new Size((int) (source.PrimaryVideoStream.Width * ratio),
|
||||
(int) (source.PrimaryVideoStream.Height * ratio));
|
||||
}
|
||||
}
|
||||
|
||||
var success = FFMpegArguments
|
||||
.FromInputFiles(true, source.Path)
|
||||
.WithVideoCodec(VideoCodec.Png)
|
||||
.WithFrameOutputCount(1)
|
||||
.Resize(size)
|
||||
.Seek(captureTime)
|
||||
.OutputToFile(output)
|
||||
.ProcessSynchronously();
|
||||
|
||||
|
||||
if (!success)
|
||||
throw new OperationCanceledException("Could not take snapshot!");
|
||||
|
||||
Bitmap result;
|
||||
using (var bmp = (Bitmap)Image.FromFile(output))
|
||||
{
|
||||
using var ms = new MemoryStream();
|
||||
bmp.Save(ms, ImageFormat.Png);
|
||||
result = new Bitmap(ms);
|
||||
}
|
||||
|
||||
if (File.Exists(output) && !persistSnapshotOnFileSystem)
|
||||
File.Delete(output);
|
||||
|
||||
return result;
|
||||
return size;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -489,7 +506,7 @@ public static bool TryGetContainerFormat(string name, out ContainerFormat fmt)
|
|||
return FFMpegCache.ContainerFormats.TryGetValue(name, out fmt);
|
||||
}
|
||||
|
||||
public static ContainerFormat GetContinerFormat(string name)
|
||||
public static ContainerFormat GetContainerFormat(string name)
|
||||
{
|
||||
if (TryGetContainerFormat(name, out var fmt))
|
||||
return fmt;
|
||||
|
|
Loading…
Reference in a new issue