Skip to content

Commit f4aba33

Browse files
committed
Auto-configure metrics util every time it runs
1 parent 37ebbd7 commit f4aba33

File tree

5 files changed

+29
-16
lines changed

5 files changed

+29
-16
lines changed

ff-utils-winforms/Forms/MainForm.Utils.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ private void utilsMetricsConfBtn_Click(object sender, EventArgs e)
5353

5454
Utils.UtilsMetricsForm form = new Utils.UtilsMetricsForm();
5555
form.ShowDialog();
56+
SetMetricsVarsFromForm(form);
57+
}
5658

59+
public void SetMetricsVarsFromForm (Utils.UtilsMetricsForm form)
60+
{
5761
if (form.DialogResult != DialogResult.OK)
5862
return;
5963

@@ -71,28 +75,21 @@ private void SelectColorData(object sender, EventArgs e)
7175
{
7276
currentTask = RunTask.TaskType.UtilColorData;
7377
UpdatePanels();
74-
//utilsColorDataConfBtn_Click(null, null);
7578
}
7679

7780

7881
private void utilsColorDataConfBtn_Click(object sender, EventArgs e)
7982
{
80-
// if (fileListBox.Items.Count < 2)
81-
// {
82-
// Logger.Log($"You need to load at least 2 files into the file list to use this utility!");
83-
// return;
84-
// }
85-
8683
Utils.UtilsColorDataForm form = new Utils.UtilsColorDataForm();
8784

8885
if (form.IsDisposed)
8986
return;
9087

9188
form.ShowDialog();
92-
SetColorDataFormVars(form);
89+
SetColorDataVarsFromForm(form);
9390
}
9491

95-
public void SetColorDataFormVars(Utils.UtilsColorDataForm form)
92+
public void SetColorDataVarsFromForm(Utils.UtilsColorDataForm form)
9693
{
9794
if (form == null || form.DialogResult != DialogResult.OK)
9895
return;

ff-utils-winforms/Forms/Utils/UtilsMetricsForm.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,24 @@ public partial class UtilsMetricsForm : Form
2424
public string VideoLq { get; set; }
2525
public string VideoHq { get; set; }
2626

27+
private bool closeRightAway = false;
28+
2729
ListBox fileList = Program.mainForm.fileListBox;
2830

29-
public UtilsMetricsForm()
31+
public UtilsMetricsForm(bool close = false)
3032
{
3133
InitializeComponent();
32-
34+
35+
closeRightAway = close;
36+
37+
if (closeRightAway)
38+
Opacity = 0;
39+
3340
vmaf.Checked = UtilGetMetrics.runVmaf;
3441
ssim.Checked = UtilGetMetrics.runSsim;
3542
psnr.Checked = UtilGetMetrics.runPsnr;
3643
align.SelectedIndex = UtilGetMetrics.alignMode;
44+
subsample.SelectedIndex = (UtilGetMetrics.subsample - 1).Clamp(0, 64);
3745
vmafMdl.SelectedIndex = UtilGetMetrics.vmafModel;
3846
AcceptButton = confirmBtn;
3947
}
@@ -52,8 +60,7 @@ private void LoadVideoBox (ComboBox box, string videoPath)
5260

5361
private void UtilsMetricsForm_Load(object sender, EventArgs e)
5462
{
55-
align.SelectedIndex = UtilGetMetrics.alignMode;
56-
subsample.SelectedIndex = (UtilGetMetrics.subsample - 1).Clamp(0, 64);
63+
5764
}
5865

5966
private void UtilsMetricsForm_Shown(object sender, EventArgs e)
@@ -74,6 +81,9 @@ private void UtilsMetricsForm_Shown(object sender, EventArgs e)
7481
encodedVideo.SelectedItem = encodedVideo.Items.OfType<MediaFile>().OrderByDescending(x => x.Size).Last();
7582
referenceVideo.SelectedItem = referenceVideo.Items.OfType<MediaFile>().OrderByDescending(x => x.Size).First();
7683
}
84+
85+
if (closeRightAway)
86+
Close();
7787
}
7888

7989
bool pressedOk = false;

ff-utils-winforms/UI/Tasks/UtilColorData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static async Task Run()
3333
{
3434
UtilsColorDataForm form = new UtilsColorDataForm(true);
3535
form.ShowDialog();
36-
Program.mainForm.SetColorDataFormVars(form);
36+
Program.mainForm.SetColorDataVarsFromForm(form);
3737

3838
if (!File.Exists(vidTarget))
3939
{

ff-utils-winforms/UI/Tasks/UtilGetMetrics.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using Nmkoder.Data;
88
using Nmkoder.Data.Ui;
99
using Nmkoder.Extensions;
10+
using Nmkoder.Forms.Utils;
1011
using Nmkoder.IO;
1112
using Nmkoder.Main;
1213
using Nmkoder.Media;
@@ -34,10 +35,15 @@ public static async Task Run(bool fixRate = true)
3435
}
3536

3637
Program.mainForm.SetWorking(true);
37-
Logger.Log($"Getting metrics for {Path.GetFileName(vidLq)} compared against {Path.GetFileName(vidHq)}.");
3838

3939
try
4040
{
41+
UtilsMetricsForm form = new UtilsMetricsForm(true);
42+
form.ShowDialog();
43+
Program.mainForm.SetMetricsVarsFromForm(form);
44+
45+
Logger.Log($"Getting metrics for {Path.GetFileName(vidLq)} compared against {Path.GetFileName(vidHq)}.");
46+
4147
string r = fixRate ? "-r 24" : "";
4248
string f = await GetAlignFilters();
4349
FfmpegOutputHandler.overrideTargetDurationMs = FfmpegCommands.GetDurationMs(vidLq);

ff-utils-winforms/Utils/ColorDataUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public static async Task SetColorData(string path, VideoColorData d)
158158

159159
if (filesizeDiffKb > 1024 && (filesizeFactor < 0.95d || filesizeFactor > 1.05d))
160160
{
161-
Logger.Log($"Warning: Output file size differs by >1MB is not within 5% of the original size! Won't delete original to be sure.");
161+
Logger.Log($"Warning: Output file size differs by >1MB is not within 5% of the original file's size! Won't delete original to be sure.");
162162
}
163163
else
164164
{

0 commit comments

Comments
 (0)