From 708c792ed6f40ce4a46af0e95dec32798e460570 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 11 Jun 2011 17:24:43 +0000 Subject: WinGui: Added support for the new ffmpeg aac encoder. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4041 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/Controls/AudioPanel.Designer.cs | 1 + win/CS/Controls/AudioPanel.cs | 5 ++++- win/CS/Controls/AudioPanel.resx | 3 --- win/CS/Functions/QueryGenerator.cs | 2 ++ win/CS/HandBrake.ApplicationServices/Functions/Converters.cs | 9 +++++++++ .../HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs | 3 +++ win/CS/frmMain.Designer.cs | 1 + win/CS/frmMain.resx | 8 ++++---- 8 files changed, 24 insertions(+), 8 deletions(-) (limited to 'win/CS') diff --git a/win/CS/Controls/AudioPanel.Designer.cs b/win/CS/Controls/AudioPanel.Designer.cs index 368cbe679..9c7e37c5e 100644 --- a/win/CS/Controls/AudioPanel.Designer.cs +++ b/win/CS/Controls/AudioPanel.Designer.cs @@ -151,6 +151,7 @@ namespace Handbrake.Controls this.drp_audioEncoder.FormattingEnabled = true; this.drp_audioEncoder.Items.AddRange(new object[] { "AAC (faac)", + "AAC (ffmpeg)", "MP3 (lame)", "Vorbis (vorbis)", "AC3 Passthru", diff --git a/win/CS/Controls/AudioPanel.cs b/win/CS/Controls/AudioPanel.cs index 66b25c5b0..d68650ad7 100644 --- a/win/CS/Controls/AudioPanel.cs +++ b/win/CS/Controls/AudioPanel.cs @@ -122,6 +122,7 @@ namespace Handbrake.Controls drp_audioEncoder.Items.Clear(); drp_audioEncoder.Items.Add(EnumHelper.GetDescription(AudioEncoder.Faac)); + drp_audioEncoder.Items.Add(EnumHelper.GetDescription(AudioEncoder.ffaac)); drp_audioEncoder.Items.Add(EnumHelper.GetDescription(AudioEncoder.Lame)); drp_audioEncoder.Items.Add(EnumHelper.GetDescription(AudioEncoder.Ac3Passthrough)); drp_audioEncoder.Items.Add(EnumHelper.GetDescription(AudioEncoder.Ac3)); @@ -737,9 +738,10 @@ namespace Handbrake.Controls switch (drp_audioEncoder.Text) { case "AAC (faac)": + case "AAC (ffmpeg)": max = drp_audioMix.Text.Contains("6 Channel") ? 768 : 320; defaultRate = "160"; - break; + break; case "MP3 (lame)": max = 320; defaultRate = "160"; @@ -821,6 +823,7 @@ namespace Handbrake.Controls switch (drp_audioEncoder.Text) { case "AAC (faac)": + case "AAC (ffmpeg)": drp_audioMix.Items.Remove(AC3Passthru); drp_audioMix.Items.Remove(DTSPassthru); drp_audioMix.SelectedItem = currentMixdown ?? "Dolby Pro Logic II"; diff --git a/win/CS/Controls/AudioPanel.resx b/win/CS/Controls/AudioPanel.resx index 322973989..f6e59c9fa 100644 --- a/win/CS/Controls/AudioPanel.resx +++ b/win/CS/Controls/AudioPanel.resx @@ -147,9 +147,6 @@ True - - 330, 16 - 427, 16 diff --git a/win/CS/Functions/QueryGenerator.cs b/win/CS/Functions/QueryGenerator.cs index acbc7a3f1..1c84fa37c 100644 --- a/win/CS/Functions/QueryGenerator.cs +++ b/win/CS/Functions/QueryGenerator.cs @@ -568,6 +568,8 @@ namespace Handbrake.Functions { case "AAC (faac)": return "faac"; + case "AAC (ffmpeg)": + return "ffaac"; case "MP3 (lame)": return "lame"; case "Vorbis (vorbis)": diff --git a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs index 2259abb8c..c973128d6 100644 --- a/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs +++ b/win/CS/HandBrake.ApplicationServices/Functions/Converters.cs @@ -140,6 +140,8 @@ namespace HandBrake.ApplicationServices.Functions return "AC3 Passthru"; case "copy:dts": return "DTS Passthru"; + case "ffaac": + return "AAC (ffmpeg)"; default: return "AAC (faac)"; } @@ -156,6 +158,8 @@ namespace HandBrake.ApplicationServices.Functions { case "faac": return AudioEncoder.Faac; + case "ffaac": + return AudioEncoder.ffaac; case "lame": return AudioEncoder.Lame; case "vorbis": @@ -182,6 +186,8 @@ namespace HandBrake.ApplicationServices.Functions { case "AAC (faac)": return AudioEncoder.Faac; + case "AAC (ffmpeg)": + return AudioEncoder.ffaac; case "AAC (CoreAudio)": return AudioEncoder.Faac; case "MP3 (lame)": @@ -214,6 +220,8 @@ namespace HandBrake.ApplicationServices.Functions { case AudioEncoder.Faac: return "faac"; + case AudioEncoder.ffaac: + return "ffaac"; case AudioEncoder.Lame: return "lame"; case AudioEncoder.Vorbis: @@ -224,6 +232,7 @@ namespace HandBrake.ApplicationServices.Functions return "copy:dts"; case AudioEncoder.Ac3: return "ac3"; + default: return "faac"; } diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs index 716f539f8..9925c4298 100644 --- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs +++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/AudioEncoder.cs @@ -15,6 +15,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding [Description("AAC (faac)")] Faac = 0, + [Description("AAC (ffmpeg)")] + ffaac, + [Description("MP3 (lame)")] Lame, diff --git a/win/CS/frmMain.Designer.cs b/win/CS/frmMain.Designer.cs index 6f634b683..ec2dda043 100644 --- a/win/CS/frmMain.Designer.cs +++ b/win/CS/frmMain.Designer.cs @@ -825,6 +825,7 @@ namespace Handbrake this.AudioSettings.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.AudioSettings.Location = new System.Drawing.Point(0, 0); this.AudioSettings.Name = "AudioSettings"; + this.AudioSettings.ScannedTracks = ((System.ComponentModel.BindingList)(resources.GetObject("AudioSettings.ScannedTracks"))); this.AudioSettings.Size = new System.Drawing.Size(715, 310); this.AudioSettings.TabIndex = 0; // diff --git a/win/CS/frmMain.resx b/win/CS/frmMain.resx index b1ce84a3b..f38d530d2 100644 --- a/win/CS/frmMain.resx +++ b/win/CS/frmMain.resx @@ -238,17 +238,17 @@ to make bitrate allocation decisions. AAEAAAD/////AQAAAAAAAAAMAgAAAElTeXN0ZW0sIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1uZXV0 cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAACrAVN5c3RlbS5Db21wb25lbnRN b2RlbC5CaW5kaW5nTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1 - ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkzLCBDdWx0 + ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQwLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQgAAAAJYWRkTmV3UG9zFnJhaXNlTGlzdENo YW5nZWRFdmVudHMWcmFpc2VJdGVtQ2hhbmdlZEV2ZW50cwhhbGxvd05ldwlhbGxvd0VkaXQLYWxsb3dS ZW1vdmUPdXNlclNldEFsbG93TmV3EkNvbGxlY3Rpb25gMStpdGVtcwAAAAAAAAADCAEBAQEBAakBU3lz dGVtLkNvbGxlY3Rpb25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNl cy5QYXJzaW5nLkF1ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjku - NS4zOTkzLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA - CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkz + NS40MDQwLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQIAAAD/////AQABAQEA + CQMAAAAMBAAAAFdIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQw LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGwEAwAAAKkBU3lzdGVtLkNvbGxlY3Rp b25zLkdlbmVyaWMuTGlzdGAxW1tIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcy5QYXJzaW5nLkF1 - ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS4zOTkzLCBDdWx0 + ZGlvLCBIYW5kQnJha2UuQXBwbGljYXRpb25TZXJ2aWNlcywgVmVyc2lvbj0wLjkuNS40MDQwLCBDdWx0 dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPW51bGxdXQMAAAAGX2l0ZW1zBV9zaXplCF92ZXJzaW9u BAAALUhhbmRCcmFrZS5BcHBsaWNhdGlvblNlcnZpY2VzLlBhcnNpbmcuQXVkaW9bXQQAAAAICAkFAAAA AQAAAAEAAAAHBQAAAAABAAAABAAAAAQrSGFuZEJyYWtlLkFwcGxpY2F0aW9uU2VydmljZXMuUGFyc2lu -- cgit v1.2.3