Macgui: update built in presets to comply with the new x264 encoder and Add iPod...

- Use "Update Built In Presets" to , well update your built in presets
- No behavioral change in gui as preset code is backwards compatible to presets create using the old dropdown values.

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

diff --git a/macosx/HBPresets.m b/macosx/HBPresets.m
index f2534685fcb52262ba594357affa3faa4ea6b832..1e496ad920d1279169a183205b0860b09999a58c 100644 (file)
--- a/macosx/HBPresets.m
+++ b/macosx/HBPresets.m
@@ -77,8 +77,8 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
-
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
+    
     /* x264 Option String */
     [preset setObject:@"level=40:ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip:filter=-2,-1" forKey:@"x264Option"];
 
@@ -162,7 +162,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=5:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=5:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2" forKey:@"x264Option"];
@@ -250,7 +250,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String (We can use this to tweak the appleTV output)*/
     [preset setObject:@"bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=1:cabac=0" forKey:@"x264Option"];
@@ -335,7 +335,7 @@
     [preset setObject:@"AVC/H.264 Video / AC-3 Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:me-range=64:analyse=all:8x8dct:trellis=2:no-fast-pskip:no-dct-decimate:filter=-2,-1" forKey:@"x264Option"];
@@ -509,7 +509,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:subme=6:trellis=1:analyse=all:8x8dct:no-fast-pskip" forKey:@"x264Option"];
@@ -682,7 +682,7 @@
     [preset setObject:@"AVC/H.264 Video / AC-3 Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:subme=6:trellis=1:analyse=all:8x8dct:me=umh" forKey:@"x264Option"];
@@ -769,7 +769,7 @@
     [preset setObject:@"AVC/H.264 Video / AC-3 Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip" forKey:@"x264Option"];
@@ -856,7 +856,7 @@
     [preset setObject:@"AVC/H.264 Video / AC-3 Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip" forKey:@"x264Option"];
@@ -943,8 +943,8 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
-
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"level=30:cabac=0:ref=1:analyse=all:me=umh:subme=6:no-fast-pskip=1:trellis=1" forKey:@"x264Option"];
 
@@ -1029,8 +1029,8 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
-
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
 
@@ -1115,8 +1115,8 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 iPod)" forKey:@"VideoEncoder"];
-
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
+    [preset setObject:[NSNumber numberWithInt:1] forKey:@"Mp4iPodCompatible"];
     /* x264 Option String */
     [preset setObject:@"level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:subme=6:no-fast-pskip=1" forKey:@"x264Option"];
 
@@ -1201,7 +1201,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=2:bframes=2:subme=5:me=umh" forKey:@"x264Option"];
@@ -1374,7 +1374,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String (We can use this to tweak the appleTV output)*/
     [preset setObject:@"level=41:subme=5:me=umh" forKey:@"x264Option"];
@@ -1459,7 +1459,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:subme=5:analyse=all:trellis=1:no-fast-pskip" forKey:@"x264Option"];
@@ -1546,7 +1546,7 @@
     [preset setObject:@"AVC/H.264 Video / AAC Audio" forKey:@"FileCodecs"];
 
     /* Video encoder */
-    [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"];
+    [preset setObject:@"x264" forKey:@"VideoEncoder"];
 
     /* x264 Option String */
     [preset setObject:@"ref=3:mixed-refs:bframes=16:bime:weightb:direct=auto:b-pyramid:me=umh:subme=6:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip" forKey:@"x264Option"];