add b-frames option to ffmpeg profile (#1726)

* add b-frames option to ffmpeg profile

* update dependencies

* cleanup

CHANGELOG.md

@@ -61,6 +61,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add two new environment variables to customize config and transcode folder locations
   - `ETV_CONFIG_FOLDER`
   - `ETV_TRANSCODE_FOLDER`
+- Add checkbox to allow use of B-frames in FFmpeg Profile (disabled by default)
 
 ### Fixed
 - Fix some cases of 404s from Plex when files were replaced and scanning the library from ETV didn't help

ErsatzTV.Application/FFmpegProfiles/Commands/CreateFFmpegProfile.cs

@@ -16,6 +16,7 @@ public record CreateFFmpegProfile(
     FFmpegProfileVideoFormat VideoFormat,
     string VideoProfile,
     string VideoPreset,
+    bool AllowBFrames,
     FFmpegProfileBitDepth BitDepth,
     int VideoBitrate,
     int VideoBufferSize,

ErsatzTV.Application/FFmpegProfiles/Commands/CreateFFmpegProfileHandler.cs

@@ -56,6 +56,7 @@ public class CreateFFmpegProfileHandler :
                 VideoFormat = request.VideoFormat,
                 VideoProfile = request.VideoProfile,
                 VideoPreset = request.VideoPreset,
+                AllowBFrames = request.AllowBFrames,
                 BitDepth = request.BitDepth,
                 VideoBitrate = request.VideoBitrate,
                 VideoBufferSize = request.VideoBufferSize,

ErsatzTV.Application/FFmpegProfiles/Commands/UpdateFFmpegProfile.cs

@@ -17,6 +17,7 @@ public record UpdateFFmpegProfile(
     FFmpegProfileVideoFormat VideoFormat,
     string VideoProfile,
     string VideoPreset,
+    bool AllowBFrames,
     FFmpegProfileBitDepth BitDepth,
     int VideoBitrate,
     int VideoBufferSize,

ErsatzTV.Application/FFmpegProfiles/Commands/UpdateFFmpegProfileHandler.cs

@@ -44,6 +44,7 @@ public class
         p.VideoFormat = update.VideoFormat;
         p.VideoProfile = update.VideoProfile;
         p.VideoPreset = update.VideoPreset;
+        p.AllowBFrames = update.AllowBFrames;
 
         // mpeg2video only supports 8-bit content
         p.BitDepth = update.VideoFormat == FFmpegProfileVideoFormat.Mpeg2Video

ErsatzTV.Application/FFmpegProfiles/FFmpegProfileViewModel.cs

@@ -17,6 +17,7 @@ public record FFmpegProfileViewModel(
     FFmpegProfileVideoFormat VideoFormat,
     string VideoProfile,
     string VideoPreset,
+    bool AllowBFrames,
     FFmpegProfileBitDepth BitDepth,
     int VideoBitrate,
     int VideoBufferSize,

ErsatzTV.Application/FFmpegProfiles/Mapper.cs

@@ -19,6 +19,7 @@ internal static class Mapper
             profile.VideoFormat,
             profile.VideoProfile,
             profile.VideoPreset ?? string.Empty,
+            profile.AllowBFrames,
             profile.BitDepth,
             profile.VideoBitrate,
             profile.VideoBufferSize,

ErsatzTV.Core.Tests/ErsatzTV.Core.Tests.csproj

@@ -16,7 +16,7 @@
       <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
       <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
       <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ErsatzTV.Core/Domain/FFmpegProfile.cs

@@ -17,6 +17,7 @@ public record FFmpegProfile
     public FFmpegProfileVideoFormat VideoFormat { get; set; }
     public string VideoProfile { get; set; }
     public string VideoPreset { get; set; }
+    public bool AllowBFrames { get; set; }
     public FFmpegProfileBitDepth BitDepth { get; set; }
     public int VideoBitrate { get; set; }
     public int VideoBufferSize { get; set; }
@@ -39,6 +40,7 @@ public record FFmpegProfile
             VideoFormat = FFmpegProfileVideoFormat.H264,
             VideoProfile = "high",
             VideoPreset = ErsatzTV.FFmpeg.Preset.VideoPreset.Unset,
+            AllowBFrames = false,
             AudioFormat = FFmpegProfileAudioFormat.Aac,
             VideoBitrate = 2000,
             VideoBufferSize = 4000,

ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs

@@ -348,6 +348,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
             videoFormat,
             maybeVideoProfile,
             maybeVideoPreset,
+            channel.FFmpegProfile.AllowBFrames,
             Optional(playbackSettings.PixelFormat),
             scaledSize,
             paddedSize,
@@ -456,6 +457,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
             videoFormat,
             GetVideoProfile(videoFormat, channel.FFmpegProfile.VideoProfile),
             VideoPreset.Unset,
+            channel.FFmpegProfile.AllowBFrames,
             new PixelFormatYuv420P(),
             new FrameSize(desiredResolution.Width, desiredResolution.Height),
             new FrameSize(desiredResolution.Width, desiredResolution.Height),
@@ -682,6 +684,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
             videoFormat,
             maybeVideoProfile,
             maybeVideoPreset,
+            channel.FFmpegProfile.AllowBFrames,
             Optional(playbackSettings.PixelFormat),
             resolution,
             resolution,

ErsatzTV.FFmpeg.Tests/ErsatzTV.FFmpeg.Tests.csproj

@@ -10,7 +10,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV.FFmpeg.Tests/PipelineBuilderBaseTests.cs

@@ -60,6 +60,7 @@ public class PipelineBuilderBaseTests
             VideoFormat.Hevc,
             VideoProfile.Main,
             VideoPreset.Unset,
+            false,
             new PixelFormatYuv420P(),
             new FrameSize(1920, 1080),
             new FrameSize(1920, 1080),
@@ -151,6 +152,7 @@ public class PipelineBuilderBaseTests
             VideoFormat.Hevc,
             VideoProfile.Main,
             VideoPreset.Unset,
+            false,
             new PixelFormatYuv420P(),
             new FrameSize(1920, 1080),
             new FrameSize(1920, 1080),
@@ -298,6 +300,7 @@ public class PipelineBuilderBaseTests
             VideoFormat.Copy,
             VideoProfile.Main,
             VideoPreset.Unset,
+            false,
             Option<IPixelFormat>.None,
             new FrameSize(1920, 1080),
             new FrameSize(1920, 1080),
@@ -383,6 +386,7 @@ public class PipelineBuilderBaseTests
             VideoFormat.Copy,
             VideoProfile.Main,
             VideoPreset.Unset,
+            false,
             new PixelFormatYuv420P(),
             new FrameSize(1920, 1080),
             new FrameSize(1920, 1080),

ErsatzTV.FFmpeg/FrameState.cs

@@ -8,6 +8,7 @@ public record FrameState(
     string VideoFormat,
     Option<string> VideoProfile,
     Option<string> VideoPreset,
+    bool AllowBFrames,
     Option<IPixelFormat> PixelFormat,
     FrameSize ScaledSize,
     FrameSize PaddedSize,

ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs

@@ -174,7 +174,7 @@ public abstract class PipelineBuilderBase : IPipelineBuilder
             new ClosedGopOutputOption()
         };
 
-        if (desiredState.VideoFormat != VideoFormat.Copy)
+        if (desiredState.VideoFormat != VideoFormat.Copy && !desiredState.AllowBFrames)
         {
             pipelineSteps.Add(new NoBFramesOutputOption());
         }

ErsatzTV.Infrastructure.MySql/ErsatzTV.Infrastructure.MySql.csproj

@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
       <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
     </ItemGroup>
 

ErsatzTV.Infrastructure.MySql/Migrations/20240524134543_Add_FFmpegProfile_AllowBFrames.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.MySql.Migrations
+{
+    /// <inheritdoc />
+    public partial class Add_FFmpegProfile_AllowBFrames : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "AllowBFrames",
+                table: "FFmpegProfile",
+                type: "tinyint(1)",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AllowBFrames",
+                table: "FFmpegProfile");
+        }
+    }
+}

ErsatzTV.Infrastructure.MySql/Migrations/TvContextModelSnapshot.cs

@@ -579,6 +579,9 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
 
                     MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
 
+                    b.Property<bool>("AllowBFrames")
+                        .HasColumnType("tinyint(1)");
+
                     b.Property<int>("AudioBitrate")
                         .HasColumnType("int");
 

ErsatzTV.Infrastructure.Sqlite/ErsatzTV.Infrastructure.Sqlite.csproj

@@ -13,8 +13,8 @@
 
     <ItemGroup>
       <PackageReference Include="Dapper" Version="2.1.35" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
     </ItemGroup>
 
 

ErsatzTV.Infrastructure.Sqlite/Migrations/20240524133111_Add_FFmpegProfile_AllowBFrames.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Sqlite.Migrations
+{
+    /// <inheritdoc />
+    public partial class Add_FFmpegProfile_AllowBFrames : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "AllowBFrames",
+                table: "FFmpegProfile",
+                type: "INTEGER",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "AllowBFrames",
+                table: "FFmpegProfile");
+        }
+    }
+}

ErsatzTV.Infrastructure.Sqlite/Migrations/TvContextModelSnapshot.cs

@@ -548,6 +548,9 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER");
 
+                    b.Property<bool>("AllowBFrames")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("AudioBitrate")
                         .HasColumnType("INTEGER");
 

ErsatzTV.Infrastructure.Tests/ErsatzTV.Infrastructure.Tests.csproj

@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@@ -18,12 +18,12 @@
       <PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
       <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
       <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.5" />
       <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

ErsatzTV.Scanner.Tests/ErsatzTV.Scanner.Tests.csproj

@@ -11,7 +11,7 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
         <PackageReference Include="LanguageExt.Core" Version="4.4.8" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="NSubstitute" Version="5.1.0" />
         <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />

ErsatzTV/ErsatzTV.csproj

@@ -25,11 +25,11 @@
       <PackageReference Include="LanguageExt.Core" Version="4.4.8" />
       <PackageReference Include="Markdig" Version="0.37.0" />
       <PackageReference Include="MediatR.Courier.DependencyInjection" Version="5.0.0" />
-      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
+      <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.5" />
-      <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.4" />
+      <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.5" />
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
-      <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.4" /> 
+      <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="8.0.5" /> 
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.4">
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>

ErsatzTV/Pages/FFmpegEditor.razor

@@ -84,6 +84,9 @@
                                             }
                                         }
                                     </MudSelect>
+                                    <MudElement HtmlTag="div" Class="mt-3">
+                                        <MudCheckBox Label="Allow B-Frames" @bind-Value="@_model.AllowBFrames" For="@(() => _model.AllowBFrames)"/>
+                                    </MudElement>
                                     <MudSelect Label="Bit Depth" @bind-Value="_model.BitDepth" For="@(() => _model.BitDepth)">
                                         <MudSelectItem Value="@FFmpegProfileBitDepth.EightBit">8-bit</MudSelectItem>
                                         <MudSelectItem Value="@FFmpegProfileBitDepth.TenBit">10-bit</MudSelectItem>

ErsatzTV/ViewModels/FFmpegProfileEditViewModel.cs

@@ -35,6 +35,7 @@ public class FFmpegProfileEditViewModel
         VideoFormat = viewModel.VideoFormat;
         VideoProfile = viewModel.VideoProfile;
         VideoPreset = viewModel.VideoPreset;
+        AllowBFrames = viewModel.AllowBFrames;
         BitDepth = viewModel.BitDepth;
     }
 
@@ -60,6 +61,7 @@ public class FFmpegProfileEditViewModel
     public FFmpegProfileVideoFormat VideoFormat { get; set; }
     public string VideoProfile { get; set; }
     public string VideoPreset { get; set; }
+    public bool AllowBFrames { get; set; }
     public FFmpegProfileBitDepth BitDepth { get; set; }
 
     public CreateFFmpegProfile ToCreate() =>
@@ -75,6 +77,7 @@ public class FFmpegProfileEditViewModel
             VideoFormat,
             VideoProfile,
             VideoPreset,
+            AllowBFrames,
             BitDepth,
             VideoBitrate,
             VideoBufferSize,
@@ -102,6 +105,7 @@ public class FFmpegProfileEditViewModel
             VideoFormat,
             VideoProfile,
             VideoPreset,
+            AllowBFrames,
             BitDepth,
             VideoBitrate,
             VideoBufferSize,