From 11dfaa6e71a9196da07ecd2d772c1f6016a1d4bc Mon Sep 17 00:00:00 2001 From: Malte Rosenbjerg Date: Sat, 28 Jan 2023 13:37:20 +0100 Subject: [PATCH] WIP Former-commit-id: 2abb2a1e6b09fec0b6939ab848fb2b652f71b880 --- .../FFMpegCore.Extensions.System.Drawing.Common.csproj | 6 +++++- FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs | 5 ++++- FFMpegCore/FFMpegCore.csproj | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj index beeb939..c2575f7 100644 --- a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj +++ b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj @@ -16,13 +16,17 @@ ffmpeg ffprobe convert video audio mediafile resize analyze muxing GitHub true + true enable netstandard2.0 - + + + + diff --git a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs index 19fd16e..13052a8 100644 --- a/FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs +++ b/FFMpegCore.Extensions.System.Drawing.Common/FFMpegImage.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.Drawing; using System.IO; using System.Linq; @@ -27,7 +28,7 @@ public static bool JoinImageSequence(string output, double frameRate = 30, param var temporaryImageFiles = images.Select((imageInfo, index) => { using var image = Image.FromFile(imageInfo.FullName); - FFMpegHelper.ConversionSizeExceptionCheck(image); + FFMpegHelper.ConversionSizeExceptionCheck(image.Width, image.Height); var destinationPath = Path.Combine(tempFolderName, $"{index.ToString().PadLeft(9, '0')}{imageInfo.Extension}"); Directory.CreateDirectory(tempFolderName); File.Copy(imageInfo.FullName, destinationPath); @@ -74,6 +75,8 @@ public static bool PosterWithAudio(string image, string audio, string output) .WithAudioBitrate(AudioQuality.Normal) .UsingShortest()) .ProcessSynchronously(); + + } /// /// Saves a 'png' thumbnail to an in-memory bitmap diff --git a/FFMpegCore/FFMpegCore.csproj b/FFMpegCore/FFMpegCore.csproj index a3251db..e537ab6 100644 --- a/FFMpegCore/FFMpegCore.csproj +++ b/FFMpegCore/FFMpegCore.csproj @@ -25,6 +25,7 @@ ffmpeg ffprobe convert video audio mediafile resize analyze muxing GitHub true + true enable netstandard2.0