WiWinGui: Remap the audio and video encoders. Hopefully this should also be backwards compatible with user presets, but it is recommended to re-create any user presets to that the new keys get picked up incase we drop the fallbacks in the future.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5591 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 31 insertions, 26 deletions

diff --git a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
index 23181e7fe..52d1d253e 100644
--- a/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
+++ b/win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs
@@ -12,38 +12,42 @@ namespace HandBrake.Interop.HbLib
 {

 	public partial class NativeConstants

 	{

-		public const uint HB_ACODEC_MASK = 0x00FFFF00;

-		public const uint HB_ACODEC_FAAC = 0x00000100;

-		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_FDK_AAC = 0x00400000;

-		public const uint HB_ACODEC_FDK_HAAC = 0x00800000;

-		public const uint HB_ACODEC_FF_MASK = 0x00FF2000;

-		public const uint HB_ACODEC_PASS_FLAG = 0x40000000;

-		public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA);

-		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_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);

+        // Audio Encoders

+        public const uint  HB_ACODEC_MASK   =   0x00FFFF00;

+	    public const uint HB_ACODEC_FAAC = 0x00000100;

+	    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_FF_MASK = 0x00FF2000;

+	    public const uint HB_ACODEC_PASS_FLAG = 0x40000000;

+	    public const uint HB_ACODEC_PASS_MASK = (HB_ACODEC_MP3 | HB_ACODEC_FFAAC | HB_ACODEC_DCA_HD | HB_ACODEC_AC3 | HB_ACODEC_DCA);

+	    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_ANY = (HB_ACODEC_MASK | HB_ACODEC_PASS_FLAG);
 

+        // Subtitle Types

 		public const int HB_SUBSTREAM_BD_TRUEHD = 0x72;

 		public const int HB_SUBSTREAM_BD_AC3 = 0x76;

 		public const int HB_SUBSTREAM_BD_DTSHD = 0x72;

 		public const int HB_SUBSTREAM_BD_DTS = 0x71;

 

+        // Video Encoders

 		public const int HB_VCODEC_MASK = 0x0000FF;

 		public const int HB_VCODEC_X264 = 0x000001;

 		public const int HB_VCODEC_THEORA = 0x000002;

@@ -52,6 +56,7 @@ namespace HandBrake.Interop.HbLib
 		public const int HB_VCODEC_FFMPEG_MPEG2 = 0x000020;

 		public const int HB_VCODEC_FFMPEG_MASK = 0x0000F0;

 

+        // Muxers

 		public const int HB_MUX_MASK = 0xFF0000;

 		public const int HB_MUX_MP4 = 0x010000;

 		public const int HB_MUX_MKV = 0x200000;