Add support to manicure for decomb custom and fast; update the AppleTV 3 CLI preset.

git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.9.x@4856 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/scripts/manicure.rb b/scripts/manicure.rb
index 8f7b063e009ba44b927e4c05e5c6570e47c88edf..f70205f947e3476c481c300eab97419c3c84f92e 100755 (executable)
--- a/scripts/manicure.rb
+++ b/scripts/manicure.rb
@@ -543,9 +543,17 @@ class Display
         commandString << " --denoise=\"strong\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
       
     end
     
@@ -873,9 +881,18 @@ class Display
         commandString << " --denoise=\"strong\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
+      
     end
 
     #Anamorphic
@@ -1213,13 +1230,23 @@ class Display
         commandString << "denoise_opt = \"7:7:5:5\";\n    "
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << "decomb = 1;\n    "
+        commandString << "decomb_opt = strdup(\"" << hash["PictureDecombCustom"].to_s << "\");\n    "
+      when 2
+        commandString << "decomb = 1;\n    "
+      when 3
+        commandString << "decomb = 1;\n    "
+        commandString << "decomb_opt = strdup(\"7:2:6:9:1:80\");\n    "
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << "detelecine = 1;\n    " end
       if hash["PictureDeblock"] != 0
         then
           commandString << "deblock = 1;\n    "
           commandString << "deblock_opt = \"" << hash["PictureDeblock"].to_s << "\";\n    "
         end
-      if hash["PictureDecomb"] == 2 then commandString << "decomb = 1;\n    " end
       
     end
     
@@ -1553,9 +1580,18 @@ class Display
         commandString << " --denoise=\\\"strong\\\""
       end
       
+      case hash["PictureDecomb"]
+      when 1
+        commandString << " --decomb=\\\"" << hash["PictureDecombCustom"].to_s << "\\\""
+      when 2
+        commandString << " --decomb"
+      when 3
+        commandString << " --decomb=\\\"7:2:6:9:1:80\\\""
+      end
+      
       if hash["PictureDetelecine"] == 2 then commandString << " --detelecine" end
       if hash["PictureDeblock"] != 0 then commandString << " --deblock=" << hash["PictureDeblock"].to_s end
-      if hash["PictureDecomb"] == 2 then commandString << " --decomb" end
+      
     end
     
     #Anamorphic

diff --git a/test/test.c b/test/test.c
index 6bc48bbd1430803c2cc66053cdb4f6c36a8eb7ba..5f156703dcaa0684c2c60a9f00233dfd19ea8a91 100644 (file)
--- a/test/test.c
+++ b/test/test.c
@@ -1040,6 +1040,8 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         advanced_opts = strdup("b-adapt=2");
                     }
+                    decomb = 1;
+                    decomb_opt = strdup("7:2:6:9:1:80");
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
@@ -3033,7 +3035,7 @@ static void ShowPresets()
     
     printf("\n   + AppleTV 2:  -e x264  -q 20.0 -r 29.97 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
     
-    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1920 --loose-anamorphic -m -x b-adapt=2\n");
+    printf("\n   + AppleTV 3:  -e x264  -q 20.0 -r 30 --pfr  -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 -X 1920 --decomb=\"7:2:6:9:1:80\" --loose-anamorphic -m -x b-adapt=2\n");
     
     printf("\n   + Android Mid:  -e x264  -q 22.0 -r 29.97 --pfr  -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");