summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-10-27 18:10:51 +0000
committerRodeo <[email protected]>2012-10-27 18:10:51 +0000
commit8b7552139a158d00391d074d4e37d2e7c79961e2 (patch)
tree4aa2a61a73d1d9d6e5cae33f8fcc2239d2e591ad /test
parent5ed346b8eba0333f83ade4cea37378e09f5d0eb2 (diff)
CLI, manicure: cosmetics.
Makes it easier to update CLI presets without having to worry about whitespace polluting the diffs. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5038 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'test')
-rw-r--r--test/test.c47
1 files changed, 0 insertions, 47 deletions
diff --git a/test/test.c b/test/test.c
index f82adc52f..bf0c086b4 100644
--- a/test/test.c
+++ b/test/test.c
@@ -732,9 +732,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "iPod"))
{
if( !mux )
@@ -774,9 +772,7 @@ static int HandleEvents( hb_handle_t * h )
advanced_opts = strdup("level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0");
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "iPhone & iPod Touch"))
{
if( !mux )
@@ -815,9 +811,7 @@ static int HandleEvents( hb_handle_t * h )
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, "iPhone 4"))
{
if( !mux )
@@ -859,9 +853,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "iPad"))
{
if( !mux )
@@ -903,9 +895,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "AppleTV"))
{
if( !mux )
@@ -949,9 +939,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "AppleTV 2"))
{
if( !mux )
@@ -993,9 +981,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "AppleTV 3"))
{
if( !mux )
@@ -1044,9 +1030,7 @@ static int HandleEvents( hb_handle_t * h )
}
modulus = 2;
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "Android Mid"))
{
if( !mux )
@@ -1086,9 +1070,7 @@ static int HandleEvents( hb_handle_t * h )
{
advanced_opts = strdup("cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0");
}
-
}
-
if (!strcmp(preset_name, "Android High"))
{
if( !mux )
@@ -1132,9 +1114,7 @@ static int HandleEvents( hb_handle_t * h )
{
anamorphic_mode = 2;
}
-
}
-
if (!strcmp(preset_name, "Normal"))
{
if( !mux )
@@ -1176,9 +1156,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 1;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "High Profile"))
{
if( !mux )
@@ -1222,9 +1200,7 @@ static int HandleEvents( hb_handle_t * h )
anamorphic_mode = 2;
}
job->chapter_markers = 1;
-
}
-
if (!strcmp(preset_name, "Classic"))
{
if( !mux )
@@ -1256,9 +1232,7 @@ static int HandleEvents( hb_handle_t * h )
{
dynamic_range_compression = strdup("0.0");
}
-
}
-
if (!strcmp(preset_name, "iPod Legacy"))
{
if( !mux )
@@ -1298,9 +1272,7 @@ static int HandleEvents( hb_handle_t * h )
advanced_opts = strdup("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");
}
job->chapter_markers = 1;
-
}
-
}
if ( chapter_markers )
@@ -3087,43 +3059,24 @@ static void ShowPresets()
fprintf( stderr, "%s - %s - %s\n", HB_PROJECT_TITLE, HB_PROJECT_BUILD_TITLE, HB_PROJECT_URL_WEBSITE );
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");
-
printf("\n + iPod: -e x264 -b 700 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -I -X 320 -m -x level=30:bframes=0:weightp=0:cabac=0:ref=1:vbv-maxrate=768:vbv-bufsize=2000:analyse=all:me=umh:no-fast-pskip=1:subme=6:8x8dct=0:trellis=0\n");
-
printf("\n + iPhone & iPod Touch: -e x264 -q 20.0 -a 1 -E faac -B 128 -6 dpl2 -R Auto -D 0.0 -f mp4 -X 480 -m -x cabac=0:ref=2:me=umh:bframes=0:weightp=0:subme=6:8x8dct=0:trellis=0\n");
-
printf("\n + iPhone 4: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 960 --loose-anamorphic -m\n");
-
printf("\n + iPad: -e x264 -q 20.0 -r 29.97 --pfr -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 -4 -X 1280 --loose-anamorphic -m\n");
-
printf("\n + AppleTV: -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 -4 -X 960 --loose-anamorphic -m -x cabac=0:ref=2:me=umh:b-pyramid=none:b-adapt=2:weightb=0:trellis=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\n");
-
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 --decomb=fast --loose-anamorphic --modulus 2 -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");
-
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");
-
printf("\n + Normal: -e x264 -q 20.0 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4 --strict-anamorphic -m -x ref=1:weightp=1:subq=2:rc-lookahead=10:trellis=0:8x8dct=0\n");
-
printf("\n + High Profile: -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 -4 --decomb --loose-anamorphic -m -x b-adapt=2:rc-lookahead=50\n");
-
printf("\n>\n");
-
printf("\n< Legacy\n");
-
printf("\n + Classic: -b 1000 -a 1 -E faac -B 160 -6 dpl2 -R Auto -D 0.0 -f mp4\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");
}