Various minor missing changes from previous commits
authorJason Garrett-Glaser <darkshikari@gmail.com>
Wed, 9 Dec 2009 13:56:35 +0000 (05:56 -0800)
committerJason Garrett-Glaser <darkshikari@gmail.com>
Fri, 11 Dec 2009 01:00:57 +0000 (17:00 -0800)
Boolify sliced threads too
Remove unused constants from dct-a.asm
Fix a few typos/minor errors in preset documentation

common/x86/dct-a.asm
encoder/encoder.c
x264.c

index d1fe271..d4a0cae 100644 (file)
@@ -46,15 +46,6 @@ pb_sub4field:   db 0,4,1,8,12,5,9,13,2,6,10,14,3,7,11,15
 pb_subacmask:   dw 0,-1,-1,-1,-1,-1,-1,-1
 pb_scan4framea: SHUFFLE_16BIT 6,3,7,0,4,1,2,5
 pb_scan4frameb: SHUFFLE_16BIT 0,4,1,2,5,6,3,7
-
-pb_scan8fielda: SHUFFLE_16BIT 0,1,2,-1,-1,3,4,-1
-pb_scan8fieldb: SHUFFLE_16BIT -1,-1,-1,3,4,-1,-1,5
-pb_scan8fieldc: SHUFFLE_16BIT -1,6,0,1,2,7,-1,-1
-pb_scan8fieldd: SHUFFLE_16BIT 5,0,1,2,6,-1,-1,-1
-pb_scan8fielde: SHUFFLE_16BIT 6,0,1,2,3,7,-1,-1
-pb_scan8fieldf: SHUFFLE_16BIT 5,6,0,1,2,3,7,-1
-pb_scan8fieldg: SHUFFLE_16BIT 4,5,0,1,2,3,6,7
-
 pb_idctdc_unpack: db 0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3
 pb_idctdc_unpack2: db 4,4,4,4,5,5,5,5,6,6,6,6,7,7,7,7
 pb_1: times 16 db 1
index 3511c10..1b1f647 100644 (file)
@@ -728,6 +728,7 @@ static int x264_validate_parameters( x264_t *h )
     BOOLIFY( b_constrained_intra );
     BOOLIFY( b_deblocking_filter );
     BOOLIFY( b_deterministic );
+    BOOLIFY( b_sliced_threads );
     BOOLIFY( b_interlaced );
     BOOLIFY( b_visualize );
     BOOLIFY( b_aud );
diff --git a/x264.c b/x264.c
index 190dba0..95c2055 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -188,14 +188,15 @@ static void Help( x264_param_t *defaults, int longhelp )
     H0( "      --preset                Use a preset to select encoding settings [medium]\n" );
     H0( "                                  Overridden by user settings\n" );
     H2( "                                  - ultrafast:\n"
-        "                                    --no-8x8dct --aq-mode 0 --no-b-adapt\n"
+        "                                    --no-8x8dct --aq-mode 0 --b-adapt 0\n"
         "                                    --bframes 0 --no-cabac --no-deblock\n"
         "                                    --no-mbtree --me dia --no-mixed-refs\n"
         "                                    --partitions none --ref 1 --scenecut 0\n"
-        "                                    --subme 0 --trellis 0 --weightp 0\n"
+        "                                    --subme 0 --trellis 0 --no-weightb\n"
+        "                                    --weightp 0\n"
         "                                  - veryfast:\n"
         "                                    --no-mbtree --me dia --no-mixed-refs\n"
-        "                                    --partitions i8x8i4x4 --ref 1\n"
+        "                                    --partitions i8x8,i4x4 --ref 1\n"
         "                                    --subme 1 --trellis 0 --weightp 0\n"
         "                                  - faster:\n"
         "                                    --no-mbtree --no-mixed-refs --refs 2\n"
@@ -230,7 +231,7 @@ static void Help( x264_param_t *defaults, int longhelp )
         "                                    --deblock -1:-1 --psy-rd <unset>:0.15\n"
         "                                  - animation:\n"
         "                                    --bframes {+2} --deblock 1:1\n"
-        "                                    --psy-rd 0.4:<unset> --aq-strength 0\n"
+        "                                    --psy-rd 0.4:<unset> --aq-strength 0.6\n"
         "                                    --ref {Double if >1 else 1}\n"
         "                                  - grain:\n"
         "                                    --aq-strength 0.5 --no-dct-decimate\n"