Update CLI and LinGUI presets, patch by Rodeo

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

2 files changed, 134 insertions, 149 deletions

diff --git a/gtk/src/standard_presets.xml b/gtk/src/standard_presets.xml
index 6e13b69ce..889173769 100644
--- a/gtk/src/standard_presets.xml
+++ b/gtk/src/standard_presets.xml
@@ -182,8 +182,6 @@
 				<string>vfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
-				<key>VideoQualitySlider</key>
-				<real>0.64709997177124023</real>
 				<key>VideoQualityType</key>
 				<integer>1</integer>
 				<key>VideoTwoPass</key>
@@ -652,27 +650,12 @@
 				<key>x264Option</key>
 				<string></string>
 			</dict>
-		</array>
-		<key>Default</key>
-		<integer>0</integer>
-		<key>Folder</key>
-		<true/>
-		<key>PresetBuildNumber</key>
-		<integer>2010122101</integer>
-		<key>PresetName</key>
-		<string>Apple</string>
-		<key>Type</key>
-		<integer>0</integer>
-	</dict>
-	<dict>
-		<key>ChildrenArray</key>
-		<array>
 			<dict>
 				<key>AudioList</key>
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
-						<string>160</string>
+						<string>128</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
 						<key>AudioMixdown</key>
@@ -686,11 +669,15 @@
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>Default</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Mp4LargeFile</key>
+				<integer>0</integer>
+				<key>Mp4iPodCompatible</key>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
@@ -706,21 +693,21 @@
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
 				<key>PicturePAR</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>PictureRightCrop</key>
 				<integer>0</integer>
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>0</integer>
+				<integer>480</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's normal, default settings.</string>
+				<string>HandBrake's settings for Mid-range Android 2.3 or better devices.</string>
 				<key>PresetName</key>
-				<string>Normal</string>
+				<string>Android Mid</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -728,36 +715,34 @@
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>2</integer>
+				<integer>1</integer>
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>1500</string>
+				<string>960</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>29.97 (NTSC Video)</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>20</real>
+				<real>22</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
-				<key>VideoTurboTwoPass</key>
-				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0</string>
+				<string>cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0</string>
 			</dict>
 			<dict>
 				<key>AudioList</key>
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
-						<string>160</string>
+						<string>128</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
 						<key>AudioMixdown</key>
@@ -769,45 +754,29 @@
 						<key>AudioTrackDRCSlider</key>
 						<real>0.0</real>
 					</dict>
-					<dict>
-						<key>AudioBitrate</key>
-						<string>160</string>
-						<key>AudioEncoder</key>
-						<string>AC3 Passthru</string>
-						<key>AudioMixdown</key>
-						<string>AC3 Passthru</string>
-						<key>AudioSamplerate</key>
-						<string>Auto</string>
-						<key>AudioTrack</key>
-						<integer>1</integer>
-						<key>AudioTrackDRCSlider</key>
-						<real>0.0</real>
-					</dict>
 				</array>
 				<key>ChapterMarkers</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>Default</key>
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
+				<key>Folder</key>
+				<false/>
 				<key>Mp4LargeFile</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
-				<key>PictureDecomb</key>
-				<integer>2</integer>
-				<key>PictureDecombDeinterlace</key>
-				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<integer>2</integer>
+				<integer>0</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -821,11 +790,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>0</integer>
+				<integer>720</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles.</string>
+				<string>HandBrake's preset for the Higher end Anroid 2.3 or better devices.</string>
 				<key>PresetName</key>
-				<string>High Profile</string>
+				<string>Android High</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -833,27 +802,27 @@
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>2</integer>
+				<integer>1</integer>
+				<key>VFR</key>
+				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>1800</string>
+				<string>2500</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
-				<string>Same as source</string>
+				<string>29.97 (NTSC Video)</string>
 				<key>VideoFramerateMode</key>
-				<string>vfr</string>
+				<string>pfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>20</real>
+				<real>22</real>
 				<key>VideoQualityType</key>
 				<integer>2</integer>
-				<key>VideoTurboTwoPass</key>
-				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>b-adapt=2:rc-lookahead=50</string>
+				<string>weightp=0:cabac=0</string>
 			</dict>
 		</array>
 		<key>Default</key>
@@ -861,9 +830,9 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2010122101</integer>
+		<integer>2011072401</integer>
 		<key>PresetName</key>
-		<string>Regular</string>
+		<string>Devices</string>
 		<key>Type</key>
 		<integer>0</integer>
 	</dict>
@@ -889,9 +858,9 @@
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>Default</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
 				<key>PictureAutoCrop</key>
@@ -909,11 +878,11 @@
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
 				<key>PicturePAR</key>
-				<integer>0</integer>
+				<integer>1</integer>
 				<key>PictureRightCrop</key>
 				<integer>0</integer>
 				<key>PictureTopCrop</key>
@@ -921,9 +890,9 @@
 				<key>PictureWidth</key>
 				<integer>0</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's traditional, faster, lower-quality settings.</string>
+				<string>HandBrake's normal, default settings.</string>
 				<key>PresetName</key>
-				<string>Classic</string>
+				<string>Normal</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -935,9 +904,9 @@
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>1000</string>
+				<string>1500</string>
 				<key>VideoEncoder</key>
-				<string>MPEG-4 (FFmpeg)</string>
+				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
 				<string>Same as source</string>
 				<key>VideoFramerateMode</key>
@@ -945,13 +914,15 @@
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>0.64709997177124023</real>
+				<real>20</real>
 				<key>VideoQualityType</key>
-				<integer>1</integer>
+				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string></string>
+				<string>ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0</string>
 			</dict>
 			<dict>
 				<key>AudioList</key>
@@ -999,12 +970,16 @@
 				<integer>0</integer>
 				<key>PictureDeblock</key>
 				<integer>0</integer>
+				<key>PictureDecomb</key>
+				<integer>2</integer>
+				<key>PictureDecombDeinterlace</key>
+				<integer>1</integer>
 				<key>PictureDeinterlace</key>
 				<integer>0</integer>
 				<key>PictureDenoise</key>
 				<integer>0</integer>
 				<key>PictureDetelecine</key>
-				<integer>0</integer>
+				<integer>2</integer>
 				<key>PictureHeight</key>
 				<integer>0</integer>
 				<key>PictureKeepRatio</key>
@@ -1012,7 +987,7 @@
 				<key>PictureLeftCrop</key>
 				<integer>0</integer>
 				<key>PicturePAR</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>PictureRightCrop</key>
 				<integer>0</integer>
 				<key>PictureTopCrop</key>
@@ -1020,9 +995,9 @@
 				<key>PictureWidth</key>
 				<integer>0</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's deprecated settings for the AppleTV, including Dolby Digital 5.1 AC3 sound. Provides a good balance between quality and file size, and optimizes performance. This is the AppleTV preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>
+				<string>HandBrake's general-purpose preset for High Profile H.264 video, with all the bells and whistles.</string>
 				<key>PresetName</key>
-				<string>AppleTV Legacy</string>
+				<string>High Profile</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -1031,10 +1006,8 @@
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
 				<integer>2</integer>
-				<key>VFR</key>
-				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>2500</string>
+				<string>1800</string>
 				<key>VideoEncoder</key>
 				<string>H.264 (x264)</string>
 				<key>VideoFramerate</key>
@@ -1044,20 +1017,37 @@
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
 				<key>VideoQualitySlider</key>
-				<real>0.64709997177124023</real>
+				<real>20</real>
 				<key>VideoQualityType</key>
-				<integer>1</integer>
+				<integer>2</integer>
+				<key>VideoTurboTwoPass</key>
+				<integer>0</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>ref=1:b-pyramid=none:weightp=0:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0</string>
+				<string>b-adapt=2:rc-lookahead=50</string>
 			</dict>
+		</array>
+		<key>Default</key>
+		<integer>0</integer>
+		<key>Folder</key>
+		<true/>
+		<key>PresetBuildNumber</key>
+		<integer>2011072401</integer>
+		<key>PresetName</key>
+		<string>Regular</string>
+		<key>Type</key>
+		<integer>0</integer>
+	</dict>
+	<dict>
+		<key>ChildrenArray</key>
+		<array>
 			<dict>
 				<key>AudioList</key>
 				<array>
 					<dict>
 						<key>AudioBitrate</key>
-						<string>128</string>
+						<string>160</string>
 						<key>AudioEncoder</key>
 						<string>AAC (faac)</string>
 						<key>AudioMixdown</key>
@@ -1071,13 +1061,11 @@
 					</dict>
 				</array>
 				<key>ChapterMarkers</key>
-				<integer>1</integer>
+				<integer>0</integer>
 				<key>Default</key>
 				<integer>0</integer>
 				<key>FileFormat</key>
 				<string>MP4 file</string>
-				<key>Mp4iPodCompatible</key>
-				<integer>1</integer>
 				<key>PictureAutoCrop</key>
 				<integer>1</integer>
 				<key>PictureBottomCrop</key>
@@ -1103,11 +1091,11 @@
 				<key>PictureTopCrop</key>
 				<integer>0</integer>
 				<key>PictureWidth</key>
-				<integer>480</integer>
+				<integer>0</integer>
 				<key>PresetDescription</key>
-				<string>HandBrake's deprecated settings for the iPhone and iPod Touch. This is the iPhone preset from HandBrake 0.9.2, and while it is offered as a service to legacy users, it is no longer supported.</string>
+				<string>HandBrake's traditional, faster, lower-quality settings.</string>
 				<key>PresetName</key>
-				<string>iPhone Legacy</string>
+				<string>Classic</string>
 				<key>Subtitles</key>
 				<string>None</string>
 				<key>Type</key>
@@ -1115,27 +1103,25 @@
 				<key>UsesPictureFilters</key>
 				<integer>1</integer>
 				<key>UsesPictureSettings</key>
-				<integer>1</integer>
+				<integer>2</integer>
 				<key>VFR</key>
 				<integer>0</integer>
 				<key>VideoAvgBitrate</key>
-				<string>960</string>
+				<string>1000</string>
 				<key>VideoEncoder</key>
-				<string>H.264 (x264)</string>
+				<string>MPEG-4 (FFmpeg)</string>
 				<key>VideoFramerate</key>
 				<string>Same as source</string>
 				<key>VideoFramerateMode</key>
 				<string>vfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
-				<key>VideoQualitySlider</key>
-				<real>0.64709997177124023</real>
 				<key>VideoQualityType</key>
 				<integer>1</integer>
 				<key>VideoTwoPass</key>
 				<integer>0</integer>
 				<key>x264Option</key>
-				<string>level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0</string>
+				<string></string>
 			</dict>
 			<dict>
 				<key>AudioList</key>
@@ -1213,8 +1199,6 @@
 				<string>vfr</string>
 				<key>VideoGrayScale</key>
 				<integer>0</integer>
-				<key>VideoQualitySlider</key>
-				<real>0.64709997177124023</real>
 				<key>VideoQualityType</key>
 				<integer>1</integer>
 				<key>VideoTwoPass</key>
@@ -1228,7 +1212,7 @@
 		<key>Folder</key>
 		<true/>
 		<key>PresetBuildNumber</key>
-		<integer>2010122101</integer>
+		<integer>2011072401</integer>
 		<key>PresetName</key>
 		<string>Legacy</string>
 		<key>Type</key>
diff --git a/test/test.c b/test/test.c
index ec72f9f78..c6fb92ef1 100644
--- a/test/test.c
+++ b/test/test.c
@@ -935,14 +935,16 @@ static int HandleEvents( hb_handle_t * h )
                     
                 }
 
-                if (!strcmp(preset_name, "Normal"))
+                if (!strcmp(preset_name, "Android Mid"))
                 {
                     if( !mux )
                     {
                         mux = HB_MUX_MP4;
                     }
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 20.0;
+                    job->vquality = 22.0;
+                    job->vrate_base = 900900;
+                    job->cfr = 2;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -953,7 +955,7 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     if( !abitrates )
                     {
-                        abitrates = strdup("160");
+                        abitrates = strdup("128");
                     }
                     if( !mixdowns )
                     {
@@ -967,72 +969,68 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
+                    maxWidth = 480;
                     if( !advanced_opts )
                     {
-                        advanced_opts = strdup("ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0");
-                    }
-                    if( !anamorphic_mode )
-                    {
-                        anamorphic_mode = 1;
+                        advanced_opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
                     }
-                    job->chapter_markers = 1;
                     
                 }
 
-                if (!strcmp(preset_name, "High Profile"))
+                if (!strcmp(preset_name, "Android High"))
                 {
                     if( !mux )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 20.0;
+                    job->vquality = 22.0;
+                    job->vrate_base = 900900;
+                    job->cfr = 2;
                     if( !atracks )
                     {
-                        atracks = strdup("1,1");
+                        atracks = strdup("1");
                     }
                     if( !acodecs )
                     {
-                        acodecs = strdup("faac,copy:ac3");
+                        acodecs = strdup("faac");
                     }
                     if( !abitrates )
                     {
-                        abitrates = strdup("160,160");
+                        abitrates = strdup("128");
                     }
                     if( !mixdowns )
                     {
-                        mixdowns = strdup("dpl2,auto");
+                        mixdowns = strdup("dpl2");
                     }
                     if( !arates )
                     {
-                        arates = strdup("Auto,Auto");
+                        arates = strdup("Auto");
                     }
                     if( !dynamic_range_compression )
                     {
-                        dynamic_range_compression = strdup("0.0,0.0");
+                        dynamic_range_compression = strdup("0.0");
                     }
+                    maxWidth = 720;
                     if( !advanced_opts )
                     {
-                        advanced_opts = strdup("b-adapt=2:rc-lookahead=50");
+                        advanced_opts = strdup("weightp=0:cabac=0");
                     }
-                    detelecine = 1;
-                    decomb = 1;
                     if( !anamorphic_mode )
                     {
                         anamorphic_mode = 2;
                     }
-                    job->chapter_markers = 1;
                     
                 }
 
-                if (!strcmp(preset_name, "Classic"))
+                if (!strcmp(preset_name, "Normal"))
                 {
                     if( !mux )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->vbitrate = 1000;
+                    vcodec = HB_VCODEC_X264;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -1057,10 +1055,19 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
+                    if( !advanced_opts )
+                    {
+                        advanced_opts = strdup("ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0");
+                    }
+                    if( !anamorphic_mode )
+                    {
+                        anamorphic_mode = 1;
+                    }
+                    job->chapter_markers = 1;
                     
                 }
 
-                if (!strcmp(preset_name, "AppleTV Legacy"))
+                if (!strcmp(preset_name, "High Profile"))
                 {
                     if( !mux )
                     {
@@ -1068,7 +1075,7 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
+                    job->vquality = 20.0;
                     if( !atracks )
                     {
                         atracks = strdup("1,1");
@@ -1095,25 +1102,25 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     if( !advanced_opts )
                     {
-                        advanced_opts = strdup("ref=1:b-pyramid=none:weightp=0:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0");
+                        advanced_opts = strdup("b-adapt=2:rc-lookahead=50");
                     }
+                    detelecine = 1;
+                    decomb = 1;
                     if( !anamorphic_mode )
                     {
-                        anamorphic_mode = 1;
+                        anamorphic_mode = 2;
                     }
                     job->chapter_markers = 1;
                     
                 }
 
-                if (!strcmp(preset_name, "iPhone Legacy"))
+                if (!strcmp(preset_name, "Classic"))
                 {
                     if( !mux )
                     {
                         mux = HB_MUX_MP4;
                     }
-                    job->ipod_atom = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 960;
+                    job->vbitrate = 1000;
                     if( !atracks )
                     {
                         atracks = strdup("1");
@@ -1124,7 +1131,7 @@ static int HandleEvents( hb_handle_t * h )
                     }
                     if( !abitrates )
                     {
-                        abitrates = strdup("128");
+                        abitrates = strdup("160");
                     }
                     if( !mixdowns )
                     {
@@ -1138,12 +1145,6 @@ static int HandleEvents( hb_handle_t * h )
                     {
                         dynamic_range_compression = strdup("0.0");
                     }
-                    maxWidth = 480;
-                    if( !advanced_opts )
-                    {
-                        advanced_opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
-                    }
-                    job->chapter_markers = 1;
                     
                 }
 
@@ -2734,7 +2735,7 @@ static void ShowPresets()
 {
     fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
 
-    printf("\n< Apple\n");
+    printf("\n< Devices\n");
 
     printf("\n   + Universal:  -e x264  -q 20.0 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -X 720 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:8x8dct=0:trellis=0:subme=6\n");
 
@@ -2750,6 +2751,10 @@ 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   + 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");
+
+    printf("\n   + Android High:  -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 720 --loose-anamorphic -x weightp=0:cabac=0\n");
+
     printf("\n>\n");
 
     printf("\n< Regular\n");
@@ -2764,10 +2769,6 @@ static void ShowPresets()
 
     printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\n");
 
-    printf("\n   + AppleTV Legacy:  -e x264  -b 2500 -a 1,1 -E faac,copy:ac3 -B 160,160 -6 dpl2,auto -R Auto,Auto -D 0.0,0.0 -f mp4 -4 --strict-anamorphic -m -x ref=1:b-pyramid=none:weightp=0:subme=5:me=umh:no-fast-pskip=1:cabac=0:weightb=0:8x8dct=0:trellis=0\n");
-
-    printf("\n   + iPhone Legacy:  -e x264  -b 960 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-
     printf("\n   + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 640 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:psy-rd=0,0:subme=6:8x8dct=0:trellis=0\n");
 
     printf("\n>\n");