From 4eb1eac09c11f230a76bf5bb759f47e5ce2efb5f Mon Sep 17 00:00:00 2001 From: N00MKRAD <61149547+n00mkrad@users.noreply.github.com> Date: Fri, 22 Dec 2023 03:51:55 +0100 Subject: [PATCH] Fixed output color matrix filtering --- Code/Media/FfmpegEncode.cs | 6 +----- Code/Media/FfmpegExtract.cs | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Code/Media/FfmpegEncode.cs b/Code/Media/FfmpegEncode.cs index f76b4cd..1349890 100644 --- a/Code/Media/FfmpegEncode.cs +++ b/Code/Media/FfmpegEncode.cs @@ -1,13 +1,10 @@ using Flowframes.Data; using Flowframes.IO; using Flowframes.MiscUtils; -using Flowframes.Properties; -using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading.Tasks; -using System.Windows.Media; using static Flowframes.AvProcess; using Utils = Flowframes.Media.FfmpegUtils; @@ -67,8 +64,7 @@ namespace Flowframes.Media if (Config.GetBool(Config.Key.keepColorSpace) && extraData.HasAllValues()) { - Logger.Log($"Applying color transfer ({extraData.colorSpace}).", true, false, "ffmpeg"); - filters.Add($"scale=out_color_matrix={extraData.colorSpace}"); + Logger.Log($"Using color data: Space {extraData.colorSpace}; Primaries {extraData.colorPrimaries}; Transfer {extraData.colorTransfer}; Range {extraData.colorRange}", true, false, "ffmpeg"); extraArgs.Add($"-colorspace {extraData.colorSpace} -color_primaries {extraData.colorPrimaries} -color_trc {extraData.colorTransfer} -color_range:v {extraData.colorRange.Wrap()}"); } diff --git a/Code/Media/FfmpegExtract.cs b/Code/Media/FfmpegExtract.cs index 692cea5..0030b53 100644 --- a/Code/Media/FfmpegExtract.cs +++ b/Code/Media/FfmpegExtract.cs @@ -6,7 +6,6 @@ using Flowframes.Ui; using System; using System.Collections.Generic; using System.Drawing; -using System.Globalization; using System.IO; using System.Linq; using System.Threading.Tasks;