WinGui: Update the Encode Json Factory to produce human readable Json for audio and video encoders.

7 files changed, 20 insertions, 61 deletions

diff --git a/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs
index dbf96aeda..3e0e7f012 100644
--- a/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs
@@ -13,61 +13,20 @@ namespace HandBrake.Interop.Interop.HbLib
     public class NativeConstants
     {
         // Audio encoders
-        public const uint HB_ACODEC_MASK = 0x03FFFF00;
-        public const uint HB_ACODEC_LAME = 0x00000200;
-        public const uint HB_ACODEC_VORBIS = 0x00000400;
         public const uint HB_ACODEC_AC3 = 0x00000800;
-        public const uint HB_ACODEC_LPCM = 0x00001000;
         public const uint HB_ACODEC_DCA = 0x00002000;
-        public const uint HB_ACODEC_CA_AAC = 0x00004000;
-        public const uint HB_ACODEC_CA_HAAC = 0x00008000;
         public const uint HB_ACODEC_FFAAC = 0x00010000;
-        public const uint HB_ACODEC_FFMPEG = 0x00020000;
         public const uint HB_ACODEC_DCA_HD = 0x00040000;
         public const uint HB_ACODEC_MP3 = 0x00080000;
         public const uint HB_ACODEC_FFFLAC = 0x00100000;
-        public const uint HB_ACODEC_FFFLAC24 = 0x00200000;
-        public const uint HB_ACODEC_FDK_AAC = 0x00400000;
-        public const uint HB_ACODEC_FDK_HAAC = 0x00800000;
         public const uint HB_ACODEC_FFEAC3 = 0x01000000;
         public const uint HB_ACODEC_FFTRUEHD = 0x02000000;
-        public const uint HB_ACODEC_FF_MASK = 0x03FF2800;
         public const uint HB_ACODEC_PASS_FLAG = 0x40000000;
         public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD);
-        public const uint HB_ACODEC_AUTO_PASS = (HB_ACODEC_PASS_MASK | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_MP3_PASS = (HB_ACODEC_MP3 | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_AAC_PASS = (HB_ACODEC_FFAAC | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_AC3_PASS = (HB_ACODEC_AC3 | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_DCA_PASS = (HB_ACODEC_DCA | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_DCA_HD_PASS = (HB_ACODEC_DCA_HD | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_EAC3_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3);
-        public const uint HB_ACODEC_FLAC_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFFLAC);
-        public const uint HB_ACODEC_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);
-        public const uint HB_ACODEC_TRUEHD_PASS = (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFTRUEHD);
 
         // VideoEncoders
         public const uint HB_VCODEC_QSV_H264 = 0x0000100;
         public const uint HB_VCODEC_QSV_H265 = 0x0000200;
         public const uint HB_VCODEC_QSV_H265_10BIT = 0x0000400;
-        public const uint HB_VCODEC_QSV_MASK = 0x0000F00;
-
-        public const uint HB_VCODEC_FFMPEG_VCE_H264 = 0x00040000;
-        public const uint HB_VCODEC_FFMPEG_VCE_H265 = 0x00080000;
-        public const uint HB_VCODEC_FFMPEG_MASK = (0x00000F0 | HB_VCODEC_FFMPEG_VCE_H264 | HB_VCODEC_FFMPEG_VCE_H265);
-
-        // Encode state
-        public const int HB_STATE_IDLE = 1;
-        public const int HB_STATE_SCANNING = 2;
-        public const int HB_STATE_SCANDONE = 4;
-        public const int HB_STATE_WORKING = 8;
-        public const int HB_STATE_PAUSED = 16;
-        public const int HB_STATE_WORKDONE = 32;
-        public const int HB_STATE_MUXING = 64;
-        public const int HB_STATE_SEARCHING = 128;
-
-        // Keep aspect ratio values
-        public const int HB_KEEP_WIDTH = 0x01;
-        public const int HB_KEEP_HEIGHT = 0x02;
-        public const int HB_KEEP_DISPLAY_ASPECT = 0x04;
 	}
 }
diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs
index 924185f50..59ddd0481 100644
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs
@@ -24,11 +24,11 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// <summary>
         /// Gets or sets the copy mask.
         /// </summary>
-        public uint[] CopyMask { get; set; }
+        public string[] CopyMask { get; set; }
 
         /// <summary>
         /// Gets or sets the fallback encoder.
         /// </summary>
-        public int FallbackEncoder { get; set; }
+        public string FallbackEncoder { get; set; }
     }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs
index 64ef94fd7..51989132a 100644
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs
@@ -32,7 +32,7 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// <summary>
         /// Gets or sets the encoder.
         /// </summary>
-        public int Encoder { get; set; }
+        public string Encoder { get; set; }
 
         /// <summary>
         /// Gets or sets the gain.
diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs
index 0d8b2daeb..ab822c33a 100644
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs
@@ -44,6 +44,6 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// <summary>
         /// Gets or sets the mux.
         /// </summary>
-        public int Mux { get; set; }
+        public string Mux { get; set; }
     }
 }
\ No newline at end of file
diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs
index f77c0d335..992d67709 100644
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs
@@ -25,7 +25,7 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// <summary>
         /// Gets or sets the codec.
         /// </summary>
-        public int Encoder { get; set; }
+        public string Encoder { get; set; }
 
         /// <summary>
         /// Gets or sets the level.
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
index 3e133c5fa..a64884941 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeFactory.cs
@@ -147,7 +147,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 },
                 ChapterMarkers = job.IncludeChapterMarkers,
                 AlignAVStart = job.AlignAVStart,
-                Mux = HBFunctions.hb_container_get_from_name(job.OutputFormat == OutputFormat.Mp4 ? "av_mp4" : "av_mkv"), // TODO tidy up.
+                Mux = EnumHelper<OutputFormat>.GetShortName(job.OutputFormat), 
                 ChapterList = new List<Chapter>()
             };
 
@@ -271,7 +271,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
             Validate.NotNull(videoEncoder, "Video encoder " + job.VideoEncoder + " not recognized.");
             if (videoEncoder != null)
             {
-                video.Encoder = videoEncoder.Id;
+                video.Encoder = videoEncoder.ShortName;
             }
 
             string advancedOptions = job.ShowAdvancedTab ? job.AdvancedEncoderOptions : string.Empty;
@@ -331,19 +331,19 @@ namespace HandBrakeWPF.Services.Encode.Factories
         {
             Audio audio = new Audio();
 
-            List<uint> copyMaskList = new List<uint>();
-            if (job.AllowedPassthruOptions.AudioAllowAACPass) copyMaskList.Add(NativeConstants.HB_ACODEC_AAC_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowAC3Pass) copyMaskList.Add(NativeConstants.HB_ACODEC_AC3_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowDTSHDPass) copyMaskList.Add(NativeConstants.HB_ACODEC_DCA_HD_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowDTSPass) copyMaskList.Add(NativeConstants.HB_ACODEC_DCA_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowEAC3Pass) copyMaskList.Add(NativeConstants.HB_ACODEC_EAC3_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowFlacPass) copyMaskList.Add(NativeConstants.HB_ACODEC_FLAC_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowMP3Pass) copyMaskList.Add(NativeConstants.HB_ACODEC_MP3_PASS);
-            if (job.AllowedPassthruOptions.AudioAllowTrueHDPass) copyMaskList.Add(NativeConstants.HB_ACODEC_TRUEHD_PASS);
+            List<string> copyMaskList = new List<string>();
+            if (job.AllowedPassthruOptions.AudioAllowAACPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.AacPassthru));
+            if (job.AllowedPassthruOptions.AudioAllowAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Ac3Passthrough));
+            if (job.AllowedPassthruOptions.AudioAllowDTSHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsHDPassthrough));
+            if (job.AllowedPassthruOptions.AudioAllowDTSPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsPassthrough));
+            if (job.AllowedPassthruOptions.AudioAllowEAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.EAc3Passthrough));
+            if (job.AllowedPassthruOptions.AudioAllowFlacPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.FlacPassthru));
+            if (job.AllowedPassthruOptions.AudioAllowMP3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Mp3Passthru));
+            if (job.AllowedPassthruOptions.AudioAllowTrueHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.TrueHDPassthrough));
             audio.CopyMask = copyMaskList.ToArray();
 
             HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AllowedPassthruOptions.AudioEncoderFallback));
-            audio.FallbackEncoder = audioEncoder.Id;
+            audio.FallbackEncoder = audioEncoder.ShortName;
 
             audio.AudioList = new List<HandBrake.Interop.Interop.Json.Encode.AudioTrack>();
             foreach (AudioTrack item in job.AudioTracks)
@@ -365,7 +365,7 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 {
                     Track = (item.Track.HasValue ? item.Track.Value : 0) - 1,
                     DRC = item.DRC,
-                    Encoder = encoder.Id,
+                    Encoder = encoder.ShortName,
                     Gain = item.Gain,
                     Mixdown = mixdown != null ? mixdown.Id : -1,
                     NormalizeMixLevel = false,
diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
index 8c55e45b1..dc4f00480 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/OutputFormat.cs
@@ -17,11 +17,11 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
     public enum OutputFormat
     {
         [DisplayName("MP4")]
-        [ShortName("av_mp4")]
+        [ShortName("mp4")]
         Mp4 = 0,
 
         [DisplayName("MKV")]
-        [ShortName("av_mkv")]
+        [ShortName("mkv")]
         Mkv,
     }
 }