From 2d136e53801cdd64b56b7ea00f3cb555f888f270 Mon Sep 17 00:00:00 2001 From: N00MKRAD <61149547+n00mkrad@users.noreply.github.com> Date: Tue, 11 Mar 2025 01:12:03 +0100 Subject: [PATCH] Get modulo from pixel format instead of encoder --- CodeLegacy/Data/EncoderInfoVideo.cs | 1 - CodeLegacy/Media/FfmpegCommands.cs | 4 +++- CodeLegacy/MiscUtils/OutputUtils.cs | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CodeLegacy/Data/EncoderInfoVideo.cs b/CodeLegacy/Data/EncoderInfoVideo.cs index 6b32743..1cfce8f 100644 --- a/CodeLegacy/Data/EncoderInfoVideo.cs +++ b/CodeLegacy/Data/EncoderInfoVideo.cs @@ -8,7 +8,6 @@ namespace Flowframes.Data public Codec Codec { get; set; } = (Codec)(-1); public bool? Lossless { get; set; } = false; // True = Lossless Codec; False = Lossy codec with lossless option; null: Lossy with no lossless option public bool HwAccelerated { get; set; } = false; - public int Modulo { get; set; } = 2; public int MaxFramerate { get; set; } = 1000; public List PixelFormats { get; set; } = new List(); public PixelFormat PixelFormatDefault { get; set; } = (PixelFormat)(-1); diff --git a/CodeLegacy/Media/FfmpegCommands.cs b/CodeLegacy/Media/FfmpegCommands.cs index 51cbede..93847be 100644 --- a/CodeLegacy/Media/FfmpegCommands.cs +++ b/CodeLegacy/Media/FfmpegCommands.cs @@ -38,7 +38,9 @@ namespace Flowframes { if (mode == ModuloMode.ForEncoding) { - return Interpolate.currentSettings.outSettings.Encoder.GetInfo().Modulo; + string pixFmt = Interpolate.currentSettings.outSettings.PixelFormat.ToString().Lower(); + bool subsampled = pixFmt.Contains("420") || pixFmt.Contains("422") || pixFmt.Contains("p010") || pixFmt.Contains("p016"); + return subsampled ? 2 : 1; } else if (mode == ModuloMode.ForInterpolation) { diff --git a/CodeLegacy/MiscUtils/OutputUtils.cs b/CodeLegacy/MiscUtils/OutputUtils.cs index 30f9552..dca6eaa 100644 --- a/CodeLegacy/MiscUtils/OutputUtils.cs +++ b/CodeLegacy/MiscUtils/OutputUtils.cs @@ -187,7 +187,6 @@ namespace Flowframes.MiscUtils QualityDefault = (int)Quality.GifColors.High128, OverideExtension = "gif", MaxFramerate = 50, - Modulo = 1, }; }