Merge 508cce8827 into eb221c3e49

.github/workflows/ci.yml

@@ -22,23 +22,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest, macos-13]
+        os: [windows-latest, ubuntu-latest, macos-latest]
     timeout-minutes: 7
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
     - name: Prepare .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '7.0.x'
 
     - name: Lint with dotnet
       run: dotnet format FFMpegCore.sln --severity warn --verify-no-changes
 
     - name: Prepare FFMpeg
-      uses: FedericoCarboni/setup-ffmpeg@v3
+      uses: FedericoCarboni/setup-ffmpeg@v2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -47,8 +47,7 @@ jobs:
 
     - if: matrix.os == 'windows-latest'
       name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@v3
       with:
-        fail_ci_if_error: true
         directory: FFMpegCore.Test/TestResults
-        token: ${{ secrets.CODECOV_TOKEN }}
+        fail_ci_if_error: true

.github/workflows/release.yml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       
     - name: Prepare .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '7.0.x'
         
     - name: Build solution
       run: dotnet pack FFMpegCore.sln -c Release

FFMpegCore.Examples/FFMpegCore.Examples.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

FFMpegCore.Extensions.SkiaSharp/FFMpegCore.Extensions.SkiaSharp.csproj

@@ -9,7 +9,6 @@
         </PackageReleaseNotes>
         <PackageTags>ffmpeg ffprobe convert video audio mediafile resize analyze muxing skiasharp</PackageTags>
         <Authors>Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev, Dimitri Vranken</Authors>
-        <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     </PropertyGroup>
 
     <ItemGroup>

FFMpegCore.Extensions.System.Drawing.Common/FFMpegCore.Extensions.System.Drawing.Common.csproj

@@ -9,7 +9,6 @@
     </PackageReleaseNotes>
     <PackageTags>ffmpeg ffprobe convert video audio mediafile resize analyze muxing</PackageTags>
     <Authors>Malte Rosenbjerg, Vlad Jerca, Max Bagryantsev</Authors>
-    <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
 
   <ItemGroup>

FFMpegCore.Test/ArgumentBuilderTest.cs

@@ -9,7 +9,6 @@ namespace FFMpegCore.Test
     public class ArgumentBuilderTest
     {
         private readonly string[] _concatFiles = { "1.mp4", "2.mp4", "3.mp4", "4.mp4" };
-        private readonly string[] _multiFiles = { "1.mp3", "2.mp3", "3.mp3", "4.mp3" };
 
         [TestMethod]
         public void Builder_BuildString_IO_1()
@@ -612,86 +611,5 @@ public void Builder_BuildString_TeeOutput()
                 -i "input.mp4" -f tee "[movflags=faststart]output.mp4|[f=mpegts:select=\'0:v:0\']http://server/path"
                 """, str);
         }
-        [TestMethod]
-        public void Builder_BuildString_MultiInput()
-        {
-            var audioStreams = string.Join("", _multiFiles.Select((item, index) => $"[{index}:0]"));
-            var mixFilter = $"{audioStreams}amix=inputs={_multiFiles.Length}:duration=longest:dropout_transition=1:normalize=0[final]";
-            var ffmpegArgs = $"-filter_complex \"{mixFilter}\" -map \"[final]\"";
-            var str = FFMpegArguments
-                .FromFileInput(_multiFiles)
-                .OutputToFile("output.mp3", overwrite: true, options => options
-                    .WithCustomArgument(ffmpegArgs)
-                    .WithAudioCodec(AudioCodec.LibMp3Lame) // Set the audio codec to MP3
-                    .WithAudioBitrate(128) // Set the bitrate to 128kbps
-                    .WithAudioSamplingRate(48000) // Set the sample rate to 48kHz
-                    .WithoutMetadata() // Remove metadata
-                    .WithCustomArgument("-ac 2 -write_xing 0 -id3v2_version 0")) // Force 2 Channels
-                .Arguments;
-            Assert.AreEqual($"-i \"1.mp3\" -i \"2.mp3\" -i \"3.mp3\" -i \"4.mp3\" -filter_complex \"[0:0][1:0][2:0][3:0]amix=inputs=4:duration=longest:dropout_transition=1:normalize=0[final]\" -map \"[final]\" -c:a libmp3lame -b:a 128k -ar 48000 -map_metadata -1 -ac 2 -write_xing 0 -id3v2_version 0 \"output.mp3\" -y", str);
-        }
-        [TestMethod]
-        public void Pre_VerifyExists_AllFilesExist()
-        {
-            // Arrange
-            var filePaths = new List<string>
-            {
-                Path.GetTempFileName(),
-                Path.GetTempFileName(),
-                Path.GetTempFileName()
-            };
-            var argument = new MultiInputArgument(true, filePaths);
-            try
-            {
-                // Act & Assert
-                argument.Pre(); // No exception should be thrown
-            }
-            finally
-            {
-                // Cleanup
-                foreach (var filePath in filePaths)
-                {
-                    File.Delete(filePath);
-                }
-            }
-        }
-
-        [TestMethod]
-        public void Pre_VerifyExists_SomeFilesNotExist()
-        {
-            // Arrange
-            var filePaths = new List<string>
-            {
-                Path.GetTempFileName(),
-                "file2.mp4",
-                "file3.mp4"
-            };
-            var argument = new MultiInputArgument(true, filePaths);
-            try
-            {
-                // Act & Assert
-                Assert.ThrowsException<FileNotFoundException>(() => argument.Pre());
-            }
-            finally
-            {
-                // Cleanup
-                File.Delete(filePaths[0]);
-            }
-        }
-
-        [TestMethod]
-        public void Pre_VerifyExists_NoFilesExist()
-        {
-            // Arrange
-            var filePaths = new List<string>
-            {
-                "file1.mp4",
-                "file2.mp4",
-                "file3.mp4"
-            };
-            var argument = new MultiInputArgument(true, filePaths);
-            // Act & Assert
-            Assert.ThrowsException<FileNotFoundException>(() => argument.Pre());
-        }
     }
 }

FFMpegCore.Test/FFMpegCore.Test.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="7.0.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="SkiaSharp" Version="2.88.6" />
   </ItemGroup>
 
@@ -51,15 +51,9 @@
     <None Update="Resources\input_3sec_rotation_90deg.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Resources\input_3sec_rotation_negative_90deg.mp4">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Resources\input_audio_only_10sec.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Resources\input_hdr.mov">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Update="Resources\input_video_only_3sec.mp4">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

FFMpegCore.Test/FFProbeTests.cs

@@ -123,7 +123,6 @@ public void Probe_Success()
             Assert.AreEqual(1, info.PrimaryVideoStream.SampleAspectRatio.Width);
             Assert.AreEqual(1, info.PrimaryVideoStream.SampleAspectRatio.Height);
             Assert.AreEqual("yuv420p", info.PrimaryVideoStream.PixelFormat);
-            Assert.AreEqual(31, info.PrimaryVideoStream.Level);
             Assert.AreEqual(1280, info.PrimaryVideoStream.Width);
             Assert.AreEqual(720, info.PrimaryVideoStream.Height);
             Assert.AreEqual(25, info.PrimaryVideoStream.AvgFrameRate);
@@ -146,13 +145,6 @@ public void Probe_Rotation()
             Assert.AreEqual(90, info.PrimaryVideoStream.Rotation);
         }
 
-        [TestMethod]
-        public void Probe_Rotation_Negative_Value()
-        {
-            var info = FFProbe.Analyse(TestResources.Mp4VideoRotationNegative);
-            Assert.AreEqual(-90, info.PrimaryVideoStream.Rotation);
-        }
-
         [TestMethod, Timeout(10000)]
         public async Task Probe_Async_Success()
         {
@@ -181,18 +173,6 @@ public async Task Probe_Success_FromStream_Async()
             Assert.AreEqual(3, info.Duration.Seconds);
         }
 
-        [TestMethod, Timeout(10000)]
-        public void Probe_HDR()
-        {
-            var info = FFProbe.Analyse(TestResources.HdrVideo);
-
-            Assert.IsNotNull(info.PrimaryVideoStream);
-            Assert.AreEqual("tv", info.PrimaryVideoStream.ColorRange);
-            Assert.AreEqual("bt2020nc", info.PrimaryVideoStream.ColorSpace);
-            Assert.AreEqual("arib-std-b67", info.PrimaryVideoStream.ColorTransfer);
-            Assert.AreEqual("bt2020", info.PrimaryVideoStream.ColorPrimaries);
-        }
-
         [TestMethod, Timeout(10000)]
         public async Task Probe_Success_Subtitle_Async()
         {

FFMpegCore.Test/Resources/TestResources.cs

@@ -4,9 +4,7 @@ public static class TestResources
     {
         public static readonly string Mp4Video = "./Resources/input_3sec.mp4";
         public static readonly string Mp4VideoRotation = "./Resources/input_3sec_rotation_90deg.mp4";
-        public static readonly string Mp4VideoRotationNegative = "./Resources/input_3sec_rotation_negative_90deg.mp4";
         public static readonly string WebmVideo = "./Resources/input_3sec.webm";
-        public static readonly string HdrVideo = "./Resources/input_hdr.mov";
         public static readonly string Mp4WithoutVideo = "./Resources/input_audio_only_10sec.mp4";
         public static readonly string Mp4WithoutAudio = "./Resources/input_video_only_3sec.mp4";
         public static readonly string RawAudio = "./Resources/audio.raw";

FFMpegCore.Test/VideoTest.cs

@@ -480,21 +480,6 @@ public void Video_Snapshot_PersistSnapshot()
             Assert.AreEqual("png", analysis.PrimaryVideoStream!.CodecName);
         }
 
-        [TestMethod, Timeout(BaseTimeoutMilliseconds)]
-        public void Video_Snapshot_Rotated_PersistSnapshot()
-        {
-            using var outputPath = new TemporaryFile("out.png");
-
-            var size = new Size(360, 0); // half the size of original video, keeping height 0 for keeping aspect ratio
-            FFMpeg.Snapshot(TestResources.Mp4VideoRotationNegative, outputPath, size);
-
-            var analysis = FFProbe.Analyse(outputPath);
-            Assert.AreEqual(size.Width, analysis.PrimaryVideoStream!.Width);
-            Assert.AreEqual(1280 / 2, analysis.PrimaryVideoStream!.Height);
-            Assert.AreEqual(0, analysis.PrimaryVideoStream!.Rotation);
-            Assert.AreEqual("png", analysis.PrimaryVideoStream!.CodecName);
-        }
-
         [TestMethod, Timeout(BaseTimeoutMilliseconds)]
         public void Video_GifSnapshot_PersistSnapshot()
         {

FFMpegCore/FFMpeg/Arguments/CropArgument.cs

@@ -1,22 +0,0 @@
-using System.Drawing;
-
-namespace FFMpegCore.Arguments
-{
-    public class CropArgument : IArgument
-    {
-        public readonly Size? Size;
-        public readonly int Top;
-        public readonly int Left;
-
-        public CropArgument(Size? size, int top, int left)
-        {
-            Size = size;
-            Top = top;
-            Left = left;
-        }
-
-        public CropArgument(int width, int height, int top, int left) : this(new Size(width, height), top, left) { }
-
-        public string Text => Size == null ? string.Empty : $"-vf crop={Size.Value.Width}:{Size.Value.Height}:{Left}:{Top}";
-    }
-}

FFMpegCore/FFMpeg/Arguments/MultiInputArgument.cs

@@ -1,47 +0,0 @@
-namespace FFMpegCore.Arguments
-{
-    /// <summary>
-    /// Represents input parameters for multiple files
-    /// </summary>
-    public class MultiInputArgument : IInputArgument
-    {
-        public readonly bool VerifyExists;
-        public readonly IEnumerable<string> FilePaths;
-
-        public MultiInputArgument(bool verifyExists, IEnumerable<string> filePaths)
-        {
-            VerifyExists = verifyExists;
-            FilePaths = filePaths;
-        }
-
-        public MultiInputArgument(IEnumerable<string> filePaths, bool verifyExists) : this(verifyExists, filePaths) { }
-
-        public void Pre()
-        {
-            if (VerifyExists)
-            {
-                var missingFiles = new List<string>();
-                foreach (var filePath in FilePaths)
-                {
-                    if (!File.Exists(filePath))
-                    {
-                        missingFiles.Add(filePath);
-                    }
-                }
-
-                if (missingFiles.Any())
-                {
-                    throw new FileNotFoundException($"The following input files were not found: {string.Join(", ", missingFiles)}");
-                }
-            }
-        }
-
-        public Task During(CancellationToken cancellationToken = default) => Task.CompletedTask;
-        public void Post() { }
-
-        /// <summary>
-        /// Generates a combined input argument text for all file paths
-        /// </summary>
-        public string Text => string.Join(" ", FilePaths.Select(filePath => $"-i \"{filePath}\""));
-    }
-}

FFMpegCore/FFMpeg/Enums/Enums.cs

@@ -17,7 +17,6 @@ public static class VideoCodec
         public static Codec LibTheora => FFMpeg.GetCodec("libtheora");
         public static Codec Png => FFMpeg.GetCodec("png");
         public static Codec MpegTs => FFMpeg.GetCodec("mpegts");
-        public static Codec LibaomAv1 => FFMpeg.GetCodec("libaom-av1");
     }
 
     public static class AudioCodec
@@ -28,8 +27,6 @@ public static class AudioCodec
         public static Codec Ac3 => FFMpeg.GetCodec("ac3");
         public static Codec Eac3 => FFMpeg.GetCodec("eac3");
         public static Codec LibMp3Lame => FFMpeg.GetCodec("libmp3lame");
-        public static Codec Copy => new Codec("copy", CodecType.Audio);
-
     }
 
     public static class VideoType

FFMpegCore/FFMpeg/FFMpegArgumentOptions.cs

@@ -16,10 +16,7 @@ internal FFMpegArgumentOptions() { }
         public FFMpegArgumentOptions WithVariableBitrate(int vbr) => WithArgument(new VariableBitRateArgument(vbr));
         public FFMpegArgumentOptions Resize(int width, int height) => WithArgument(new SizeArgument(width, height));
         public FFMpegArgumentOptions Resize(Size? size) => WithArgument(new SizeArgument(size));
-        public FFMpegArgumentOptions Crop(Size? size, int left, int top) => WithArgument(new CropArgument(size, top, left));
-        public FFMpegArgumentOptions Crop(int width, int height, int left, int top) => WithArgument(new CropArgument(new Size(width, height), top, left));
-        public FFMpegArgumentOptions Crop(Size? size) => WithArgument(new CropArgument(size, 0, 0));
-        public FFMpegArgumentOptions Crop(int width, int height) => WithArgument(new CropArgument(new Size(width, height), 0, 0));
+
         public FFMpegArgumentOptions WithBitStreamFilter(Channel channel, Filter filter) => WithArgument(new BitStreamFilterArgument(channel, filter));
         public FFMpegArgumentOptions WithConstantRateFactor(int crf) => WithArgument(new ConstantRateFactorArgument(crf));
         public FFMpegArgumentOptions CopyChannel(Channel channel = Channel.Both) => WithArgument(new CopyArgument(channel));

FFMpegCore/FFMpeg/FFMpegArgumentProcessor.cs

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using System.Globalization;
 using System.Text.RegularExpressions;
 using FFMpegCore.Enums;
 using FFMpegCore.Exceptions;
@@ -262,7 +263,7 @@ private void ErrorData(object sender, string msg)
                 return;
             }
 
-            var processed = MediaAnalysisUtils.ParseDuration(match.Groups[1].Value);
+            var processed = TimeSpan.Parse(match.Groups[1].Value, CultureInfo.InvariantCulture);
             _onTimeProgress?.Invoke(processed);
 
             if (_onPercentageProgress == null || _totalTimespan == null)

FFMpegCore/FFMpeg/FFMpegArguments.cs

@@ -21,7 +21,6 @@ private string GetText()
         public static FFMpegArguments FromConcatInput(IEnumerable<string> filePaths, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new ConcatArgument(filePaths), addArguments);
         public static FFMpegArguments FromDemuxConcatInput(IEnumerable<string> filePaths, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new DemuxConcatArgument(filePaths), addArguments);
         public static FFMpegArguments FromFileInput(string filePath, bool verifyExists = true, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new InputArgument(verifyExists, filePath), addArguments);
-        public static FFMpegArguments FromFileInput(IEnumerable<string> filePath, bool verifyExists = true, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new MultiInputArgument(verifyExists, filePath), addArguments);
         public static FFMpegArguments FromFileInput(FileInfo fileInfo, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new InputArgument(fileInfo.FullName, false), addArguments);
         public static FFMpegArguments FromUrlInput(Uri uri, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new InputArgument(uri.AbsoluteUri, false), addArguments);
         public static FFMpegArguments FromDeviceInput(string device, Action<FFMpegArgumentOptions>? addArguments = null) => new FFMpegArguments().WithInput(new InputDeviceArgument(device), addArguments);
@@ -36,7 +35,6 @@ public FFMpegArguments WithGlobalOptions(Action<FFMpegGlobalArguments> configure
         public FFMpegArguments AddConcatInput(IEnumerable<string> filePaths, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new ConcatArgument(filePaths), addArguments);
         public FFMpegArguments AddDemuxConcatInput(IEnumerable<string> filePaths, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new DemuxConcatArgument(filePaths), addArguments);
         public FFMpegArguments AddFileInput(string filePath, bool verifyExists = true, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new InputArgument(verifyExists, filePath), addArguments);
-        public FFMpegArguments AddFileInput(IEnumerable<string> filePath, bool verifyExists = true, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new MultiInputArgument(verifyExists, filePath), addArguments);
         public FFMpegArguments AddFileInput(FileInfo fileInfo, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new InputArgument(fileInfo.FullName, false), addArguments);
         public FFMpegArguments AddUrlInput(Uri uri, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new InputArgument(uri.AbsoluteUri, false), addArguments);
         public FFMpegArguments AddDeviceInput(string device, Action<FFMpegArgumentOptions>? addArguments = null) => WithInput(new InputDeviceArgument(device), addArguments);

FFMpegCore/FFMpeg/Pipes/RawAudioPipeSource.cs

@@ -27,7 +27,7 @@ public string GetStreamArguments()
 
         public async Task WriteAsync(Stream outputStream, CancellationToken cancellationToken)
         {
-            if (_sampleEnumerator.MoveNext() && _sampleEnumerator.Current != null)
+            if (_sampleEnumerator.Current != null)
             {
                 await _sampleEnumerator.Current.SerializeAsync(outputStream, cancellationToken).ConfigureAwait(false);
             }

FFMpegCore/FFMpeg/SnapshotArgumentBuilder.cs

@@ -64,7 +64,7 @@ public static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) Bui
         }
 
         var currentSize = new Size(source.PrimaryVideoStream.Width, source.PrimaryVideoStream.Height);
-        if (IsRotated(source.PrimaryVideoStream.Rotation))
+        if (source.PrimaryVideoStream.Rotation == 90 || source.PrimaryVideoStream.Rotation == 180)
         {
             currentSize = new Size(source.PrimaryVideoStream.Height, source.PrimaryVideoStream.Width);
         }
@@ -88,10 +88,4 @@ public static (FFMpegArguments, Action<FFMpegArgumentOptions> outputOptions) Bui
 
         return null;
     }
-
-    private static bool IsRotated(int rotation)
-    {
-        var absRotation = Math.Abs(rotation);
-        return absRotation == 90 || absRotation == 180;
-    }
 }

FFMpegCore/FFMpegCore.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <Description>A .NET Standard FFMpeg/FFProbe wrapper for easily integrating media analysis and conversion into your .NET applications</Description>
-    <PackageVersion>5.1.1</PackageVersion>
+    <PackageVersion>5.1.0</PackageVersion>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     <PackageReleaseNotes>
     </PackageReleaseNotes>
@@ -18,9 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Instances" Version="3.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
   </ItemGroup>
-  
-  
 
 </Project>

FFMpegCore/FFOptions.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using System.Text.Json.Serialization;
 using FFMpegCore.Enums;
 
 namespace FFMpegCore
@@ -21,20 +20,10 @@ public class FFOptions : ICloneable
         /// </summary>
         public string TemporaryFilesFolder { get; set; } = Path.GetTempPath();
 
-        /// <summary>
-        /// Encoding web name used to persist encoding <see cref="Encoding"/>
-        /// </summary>
-        public string EncodingWebName { get; set; } = Encoding.Default.WebName;
-
         /// <summary>
         /// Encoding used for parsing stdout/stderr on ffmpeg and ffprobe processes
         /// </summary>
-        [JsonIgnore]
-        public Encoding Encoding
-        {
-            get => Encoding.GetEncoding(EncodingWebName);
-            set => EncodingWebName = value?.WebName ?? Encoding.Default.WebName;
-        }
+        public Encoding Encoding { get; set; } = Encoding.Default;
 
         /// <summary>
         /// The log level to use when calling of the ffmpeg executable.

FFMpegCore/FFProbe/FFProbeAnalysis.cs

@@ -83,9 +83,6 @@ public class FFProbeStream : ITagsContainer, IDispositionContainer
         [JsonPropertyName("pix_fmt")]
         public string PixelFormat { get; set; } = null!;
 
-        [JsonPropertyName("level")]
-        public int Level { get; set; }
-
         [JsonPropertyName("sample_rate")]
         public string SampleRate { get; set; } = null!;
 
@@ -97,18 +94,6 @@ public class FFProbeStream : ITagsContainer, IDispositionContainer
 
         [JsonPropertyName("side_data_list")]
         public List<Dictionary<string, JsonValue>> SideData { get; set; } = null!;
-
-        [JsonPropertyName("color_range")]
-        public string ColorRange { get; set; } = null!;
-
-        [JsonPropertyName("color_space")]
-        public string ColorSpace { get; set; } = null!;
-
-        [JsonPropertyName("color_transfer")]
-        public string ColorTransfer { get; set; } = null!;
-
-        [JsonPropertyName("color_primaries")]
-        public string ColorPrimaries { get; set; } = null!;
     }
 
     public class Format : ITagsContainer

FFMpegCore/FFProbe/MediaAnalysis.cs

@@ -30,12 +30,9 @@ private MediaFormat ParseFormat(Format analysisFormat)
             };
         }
 
-        private string GetValue(string tagName, Dictionary<string, string>? tags, string defaultValue) =>
-            tags == null ? defaultValue : tags.TryGetValue(tagName, out var value) ? value : defaultValue;
-
         private ChapterData ParseChapter(Chapter analysisChapter)
         {
-            var title = GetValue("title", analysisChapter.Tags, "TitleValueNotSet");
+            var title = analysisChapter.Tags.FirstOrDefault(t => t.Key == "title").Value;
             var start = MediaAnalysisUtils.ParseDuration(analysisChapter.StartTime);
             var end = MediaAnalysisUtils.ParseDuration(analysisChapter.EndTime);
 
@@ -90,11 +87,6 @@ private VideoStream ParseVideoStream(FFProbeStream stream)
                 Width = stream.Width ?? 0,
                 Profile = stream.Profile,
                 PixelFormat = stream.PixelFormat,
-                Level = stream.Level,
-                ColorRange = stream.ColorRange,
-                ColorSpace = stream.ColorSpace,
-                ColorTransfer = stream.ColorTransfer,
-                ColorPrimaries = stream.ColorPrimaries,
                 Rotation = MediaAnalysisUtils.ParseRotation(stream),
                 Language = stream.GetLanguage(),
                 Disposition = MediaAnalysisUtils.FormatDisposition(stream.Disposition),

FFMpegCore/FFProbe/VideoStream.cs

@@ -13,13 +13,8 @@ public class VideoStream : MediaStream
         public int Height { get; set; }
         public double FrameRate { get; set; }
         public string PixelFormat { get; set; } = null!;
-        public int Level { get; set; }
         public int Rotation { get; set; }
         public double AverageFrameRate { get; set; }
-        public string ColorRange { get; set; } = null!;
-        public string ColorSpace { get; set; } = null!;
-        public string ColorTransfer { get; set; } = null!;
-        public string ColorPrimaries { get; set; } = null!;
 
         public PixelFormat GetPixelFormatInfo() => FFMpeg.GetPixelFormat(PixelFormat);
     }