VfW: expose option "Nth pass" (i.e. simultaneously read and update the multipass...

[x264] / x264.c

diff --git a/x264.c b/x264.c
index a9ba4906920ef0e9541be3c25e797cb5d964251d..52d40066c18e74b4502c0ad87c56826248a41a56 100644 (file)
--- a/x264.c
+++ b/x264.c
@@ -102,8 +102,8 @@ static void Help( x264_param_t *defaults )
              "\n"
              "  -h, --help                  Print this help\n"
              "\n"
-             "  -I, --idrframe <integer>    Each 'number' I frames are IDR frames [%d]\n"
-             "  -i, --iframe <integer>      Max interval between I frames [%d]\n"
+             "  -I, --keyint <integer  >    Maximum GOP size [%d]\n"
+             "  -i, --min-keyint <integer>  Minimum GOP size [%d]\n"
              "      --scenecut <integer>    How aggresively to insert extra I frames [%d]\n"
              "  -b, --bframe <integer>      Number of B-frames between I and P [%d]\n"
              "\n"
@@ -150,8 +150,8 @@ static void Help( x264_param_t *defaults )
              "  -v, --verbose               Print stats for each frame\n"
              "\n",
             X264_BUILD,
-            defaults->i_idrframe,
-            defaults->i_iframe,
+            defaults->i_keyint_max,
+            defaults->i_keyint_min,
             defaults->i_scenecut_threshold,
             defaults->i_bframe,
             defaults->i_frame_reference,
@@ -219,8 +219,8 @@ static int  Parse( int argc, char **argv,
             { "help",    no_argument,       NULL, 'h' },
             { "bitrate", required_argument, NULL, 'B' },
             { "bframe",  required_argument, NULL, 'b' },
-            { "iframe",  required_argument, NULL, 'i' },
-            { "idrframe",required_argument, NULL, 'I' },
+            { "min-keyint",required_argument,NULL,'i' },
+            { "keyint",  required_argument, NULL, 'I' },
             { "scenecut",required_argument, NULL, OPT_SCENECUT },
             { "nf",      no_argument,       NULL, 'n' },
             { "filter",  required_argument, NULL, 'f' },
@@ -281,10 +281,10 @@ static int  Parse( int argc, char **argv,
                 param->i_bframe = atol( optarg );
                 break;
             case 'i':
-                param->i_iframe = atol( optarg );
+                param->i_keyint_min = atol( optarg );
                 break;
             case 'I':
-                param->i_idrframe = atol( optarg );
+                param->i_keyint_max = atol( optarg );
                 break;
             case OPT_SCENECUT:
                 param->i_scenecut_threshold = atol( optarg );
@@ -365,7 +365,7 @@ static int  Parse( int argc, char **argv,
             case 'A':
                 param->analyse.inter = 0;
                 if( strstr( optarg, "none" ) )  param->analyse.inter = 0x000000;
-                if( strstr( optarg, "all" ) )   param->analyse.inter = X264_ANALYSE_I4x4|X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8;
+                if( strstr( optarg, "all" ) )   param->analyse.inter = X264_ANALYSE_I4x4|X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8|X264_ANALYSE_BSUB16x16;
 
                 if( strstr( optarg, "i4x4" ) )      param->analyse.inter |= X264_ANALYSE_I4x4;
                 if( strstr( optarg, "psub16x16" ) ) param->analyse.inter |= X264_ANALYSE_PSUB16x16;
@@ -407,7 +407,7 @@ static int  Parse( int argc, char **argv,
                     param->rc.b_stat_write = 1;
                 else if( i_pass == 2 )
                     param->rc.b_stat_read = 1;
-                else if( i_pass > 2 )   /* XXX untested */
+                else if( i_pass > 2 )
                     param->rc.b_stat_read =
                     param->rc.b_stat_write = 1;
                 break;