1. Further refine the detection of unnecessary chapter node

2. Added detection of HEVC video track, FLAC audio track and AAC audio track.
3. Fixed a bug on numa scheduling.

Author: LittlePox

OKEGui/OKEGui/Gui/MainWindow.xaml.cs

@@ -35,6 +35,7 @@ public MainWindow()
 
             wm = new WorkerManager(tm);
 
+            BtnRun.IsEnabled = false;
             BtnMoveDown.IsEnabled = false;
             BtnMoveup.IsEnabled = false;
             BtnStop.IsEnabled = false;

OKEGui/OKEGui/JobProcessor/Chapter/ChapterChecker.cs

@@ -70,7 +70,7 @@ public void RemoveUnnecessaryEnd()
             foreach (KeyValuePair<string, string> chapter in Chapters)
             {
                 long timeInMiliSec = StrToMilisec(chapter.Key);
-                if (timeInMiliSec > LengthInMiliSec - 1000)
+                if (timeInMiliSec >= LengthInMiliSec - 1001)
                 {
                     Logger.Info(chapter.Value + ":" + chapter.Key + "的时间在文件结尾1秒内，删除。");
                     toRemove.Add(chapter.Key);

OKEGui/OKEGui/JobProcessor/Demuxer/EACDemuxer.cs

@@ -63,9 +63,13 @@ public EacOutputTrackType(TrackCodec codec, string rawOutput, string extension,
             new EacOutputTrackType(TrackCodec.TRUEHD_AC3, "TrueHD/AC3",       "flac",    true,  TrackType.Audio),
             new EacOutputTrackType(TrackCodec.TRUEHD_AC3, "TrueHD",           "flac",    true,  TrackType.Audio),
             new EacOutputTrackType(TrackCodec.AC3,        "AC3",              "ac3",     true,  TrackType.Audio),
+            new EacOutputTrackType(TrackCodec.FLAC,       "FLAC",             "flac",    true,  TrackType.Audio),
+            new EacOutputTrackType(TrackCodec.AAC,        "AAC",              "aac",     true,  TrackType.Audio),
+            new EacOutputTrackType(TrackCodec.AC3,        "AC3",              "ac3",     true,  TrackType.Audio),
             new EacOutputTrackType(TrackCodec.DTS,        "DTS",              "dts",     true,  TrackType.Audio),
             new EacOutputTrackType(TrackCodec.MPEG2,      "MPEG2",            "m2v",     false, TrackType.Video),
             new EacOutputTrackType(TrackCodec.H264_AVC,   "h264/AVC",         "h264",    false, TrackType.Video),
+            new EacOutputTrackType(TrackCodec.H265_HEVC,  "h265/HEVC",        "265",     false, TrackType.Video),
             new EacOutputTrackType(TrackCodec.PGS,        "Subtitle (PGS)",   "sup",     true,  TrackType.Subtitle),
             new EacOutputTrackType(TrackCodec.Chapter,    "Chapters",         "txt",     true,  TrackType.Chapter),
         };
@@ -415,8 +419,15 @@ public MediaFile Extract(Action<double, EACProgressType> progressCallback)
                         mf.AddTrack(new SubtitleTrack(file, subInfo));
                         break;
                     case TrackType.Chapter:
-                        //TODO: 暂时不加入原盘自带的章节，否则无法检测末端多余章节点。
-                        //mf.AddTrack(new ChapterTrack(file));
+                        FileInfo txtChapter = new FileInfo(Path.ChangeExtension(sourceFile, ".txt"));
+                        if (txtChapter.Exists)
+                        {
+                            Logger.Info("检测到单独准备的章节，不予添加");
+                        }
+                        else
+                        {
+                            file.Rename(txtChapter.FullName);
+                        }
                         break;
                     case TrackType.Video:
                         mf.AddTrack(new VideoTrack(file, new VideoInfo()));

OKEGui/OKEGui/JobProcessor/Demuxer/TrackInfo.cs

@@ -11,7 +11,10 @@ public enum TrackCodec
             Unknown,
             MPEG2,
             H264_AVC,
+            H265_HEVC,
             RAW_PCM,
+            FLAC,
+            AAC,
             DTSMA,
             TRUEHD_AC3,
             AC3,

OKEGui/OKEGui/Properties/AssemblyInfo.cs

@@ -47,4 +47,4 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.10.*")]
+[assembly: AssemblyVersion("4.11.*")]

OKEGui/OKEGui/Task/TaskManager.cs

@@ -128,5 +128,23 @@ public bool HasNextTask()
 
             return false;
         }
+
+        public int GetActiveTaskCount()
+        {
+            lock (o)
+            {
+                int activeTaskCount = 0;
+
+                foreach (var task in taskStatus)
+                {
+                    if (task.IsEnabled)
+                    {
+                        activeTaskCount ++;
+                    }
+                }
+
+                return activeTaskCount;
+            }
+        }
     }
 }

OKEGui/OKEGui/Worker/ExecuteTaskService.cs

@@ -217,7 +217,7 @@ private void WorkerDoWork(object sender, DoWorkEventArgs e)
                                 processor = new X264Encoder(videoJob);
                             }
 
-                            lengthInMiliSec = (long)(processor.NumberOfFrames / videoJob.Fps * 1000 + 0.5);
+                            lengthInMiliSec = (long)((processor.NumberOfFrames - 1) / videoJob.Fps * 1000 + 0.5);
 
                             task.CurrentStatus = "压制中";
                             task.ProgressValue = 0.0;

OKEGui/OKEGui/Worker/WorkerManager.cs

@@ -61,6 +61,7 @@ public void AddTask(TaskDetail detail)
                     {
                         CreateWorker(worker);
                         StartWorker(worker);
+                        break;
                     }
                 }
             }
@@ -75,14 +76,20 @@ public bool Start()
                     return false;
                 }
 
+                int activeTaskCount = tm.GetActiveTaskCount();
                 isRunning = true;
 
                 foreach (string worker in workerList)
                 {
+                    if (activeTaskCount == 0)
+                    {
+                        break;
+                    }
                     if (!bgworkerlist.ContainsKey(worker))
                     {
                         CreateWorker(worker);
                         StartWorker(worker);
+                        activeTaskCount--;
                     }
                 }
 
@@ -117,6 +124,7 @@ public bool StartWorker(string name)
             args.taskManager = tm;
             args.bgWorker = worker;
             args.numaNode = NumaNode.NextNuma();
+            Logger.Trace(name + "所拥有的Numa Node编号是" + args.numaNode.ToString());
 
             worker.RunWorkerAsync(args);
             return true;

OKEGui/OKEGui/demo.json

@@ -24,8 +24,8 @@
     ],
     "Config" : {
         "VspipeArgs" : [
-            "op_start = 10000",
-            "op_end = 15000"
+            "op_start=10000",
+            "op_end=15000"
         ]
     }
 }