Merge branch 'main' into main

.github/workflows/ci.yml

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

.github/workflows/release.yml

@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Prepare .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.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>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

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

@@ -9,6 +9,7 @@
         </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,6 +9,7 @@
     </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/FFMpegCore.Test.csproj

@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>disable</Nullable>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3">
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <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="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="SkiaSharp" Version="2.88.6" />
   </ItemGroup>
 
@@ -54,6 +54,9 @@
     <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

@@ -173,6 +173,18 @@ 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

@@ -5,6 +5,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 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/FFMpeg/Pipes/RawAudioPipeSource.cs

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

FFMpegCore/FFMpegCore.csproj

@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Instances" Version="3.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
 </Project>

FFMpegCore/FFOptions.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using System.Text.Json.Serialization;
 using FFMpegCore.Enums;
 
 namespace FFMpegCore
@@ -20,10 +21,20 @@ 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>
-        public Encoding Encoding { get; set; } = Encoding.Default;
+        [JsonIgnore]
+        public Encoding Encoding
+        {
+            get => Encoding.GetEncoding(EncodingWebName);
+            set => EncodingWebName = value?.WebName ?? Encoding.Default.WebName;
+        }
 
         /// <summary>
         /// The log level to use when calling of the ffmpeg executable.

FFMpegCore/FFProbe/FFProbeAnalysis.cs

@@ -94,6 +94,18 @@ 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

@@ -90,6 +90,10 @@ private VideoStream ParseVideoStream(FFProbeStream stream)
                 Width = stream.Width ?? 0,
                 Profile = stream.Profile,
                 PixelFormat = stream.PixelFormat,
+                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

@@ -15,6 +15,10 @@ public class VideoStream : MediaStream
         public string PixelFormat { get; set; } = null!;
         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);
     }