CLI: first try at nested presets *fingers crossed*

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

1 files changed, 185 insertions, 165 deletions

diff --git a/test/test.c b/test/test.c
index a92be42f5..0c484163c 100644
--- a/test/test.c
+++ b/test/test.c
@@ -476,232 +476,235 @@ static int HandleEvents( hb_handle_t * h )
             {
                 fprintf( stderr, "+ Using preset: %s", preset_name);
 
-                if (!strcmp(preset_name, "Animation"))
+                if (!strcmp(preset_name, "Universal"))
                 {
-                    mux = HB_MUX_MKV;
+                    mux = HB_MUX_MP4;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2");
-                    deinterlace = 1;
-                    deinterlace_opt = "0";
+                    job->vquality = 0.589999973773956;
+                    job->crf = 1;
+                    atracks = strdup("1,1");
+                    abitrates = strdup("160,auto");
+                    arates = strdup("48,Auto");
+                    acodecs = strdup("faac,ac3");
+                    mixdowns = strdup("dpl2,auto");
+                    maxWidth = 720;
+                    x264opts = strdup("level=30:cabac=0:ref=3:mixed-refs=1:analyse=all:me=umh:no-fast-pskip=1:subme=8");
+                    pixelratio = 2;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
                 if (!strcmp(preset_name, "AppleTV"))
                 {
-                    if (!acodecs)
-                    {
-                        acodecs = strdup("faac,ac3");
-                    }
-
                     mux = HB_MUX_MP4;
                     job->largeFileSize = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0");
+                    job->vquality = 0.589999973773956;
+                    job->crf = 1;
+                    atracks = strdup("1,1");
+                    abitrates = strdup("160,auto");
+                    arates = strdup("48,Auto");
+                    acodecs = strdup("faac,ac3");
+                    mixdowns = strdup("dpl2,auto");
+                    maxWidth = 960;
+                    x264opts = strdup("level=30:cabac=0:ref=3:mixed-refs=1:bframes=6:weightb=1:direct=auto:no-fast-pskip=1:me=umh:subq=9:analyse=all");
+                    pixelratio = 2;
                     job->chapter_markers = 1;
-                    pixelratio = 1;
                 }
 
-                if (!strcmp(preset_name, "Bedlam"))
+                if (!strcmp(preset_name, "iPod Classic & iPod Nano"))
                 {
-                    mux = HB_MUX_MKV;
+                    mux = HB_MUX_MP4;
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1");
+                    job->vbitrate = 700;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    maxWidth = 320;
+                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
                     job->chapter_markers = 1;
-                    pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Blind"))
+                if (!strcmp(preset_name, "iPhone & iPod Touch"))
                 {
                     mux = HB_MUX_MP4;
-                    job->vbitrate = 512;
-                    default_abitrate = 128;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 512;
+                    job->ipod_atom = 1;
+                    vcodec = HB_VCODEC_X264;
+                    job->vbitrate = 960;
+                    atracks = strdup("1");
+                    abitrates = strdup("128");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    maxWidth = 480;
+                    x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1");
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Broke"))
+                if (!strcmp(preset_name, "iPod Legacy"))
                 {
                     mux = HB_MUX_MP4;
+                    job->ipod_atom = 1;
                     vcodec = HB_VCODEC_X264;
-                    size = 695;
-                    default_abitrate = 128;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 640;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip");
+                    job->vbitrate = 1500;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    maxWidth = 640;
+                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
                     job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Classic"))
+                if (!strcmp(preset_name, "QuickTime"))
                 {
                     mux = HB_MUX_MP4;
-                    job->vbitrate = 1000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                }
-
-                if (!strcmp(preset_name, "Constant Quality Rate"))
-                {
-                    mux = HB_MUX_MKV;
                     vcodec = HB_VCODEC_X264;
-                    job->vquality = 0.64709997177124023;
-                    job->crf = 1;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh");
-                    job->chapter_markers = 1;
+                    job->vbitrate = 1800;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("Auto");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    x264opts = strdup("ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip=1:psy-rd=1,1");
                     pixelratio = 1;
-                }
-
-                if (!strcmp(preset_name, "Deux Six Quatre"))
-                {
-                    mux = HB_MUX_MKV;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1600;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip");
                     job->chapter_markers = 1;
-                    pixelratio = 1;
                     twoPass = 1;
                     turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "Film"))
+                if (!strcmp(preset_name, "Normal"))
                 {
-                    mux = HB_MUX_MKV;
+                    mux = HB_MUX_MP4;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1800;
-                    default_acodec = HB_ACODEC_AC3;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip");
-                    job->chapter_markers = 1;
+                    job->vbitrate = 1500;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("Auto");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    x264opts = strdup("ref=2:bframes=2:me=umh");
                     pixelratio = 1;
+                    job->chapter_markers = 1;
                     twoPass = 1;
                     turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "iPhone / iPod Touch"))
+                if (!strcmp(preset_name, "Classic"))
                 {
                     mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 960;
-                    default_abitrate = 128;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 480;
-                    x264opts = strdup("level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1");
-                    job->chapter_markers = 1;
+                    job->vbitrate = 1000;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("Auto");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
                 }
 
-                if (!strcmp(preset_name, "iPod High-Rez"))
+                if (!strcmp(preset_name, "Animation"))
                 {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
+                    mux = HB_MUX_MKV;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 640;
-                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
+                    job->vbitrate = 1000;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("Auto");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    x264opts = strdup("ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2:psy-rd=1,1:subme=9");
+                    detelecine = 1;
+                    decomb = 1;
+                    pixelratio = 1;
                     job->chapter_markers = 1;
+                    twoPass = 1;
+                    turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "iPod Low-Rez"))
+                if (!strcmp(preset_name, "Constant Quality Rate"))
                 {
-                    mux = HB_MUX_MP4;
-                    job->ipod_atom = 1;
+                    mux = HB_MUX_MKV;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 700;
-                    default_abitrate = 160;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 320;
-                    x264opts = strdup("level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1");
+                    job->vquality = 0.600000023841858;
+                    job->crf = 1;
+                    atracks = strdup("1");
+                    abitrates = strdup("auto");
+                    arates = strdup("Auto");
+                    acodecs = strdup("ac3");
+                    mixdowns = strdup("auto");
+                    x264opts = strdup("ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh:subme=9:psy-rd=1,1");
+                    pixelratio = 1;
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "Normal"))
+                if (!strcmp(preset_name, "Film"))
                 {
-                    mux = HB_MUX_MP4;
+                    mux = HB_MUX_MKV;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1500;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=2:bframes=2:me=umh");
-                    job->chapter_markers = 1;
+                    job->vbitrate = 1800;
+                    atracks = strdup("1");
+                    abitrates = strdup("auto");
+                    arates = strdup("Auto");
+                    acodecs = strdup("ac3");
+                    mixdowns = strdup("auto");
+                    x264opts = strdup("ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:no-fast-pskip:psy-rd=1,1");
                     pixelratio = 1;
+                    job->chapter_markers = 1;
                     twoPass = 1;
                     turbo_opts_enabled = 1;
                 }
 
-                if (!strcmp(preset_name, "PS3"))
+                if (!strcmp(preset_name, "Television"))
                 {
-                    mux = HB_MUX_MP4;
+                    mux = HB_MUX_MKV;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2500;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("level=41:me=umh");
+                    job->vbitrate = 1300;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("Auto");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    x264opts = strdup("ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip=1:psy-rd=1,1");
+                    detelecine = 1;
+                    decomb = 1;
                     pixelratio = 1;
+                    job->chapter_markers = 1;
+                    twoPass = 1;
+                    turbo_opts_enabled = 1;
                 }
 
                 if (!strcmp(preset_name, "PSP"))
                 {
                     mux = HB_MUX_MP4;
                     job->vbitrate = 1024;
-                    default_abitrate = 128;
-                    default_arate = 48000;
-                    default_acodec = HB_ACODEC_FAAC;
-                    job->width = 368;
-                    job->height = 208;
+                    atracks = strdup("1");
+                    abitrates = strdup("128");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    maxWidth = 368;
+                    maxHeight = 208;
                     job->chapter_markers = 1;
                 }
 
-                if (!strcmp(preset_name, "QuickTime"))
+                if (!strcmp(preset_name, "PS3"))
                 {
                     mux = HB_MUX_MP4;
                     vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 2000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip");
-                    job->chapter_markers = 1;
+                    job->vbitrate = 2500;
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    job->crop[0] = 0;
+                    job->crop[1] = 0;
+                    job->crop[2] = 0;
+                    job->crop[4] - 0;
+                    x264opts = strdup("level=41:me=umh");
                     pixelratio = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
-                }
-
-                if (!strcmp(preset_name, "Television"))
-                {
-                    mux = HB_MUX_MKV;
-                    vcodec = HB_VCODEC_X264;
-                    job->vbitrate = 1300;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip");
-                    deinterlace = 1;
-                    deinterlace_opt = "0";
-                    denoise = 1;
-                    denoise_opt = "2:1:2:3";
-                    job->chapter_markers = 1;
-                    twoPass = 1;
-                    turbo_opts_enabled = 1;
                 }
 
                 if (!strcmp(preset_name, "Xbox 360"))
@@ -709,9 +712,12 @@ static int HandleEvents( hb_handle_t * h )
                     mux = HB_MUX_MP4;
                     vcodec = HB_VCODEC_X264;
                     job->vbitrate = 2000;
-                    default_abitrate = 160;
-                    default_acodec = HB_ACODEC_FAAC;
-                    x264opts = strdup("level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1");
+                    atracks = strdup("1");
+                    abitrates = strdup("160");
+                    arates = strdup("48");
+                    acodecs = strdup("faac");
+                    mixdowns = strdup("dpl2");
+                    x264opts = strdup("level=40:ref=2:mixed-refs:bframes=3:weightb:subme=7:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1");
                     pixelratio = 1;
                 }
             }
@@ -1670,41 +1676,55 @@ static void ShowHelp()
  ****************************************************************************/
 static void ShowPresets()
 {
-    printf("\n+ Animation:  -e x264 -b 1000 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" -m -p -2 -T -x ref=5:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2\n");
+    printf("\n< Apple\n");
+
+    printf("\n   + Universal:  -e x264  -q 0.589999973773956 -a 1,1 -E faac,ac3 -B 160,auto -R 48,Auto -6 dpl2,auto -f mp4 -X 720 -P -m -x level=30:cabac=0:ref=3:mixed-refs=1:analyse=all:me=umh:no-fast-pskip=1:subme=8\n");
+
+    printf("\n   + AppleTV:  -e x264  -q 0.589999973773956 -a 1,1 -E faac,ac3 -B 160,auto -R 48,Auto -6 dpl2,auto -f mp4 -4 -X 960 -P -m -x level=30:cabac=0:ref=3:mixed-refs=1:bframes=6:weightb=1:direct=auto:no-fast-pskip=1:me=umh:subq=9:analyse=all\n");
+
+    printf("\n   << iPod & iPhone\n");
+
+    printf("\n      + iPod Classic & iPod Nano:  -e x264  -b 700 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -I -X 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
+
+    printf("\n      + iPhone & iPod Touch:  -e x264  -b 960 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -I -X 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1\n");
+
+    printf("\n      + iPod Legacy:  -e x264  -b 1500 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -I -X 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
+
+    printf("\n   >>\n");
 
-    printf("\n+ AppleTV:  -e x264 -b 2500 -B 160 -R 48 -E faac,ac3 -f mp4 -4 -m -p -x bframes=3:ref=1:me=umh:no-fast-pskip=1:trellis=1:cabac=0\n");
+    printf("\n   + QuickTime:  -e x264  -b 1800 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4 -p -m -2 -T -x ref=3:mixed-refs:bframes=3:weightb:direct=auto:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip=1:psy-rd=1,1\n");
 
-    printf("\n+ Bedlam:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=16:mixed-refs:bframes=16:bime:weightb:b-rdo:direct=auto:b-pyramid:me=esa:subme=7:me-range=64:analyse=all:8x8dct:trellis=1:no-fast-pskip:no-dct-decimate:filter=-2,-1\n");
+    printf("\n>\n");
 
-    printf("\n+ Blind:  -b 512 -B 128 -R 48 -E faac -f mp4 -w 512 -m\n");
+    printf("\n< Basic\n");
 
-    printf("\n+ Broke:  -e x264 -S 695 -B 128 -R 48 -E faac -f mp4 -w 640 -m -2 -T -x ref=3:mixed-refs:bframes=16:bime:weightb:b-rdo:b-pyramid:direct=auto:me=umh:trellis=1:analyse=all:8x8dct:no-fast-pskip\n");
+    printf("\n   + Normal:  -e x264  -b 1500 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4 -p -m -2 -T -x ref=2:bframes=2:me=umh\n");
 
-    printf("\n+ Classic:  -b 1000 -B 160 -R 48 -E faac -f mp4\n");
+    printf("\n   + Classic:  -b 1000 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mp4\n");
 
-    printf("\n+ Constant Quality Rate:  -e x264 -q 0.64709997177124023 -E ac3 -f mkv -m -p -x ref=3:mixed-refs:bframes=3:b-pyramid:b-rdo:bime:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh\n");
+    printf("\n>\n");
 
-    printf("\n+ Deux Six Quatre:  -e x264 -b 1600 -E ac3 -f mkv -m -p -2 -T -x ref=5:mixed-refs:bframes=3:bime:weightb:b-rdo:b-pyramid:me=umh:subme=7:trellis=1:analyse=all:8x8dct:no-fast-pskip\n");
+    printf("\n< High Profile\n");
 
-    printf("\n+ Film:  -e x264 -b 1800 -E ac3 -f mkv -m -p -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:subme=7:analyse=all:8x8dct:trellis=1:no-fast-pskip\n");
+    printf("\n   + Animation:  -e x264  -b 1000 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mkv --detelecine --decomb -p -m -2 -T -x ref=5:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip:filter=2,2:psy-rd=1,1:subme=9\n");
 
-    printf("\n+ iPhone / iPod Touch:  -e x264 -b 960 -B 128 -R 48 -E faac -f mp4 -I -w 480 -m -x level=30:cabac=0:ref=1:analyse=all:me=umh:no-fast-pskip=1:trellis=1\n");
+    printf("\n   + Constant Quality Rate:  -e x264  -q 0.600000023841858 -a 1 -E ac3 -B 160 -R Auto -6 auto -f mkv -p -m -x ref=3:mixed-refs:bframes=3:b-pyramid:weightb:filter=-2,-1:trellis=1:analyse=all:8x8dct:me=umh:subme=9:psy-rd=1,1\n");
 
-    printf("\n+ iPod High-Rez:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -I -w 640 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=1500:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
+    printf("\n   + Film:  -e x264  -b 1800 -a 1 -E ac3 -B 160 -R Auto -6 auto -f mkv -p -m -2 -T -x ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:no-fast-pskip:psy-rd=1,1\n");
 
-    printf("\n+ iPod Low-Rez:  -e x264 -b 700 -B 160 -R 48 -E faac -f mp4 -I -w 320 -m -x level=30:bframes=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1\n");
+    printf("\n   + Television:  -e x264  -b 1300 -a 1 -E faac -B 160 -R Auto -6 dpl2 -f mkv --detelecine --decomb -p -m -2 -T -x ref=3:mixed-refs:bframes=6:weightb:direct=auto:b-pyramid:me=umh:subme=9:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip=1:psy-rd=1,1\n");
 
-    printf("\n+ Normal:  -e x264 -b 1500 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=2:bframes=2:me=umh\n");
+    printf("\n>\n");
 
-    printf("\n+ PS3:  -e x264 -b 2500 -B 160 -R 48 -E faac -f mp4 -p -x level=41:me=umh\n");
+    printf("\n< Gaming Consoles\n");
 
-    printf("\n+ PSP:  -b 1024 -B 128 -R 48 -E faac -f mp4 -w 368 -l 208 -m\n");
+    printf("\n   + PSP:  -b 1024 -a 1 -E faac -B 128 -R 48 -6 dpl2 -f mp4 -X 368 -Y 208 -m\n");
 
-    printf("\n+ QuickTime:  -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -m -p -2 -T -x ref=3:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:me=umh:analyse=all:trellis=1:no-fast-pskip\n");
+    printf("\n   + PS3:  -e x264  -b 2500 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 --crop 0:0:0:0 -p -x level=41:me=umh\n");
 
-    printf("\n+ Television:  -e x264 -b 1300 -B 160 -R 48 -E faac -f mkv --deinterlace=\"slower\" --denoise=\"weak\" -m -2 -T -x ref=3:mixed-refs:bframes=6:bime:weightb:direct=auto:b-pyramid:me=umh:analyse=all:8x8dct:trellis=1:nr=150:no-fast-pskip\n");
+    printf("\n   + Xbox 360:  -e x264  -b 2000 -a 1 -E faac -B 160 -R 48 -6 dpl2 -f mp4 -p -x level=40:ref=2:mixed-refs:bframes=3:weightb:subme=7:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1\n");
 
-    printf("\n+ Xbox 360:  -e x264 -b 2000 -B 160 -R 48 -E faac -f mp4 -p -x level=40:ref=2:mixed-refs:bframes=3:bime:weightb:b-rdo:direct=auto:b-pyramid:me=umh:analyse=all:no-fast-pskip:filter=-2,-1\n");
+    printf("\n>\n");
 }
 
 /****************************************************************************