Skip to content
This repository was archived by the owner on Sep 14, 2024. It is now read-only.

Commit a166774

Browse files
committed
Fix resume
1 parent fa3333b commit a166774

4 files changed

Lines changed: 27 additions & 10 deletions

File tree

Av1ador/Encoder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public void Set_video_codec(string codec)
167167
Job = j[1];
168168
Presets = new string[] { "0 (slowest)", "1", "2", "3", "*4", "5", "6", "7", "8 (fastest)" };
169169
speed_str = "-cpu-used ";
170-
Params = "-tune 1 -enable-restoration 0 -threads !threads! -tiles 2x1 -keyint_min !minkey! -g !maxkey! -aom-params sharpness=4:max-gf-interval=20:gf-max-pyr-height=4:disable-trellis-quant=2:denoise-noise-level=!gs!:enable-dnl-denoising=0:denoise-block-size=16:arnr-maxframes=3:arnr-strength=4:max-reference-frames=4:enable-rect-partitions=0:enable-filter-intra=0:enable-masked-comp=0:enable-qm=1:qm-min=0:qm-max=5 -strict -2";
170+
Params = "-tune 1 -enable-restoration 0 -threads !threads! -tiles 2x1 -keyint_min !minkey! -g !maxkey! -aom-params sharpness=4:max-gf-interval=20:gf-max-pyr-height=5:disable-trellis-quant=2:denoise-noise-level=!gs!:enable-dnl-denoising=0:denoise-block-size=16:arnr-maxframes=3:arnr-strength=4:max-reference-frames=4:enable-rect-partitions=0:enable-filter-intra=0:enable-masked-comp=0:enable-qm=1:qm-min=0:qm-max=5 -strict -2";
171171
Color = " -color_primaries 1 -color_trc 1 -colorspace 1";
172172
Gs = 100;
173173
Rate = 0.82;

Av1ador/Form1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public partial class Form1 : Form
2525
[DllImport("user32.dll")]
2626
static extern bool GetCursorPos(ref Point point);
2727

28-
private readonly string title = "Av1ador 1.3.0";
28+
private readonly string title = "Av1ador 1.3.1";
2929
private readonly Regex formatos = new Regex(".+(mkv|mp4|avi|webm|ivf|m2ts|wmv|mpg|mov|3gp|ts|mpeg|y4m|vob|m2v|m4v|flv|asf|png)$", RegexOptions.IgnoreCase);
3030
private Player mpv;
3131
private Video primer_video, segundo_video;

Av1ador/Function.cs

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.Data;
44
using System.Diagnostics;
55
using System.Drawing;
6+
using System.Globalization;
67
using System.Linq;
78
using System.Runtime.InteropServices;
89
using System.Text.RegularExpressions;
@@ -301,6 +302,7 @@ public static string Size_unit(double size)
301302

302303
public static List<string> Concat(List<string>[] list)
303304
{
305+
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
304306
var concatenated = list[0];
305307
for (int i = 1; i < list.Length; i++)
306308
{
@@ -309,7 +311,15 @@ public static List<string> Concat(List<string>[] list)
309311
else
310312
concatenated = concatenated.Concat(list[i]).ToList();
311313
}
312-
return concatenated;
314+
try
315+
{
316+
List<double> result = concatenated.Select(x => double.Parse(x)).ToList();
317+
result.Sort();
318+
return result.Select(i => i.ToString()).ToList();
319+
} catch
320+
{
321+
return concatenated;
322+
}
313323
}
314324
}
315325
}

Av1ador/Segment.cs

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,7 @@ public void Start_encode(string dir, Video v, bool audio, double delay = 0, int
397397
if (vbr)
398398
System.IO.File.WriteAllLines(Name + "\\complexity.txt", Func.Concat(scenes_complex).ToArray());
399399

400-
Status.Remove("Detecting scenes...");
401-
if (Can_run)
402-
{
403-
Status.Add("Encoding video...");
404-
watch.Start();
405-
Encoding();
406-
}
400+
Begin();
407401
}
408402
};
409403
}
@@ -413,6 +407,19 @@ public void Start_encode(string dir, Video v, bool audio, double delay = 0, int
413407
Bw[i].RunWorkerAsync(parameters);
414408
}
415409
}
410+
else
411+
Begin();
412+
}
413+
414+
public void Begin()
415+
{
416+
Status.Remove("Detecting scenes...");
417+
if (Can_run)
418+
{
419+
Status.Add("Encoding video...");
420+
watch.Start();
421+
Encoding();
422+
}
416423
}
417424

418425
public void Encoding()

0 commit comments

Comments
 (0)