Add RemoveClosedCaptions options, remux away track errors, explicitly…

… set MkvMerge IETF options
ptr727 · Mar 24, 2023 · 00217ab · 00217ab
1 parent e89a191
commit 00217ab
Show file tree

Hide file tree

Showing 25 changed files with 361 additions and 449 deletions.
diff --git a/PlexCleaner.json b/PlexCleaner.json
@@ -54,7 +54,7 @@
       ".ass",
       ".vtt"
     ],
-    // Enable re-mux
+    // Enable re-mux to MKV of non-MKV files
     "ReMux": true,
     // File extensions to remux to MKV
     "ReMuxExtensions": [
@@ -71,7 +71,7 @@
     // Enable deinterlace of interlaced media
     // Interlace detection is not absolute and uses interlaced frame counting
     "DeInterlace": true,
-    // Enable re-encode
+    // Enable re-encode of audio or video tracks as specified in ReEncodeVideo and ReEncodeAudioFormats
     "ReEncode": true,
     // Re-encode the video if the Format, Codec, and Profile values match
     // Empty fields will match with any value
@@ -136,7 +136,7 @@
     "DefaultLanguage": "en",
     // Enable removing of unwanted language tracks
     "RemoveUnwantedLanguageTracks": true,
-    // Track languages to keep
+    // Track language matched tags to keep
     // Use RFC 5646 format, see https://www.w3.org/International/articles/language-tags/
     "KeepLanguages": [
       "en",
@@ -162,11 +162,13 @@
     // Enable removing of all tags from the media file
     // Track title information is not removed
     "RemoveTags": true,
+    // Enable removing of EIA-608 Closed Captions embedded in video streams
+    "RemoveClosedCaptions": true,
     // Speedup media re-processing by saving media info and processed state in sidecar files
     "UseSidecarFiles": true,
     // Invalidate sidecar files when tool versions change
     "SidecarUpdateOnToolChange": false,
-    // Enable verify
+    // Enable verification of media stream content
     "Verify": true,
     // Restore media file modified timestamp to original pre-processed value
     "RestoreFileTimestamp": false,

diff --git a/PlexCleaner.schema.json b/PlexCleaner.schema.json
@@ -87,6 +87,9 @@
         "KeepOriginalLanguage": {
           "type": "boolean"
         },
+        "RemoveClosedCaptions": {
+          "type": "boolean"
+        },
         "KeepExtensions": {
           "type": "array",
           "items": {
@@ -192,6 +195,7 @@
       },
       "required": [
         "KeepOriginalLanguage",
+        "RemoveClosedCaptions",
         "KeepExtensions",
         "ReMuxExtensions",
         "ReEncodeVideo",

diff --git a/PlexCleaner/BitrateInfo.cs b/PlexCleaner/BitrateInfo.cs
@@ -11,11 +11,6 @@ public class BitrateInfo
 {
     public void Calculate(List<Packet> packetList, int videoStream, int audioStream, int threshold)
     {
-        if (packetList == null)
-        {
-            throw new ArgumentNullException(nameof(packetList));
-        }
-
         // ShouldCompute() must not allow any Assert() to fail
 
         // Calculate the media playback duration from timestamps

diff --git a/PlexCleaner/ConfigFileJsonSchema.cs b/PlexCleaner/ConfigFileJsonSchema.cs
@@ -192,7 +192,7 @@ private static ConfigFileJsonSchema FromJson(string json)
                 return JsonConvert.DeserializeObject<ConfigFileJsonSchema>(json, Settings);
             // Unknown version
             default:
-                throw new NotSupportedException(nameof(configFileJsonSchemaBase.SchemaVersion));
+                throw new NotImplementedException();
         }
     }
 

diff --git a/PlexCleaner/Convert.cs b/PlexCleaner/Convert.cs
@@ -11,27 +11,11 @@ public static class Convert
     public static bool ConvertToMkv(string inputName, out string outputName)
     {
         // Convert all tracks
-        return ConvertToMkv(inputName, null, null, out outputName);
+        return ConvertToMkv(inputName, null, out outputName);
     }
 
-    public static bool ConvertToMkv(string inputName, MediaInfo keep, MediaInfo reencode, out string outputName)
+    public static bool ConvertToMkv(string inputName, SelectMediaInfo selectMediaInfo, out string outputName)
     {
-        return ConvertToMkvFfMpeg(inputName, keep, reencode, out outputName);
-    }
-
-    public static bool ConvertToMkvFfMpeg(string inputName, out string outputName)
-    {
-        // Convert all tracks
-        return ConvertToMkvFfMpeg(inputName, null, null, out outputName);
-    }
-
-    public static bool ConvertToMkvFfMpeg(string inputName, MediaInfo keep, MediaInfo reencode, out string outputName)
-    {
-        if (inputName == null)
-        {
-            throw new ArgumentNullException(nameof(inputName));
-        }
-
         // Match the logic in ReMuxToMKV()
 
         // Test
@@ -46,8 +30,13 @@ public static bool ConvertToMkvFfMpeg(string inputName, MediaInfo keep, MediaInf
         string tempName = Path.ChangeExtension(inputName, ".tmp");
 
         // Convert using ffmpeg
+        // Selected is ReEncode
+        // NotSelected is Keep
         Log.Logger.Information("ReEncode using FfMpeg : {FileName}", inputName);
-        if (!Tools.FfMpeg.ConvertToMkv(inputName, keep, reencode, tempName))
+        var result = selectMediaInfo == null ? 
+            Tools.FfMpeg.ConvertToMkv(inputName, tempName) : 
+            Tools.FfMpeg.ConvertToMkv(inputName, selectMediaInfo, tempName);
+        if (!result)
         {
             Log.Logger.Error("ReEncode using FfMpeg failed : {FileName}", inputName);
             FileEx.DeleteFile(tempName);
@@ -67,11 +56,6 @@ public static bool ConvertToMkvFfMpeg(string inputName, MediaInfo keep, MediaInf
 
     public static bool ReMuxToMkv(string inputName, out string outputName)
     {
-        if (inputName == null)
-        {
-            throw new ArgumentNullException(nameof(inputName));
-        }
-
         // Match the logic in ConvertToMKV()
 
         // Test
@@ -135,20 +119,15 @@ public static bool ReMuxToMkv(string inputName, out string outputName)
                FileEx.DeleteFile(inputName);
     }
 
-    public static bool ReMuxToMkv(string inputName, MediaInfo keep, out string outputName)
+    public static bool ReMuxToMkv(string inputName, SelectMediaInfo selectMediaInfo, out string outputName)
     {
-        if (inputName == null)
-        {
-            throw new ArgumentNullException(nameof(inputName));
-        }
-
-        if (keep == null)
-        {
-            throw new ArgumentNullException(nameof(keep));
+        if (selectMediaInfo == null) 
+        { 
+            return ReMuxToMkv(inputName, out outputName);
         }
 
         // This only works on MKV files and MkvMerge MediaInfo types
-        Debug.Assert(keep.Parser == MediaTool.ToolType.MkvMerge);
+        Debug.Assert(selectMediaInfo.Selected.Parser == MediaTool.ToolType.MkvMerge);
         Debug.Assert(MkvMergeTool.IsMkvFile(inputName));
 
         // Match the logic in ConvertToMKV()
@@ -165,8 +144,10 @@ public static bool ReMuxToMkv(string inputName, MediaInfo keep, out string outpu
         string tempName = Path.ChangeExtension(inputName, ".tmp");
 
         // Remux keeping specific tracks
+        // Selected is Keep
+        // NotSelected is Remove
         Log.Logger.Information("ReMux using MkvMerge : {FileName}", inputName);
-        if (!Tools.MkvMerge.ReMuxToMkv(inputName, keep, tempName))
+        if (!Tools.MkvMerge.ReMuxToMkv(inputName, selectMediaInfo, tempName))
         {
             Log.Logger.Error("ReMux using MkvMerge failed : {FileName}", inputName);
             FileEx.DeleteFile(tempName);
@@ -186,17 +167,6 @@ public static bool ReMuxToMkv(string inputName, MediaInfo keep, out string outpu
 
     public static bool DeInterlaceToMkv(string inputName, out string outputName)
     {
-        // HandBrake produces the best deinterlacing results
-        return DeInterlaceToMkvHandbrake(inputName, out outputName);
-    }
-
-    public static bool DeInterlaceToMkvHandbrake(string inputName, out string outputName)
-    {
-        if (inputName == null)
-        {
-            throw new ArgumentNullException(nameof(inputName));
-        }
-
         // Match the logic in ConvertToMKV()
 
         // Test
@@ -229,44 +199,4 @@ public static bool DeInterlaceToMkvHandbrake(string inputName, out string output
         return inputName.Equals(outputName, StringComparison.OrdinalIgnoreCase) ||
                FileEx.DeleteFile(inputName);
     }
-
-    public static bool ConvertToMkvHandBrake(string inputName, out string outputName)
-    {
-        if (inputName == null)
-        {
-            throw new ArgumentNullException(nameof(inputName));
-        }
-
-        // Match the logic in ConvertToMKV()
-
-        // Test
-        if (Program.Options.TestNoModify)
-        {
-            outputName = inputName;
-            return true;
-        }
-
-        // Create a temp filename based on the input name
-        outputName = Path.ChangeExtension(inputName, ".mkv");
-        string tempName = Path.ChangeExtension(inputName, ".tmp");
-
-        // Re-encode audio and video using handbrake
-        Log.Logger.Information("ReEncode using HandBrake : {FileName}", inputName);
-        if (!Tools.HandBrake.ConvertToMkv(inputName, tempName, true, false))
-        {
-            Log.Logger.Error("ReEncode using HandBrake failed : {FileName}", inputName);
-            FileEx.DeleteFile(tempName);
-            return false;
-        }
-
-        // Rename the temp file to the output file
-        if (!FileEx.RenameFile(tempName, outputName))
-        {
-            return false;
-        }
-
-        // If the input and output names are not the same, delete the input
-        return inputName.Equals(outputName, StringComparison.OrdinalIgnoreCase) ||
-               FileEx.DeleteFile(inputName);
-    }
 }
diff --git a/PlexCleaner/FfMpegIdetInfo.cs b/PlexCleaner/FfMpegIdetInfo.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 
 namespace PlexCleaner;
 
@@ -56,11 +55,6 @@ public bool IsInterlaced()
 
     public static bool GetIdetInfo(FileInfo mediaFile, out FfMpegIdetInfo idetInfo)
     {
-        if (mediaFile == null)
-        {
-            throw new ArgumentNullException(nameof(mediaFile));
-        }
-
         return Tools.FfMpeg.GetIdetInfo(mediaFile.FullName, out idetInfo);
     }