diff --git a/Code/Data/VidExtraData.cs b/Code/Data/VidExtraData.cs index 2ba28cb..919c58d 100644 --- a/Code/Data/VidExtraData.cs +++ b/Code/Data/VidExtraData.cs @@ -75,8 +75,7 @@ namespace Flowframes.Data } else { - Logger.Log($"Warning: Using 'gamma28' instead of '{colorTransfer.Trim()}'.", true, false, "ffmpeg"); - colorTransfer = colorTransfer.Replace("bt470bg", "gamma28"); // https://forum.videohelp.com/threads/394596-Color-Matrix + colorTransfer = colorTransfer.Replace("bt470bg", "gamma28").Replace("bt470m", "gamma28"); // https://forum.videohelp.com/threads/394596-Color-Matrix } if (!validColorSpaces.Contains(colorPrimaries.Trim())) diff --git a/Code/Form1.cs b/Code/Form1.cs index 9b4a0dc..50ae674 100644 --- a/Code/Form1.cs +++ b/Code/Form1.cs @@ -17,6 +17,8 @@ using Flowframes.MiscUtils; using System.Threading.Tasks; using System.Linq; +#pragma warning disable IDE1006 + namespace Flowframes { public partial class Form1 : Form diff --git a/Code/Forms/SettingsForm.cs b/Code/Forms/SettingsForm.cs index e802f8c..0300f89 100644 --- a/Code/Forms/SettingsForm.cs +++ b/Code/Forms/SettingsForm.cs @@ -7,6 +7,8 @@ using System.Drawing; using System.Threading.Tasks; using System.Windows.Forms; +#pragma warning disable IDE1006 + namespace Flowframes.Forms { public partial class SettingsForm : Form @@ -195,9 +197,8 @@ namespace Flowframes.Forms private void tempDirBrowseBtn_Click(object sender, EventArgs e) { - CommonOpenFileDialog dialog = new CommonOpenFileDialog(); - dialog.InitialDirectory = tempDirCustom.Text.Trim(); - dialog.IsFolderPicker = true; + CommonOpenFileDialog dialog = new CommonOpenFileDialog { InitialDirectory = tempDirCustom.Text.Trim(), IsFolderPicker = true }; + if (dialog.ShowDialog() == CommonFileDialogResult.Ok) tempDirCustom.Text = dialog.FileName; diff --git a/Code/Media/FfmpegEncode.cs b/Code/Media/FfmpegEncode.cs index 84b7e87..c092e39 100644 --- a/Code/Media/FfmpegEncode.cs +++ b/Code/Media/FfmpegEncode.cs @@ -39,7 +39,7 @@ namespace Flowframes.Media if (resampleFps.GetFloat() >= 0.1f) filters.Add($"fps=fps={resampleFps}"); - if (extraData.HasAllValues()) + 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}"); diff --git a/Code/OS/OSUtils.cs b/Code/OS/OSUtils.cs index 5eb2c15..6c2127c 100644 --- a/Code/OS/OSUtils.cs +++ b/Code/OS/OSUtils.cs @@ -199,7 +199,7 @@ namespace Flowframes.OS while (timeSinceLastOutput.ElapsedMilliseconds < 100) await Task.Delay(50); output = output.Trim('\r', '\n'); - Logger.Log($"Output (after {sw.GetElapsedStr()}): " + output.Replace("\r", " / ").Replace("\n", " / "), true); + Logger.Log($"Output (after {sw.GetElapsedStr()}): {output.Replace("\r", " / ").Replace("\n", " / ").Trunc(250)}", true); if (onlyLastLine) output = output.SplitIntoLines().LastOrDefault();