manicure: add support for more audio encoders.

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

1 files changed, 65 insertions, 15 deletions

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 4978feee1..9e83750bf 100755
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -349,18 +349,28 @@ class Display
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -723,18 +733,28 @@ class Display
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -1099,18 +1119,28 @@ class Display
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end
@@ -1216,16 +1246,26 @@ class Display
     case hash["AudioEncoderFallback"]
       when /AC3/
         audioEncoderFallback << "ffac3"
+      when "AAC (FDK)"
+        audioEncoderFallback << "fdk_aac"
+      when "AAC (faac)"
+        audioEncoderFallback << "faac"
       when "AAC (ffmpeg)"
         audioEncoderFallback << "ffaac"
-      when /AAC/
-        audioEncoderFallback << "faac"
+      when "AAC (CoreAudio)"
+        audioEncoderFallback << "ca_aac"
+      when "HE-AAC (FDK)"
+        audioEncoderFallback << "fdk_haac"
+      when "HE-AAC (CoreAudio)"
+        audioEncoderFallback << "ca_haac"
       when /Vorbis/
         audioEncoderFallback << "vorbis"
       when /MP3/
         audioEncoderFallback << "lame"
-      when /FLAC/
+      when "FLAC (ffmpeg)"
         audioEncoderFallback << "ffflac"
+      when "FLAC (24-bit)"
+        audioEncoderFallback << "ffflac24"
     end
     
     if audioEncoderFallback.size > 0
@@ -1525,18 +1565,28 @@ class Display
           audioEncoders << "copy:dtshd"
         when /AAC Pass/
           audioEncoders << "copy:aac"
+        when "AAC (FDK)"
+          audioEncoders << "fdk_aac"
+        when "AAC (faac)"
+          audioEncoders << "faac"
         when "AAC (ffmpeg)"
           audioEncoders << "ffaac"
-        when /AAC/
-          audioEncoders << "faac"
+        when "AAC (CoreAudio)"
+          audioEncoders << "ca_aac"
+        when "HE-AAC (FDK)"
+          audioEncoders << "fdk_haac"
+        when "HE-AAC (CoreAudio)"
+          audioEncoders << "ca_haac"
         when /Vorbis/
           audioEncoders << "vorbis"
         when /MP3 Pass/
           audioEncoders << "copy:mp3"
         when /MP3/
           audioEncoders << "lame"
-        when /FLAC/
+        when "FLAC (ffmpeg)"
           audioEncoders << "ffflac"
+        when "FLAC (24-bit)"
+          audioEncoders << "ffflac24"
         when /Auto Pass/
           audioEncoders << "copy"
       end