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

5 files changed, 5 insertions, 46 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.