]> git.sesse.net Git - x264/blobdiff - x264.c
Various minor missing changes from previous commits
[x264] / x264.c
diff --git a/x264.c b/x264.c
index c3b4f29e90c065b8ef82e1d44547f0a1f6b796ce..95c2055e42b78f89f6c71a3ad74ecb1b437cee93 100644 (file)
--- a/x264.c
+++ b/x264.c
 #include "x264.h"
 #include "muxers.h"
 
-#ifndef _MSC_VER
-#include "config.h"
-#endif
-
 #ifdef _WIN32
 #include <windows.h>
 #else
 #define SetConsoleTitle(t)
 #endif
 
-uint8_t *mux_buffer = NULL;
-int mux_buffer_size = 0;
-
 /* Ctrl-C handler */
 static int     b_ctrl_c = 0;
 static int     b_exit_on_ctrl_c = 0;
@@ -64,20 +57,15 @@ typedef struct {
     FILE *qpfile;
 } cli_opt_t;
 
-/* input file operation function pointers */
-int (*p_open_infile)( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-int (*p_get_frame_total)( hnd_t handle );
-int (*p_read_frame)( x264_picture_t *p_pic, hnd_t handle, int i_frame );
-int (*p_close_infile)( hnd_t handle );
+/* i/o file operation function pointer structs */
+cli_input_t input;
+static cli_output_t output;
 
-/* output file operation function pointers */
-static int (*p_open_outfile)( char *psz_filename, hnd_t *p_handle );
-static int (*p_set_outfile_param)( hnd_t handle, x264_param_t *p_param );
-static int (*p_write_nalu)( hnd_t handle, uint8_t *p_nal, int i_size );
-static int (*p_set_eop)( hnd_t handle, x264_picture_t *p_picture );
-static int (*p_close_outfile)( hnd_t handle );
+/* i/o modules that work with pipes (and fifos) */
+static const char * const stdin_format_names[] = { "yuv", "y4m", 0 };
+static const char * const stdout_format_names[] = { "raw", "mkv", "flv", 0 };
 
-static void Help( x264_param_t *defaults, int b_longhelp );
+static void Help( x264_param_t *defaults, int longhelp );
 static int  Parse( int argc, char **argv, x264_param_t *param, cli_opt_t *opt );
 static int  Encode( x264_param_t *param, cli_opt_t *opt );
 
@@ -129,29 +117,34 @@ static char const *strtable_lookup( const char * const table[], int index )
 /*****************************************************************************
  * Help:
  *****************************************************************************/
-static void Help( x264_param_t *defaults, int b_longhelp )
+static void Help( x264_param_t *defaults, int longhelp )
 {
 #define H0 printf
-#define H1 if(b_longhelp) printf
+#define H1 if(longhelp>=1) printf
+#define H2 if(longhelp==2) printf
     H0( "x264 core:%d%s\n"
         "Syntax: x264 [options] -o outfile infile [widthxheight]\n"
         "\n"
         "Infile can be raw YUV 4:2:0 (in which case resolution is required),\n"
         "  or YUV4MPEG 4:2:0 (*.y4m),\n"
-        "  or AVI or Avisynth if compiled with AVIS support (%s).\n"
+        "  or Avisynth if compiled with support (%s).\n"
         "Outfile type is selected by filename:\n"
         " .264 -> Raw bytestream\n"
         " .mkv -> Matroska\n"
+        " .flv -> Flash Video\n"
         " .mp4 -> MP4 if compiled with GPAC support (%s)\n"
         "\n"
         "Options:\n"
         "\n"
-        "  -h, --help                  List the more commonly used options\n"
-        "      --longhelp              List all options\n"
+        "  -h, --help                  List basic options\n"
+        "      --longhelp              List more options\n"
+        "      --fullhelp              List all options\n"
         "\n",
         X264_BUILD, X264_VERSION,
-#ifdef AVIS_INPUT
-        "yes",
+#ifdef AVS_INPUT
+        "native",
+#elif defined(VFW_INPUT)
+        "vfw (fallback)",
 #else
         "no",
 #endif
@@ -161,109 +154,212 @@ static void Help( x264_param_t *defaults, int b_longhelp )
         "no"
 #endif
       );
+    H0( "Example usage:\n" );
+    H0( "\n" );
+    H0( "      Constant quality mode:\n" );
+    H0( "            x264 --crf 24 -o <output> <input>\n" );
+    H0( "\n" );
+    H0( "      Two-pass with a bitrate of 1000kbps:\n" );
+    H0( "            x264 --pass 1 --bitrate 1000 -o <output> <input>\n" );
+    H0( "            x264 --pass 2 --bitrate 1000 -o <output> <input>\n" );
+    H0( "\n" );
+    H0( "      Lossless:\n" );
+    H0( "            x264 --crf 0 -o <output> <input>\n" );
+    H0( "\n" );
+    H0( "      Maximum PSNR at the cost of speed and visual quality:\n" );
+    H0( "            x264 --preset placebo --tune psnr -o <output> <input>\n" );
+    H0( "\n" );
+    H0( "      Constant bitrate at 1000kbps with a 2 second-buffer:\n");
+    H0( "            x264 --vbv-bufsize 2000 --bitrate 1000 -o <output> <input>\n" );
+    H0( "\n" );
     H0( "Presets:\n" );
     H0( "\n" );
     H0( "      --profile               Force H.264 profile [high]\n" );
-    H0( "                                  Overrides all settings\n");
-    H0( "                                  - baseline,main,high\n" );
+    H0( "                                  Overrides all settings\n" );
+    H2( "                                  - baseline:\n"
+        "                                    --no-8x8dct --bframes 0 --no-cabac\n"
+        "                                    --cqm flat --weightp 0 No interlaced\n"
+        "                                    No lossless\n"
+        "                                  - main:\n"
+        "                                    --no-8x8dct --cqm flat No lossless\n"
+        "                                  - high:\n"
+        "                                    No lossless\n" );
+        else H0( "                                  - baseline,main,high\n" );
     H0( "      --preset                Use a preset to select encoding settings [medium]\n" );
-    H0( "                                  Overridden by user settings\n");
-    H1( "                                  - ultrafast,veryfast,fast,medium\n"
-        "                                  - slow,slower,placebo\n" );
-    else H0( "                                  - ultrafast,veryfast,fast,medium,slow,slower\n" );
+    H0( "                                  Overridden by user settings\n" );
+    H2( "                                  - ultrafast:\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 --no-weightb\n"
+        "                                    --weightp 0\n"
+        "                                  - veryfast:\n"
+        "                                    --no-mbtree --me dia --no-mixed-refs\n"
+        "                                    --partitions i8x8,i4x4 --ref 1\n"
+        "                                    --subme 1 --trellis 0 --weightp 0\n"
+        "                                  - faster:\n"
+        "                                    --no-mbtree --no-mixed-refs --refs 2\n"
+        "                                    --subme 4 --weightp 1\n"
+        "                                  - fast\n"
+        "                                    --rc-lookahead 30 --ref 2 --subme 6\n"
+        "                                  - medium\n"
+        "                                    Default settings apply.\n"
+        "                                  - slow\n"
+        "                                    --b-adapt 2 --direct auto --me umh\n"
+        "                                    --rc-lookahead 50 --ref 5 --subme 8\n"
+        "                                  - slower\n"
+        "                                    --b-adapt 2 --direct auto --me umh\n"
+        "                                    --partitions all --rc-lookahead 60\n"
+        "                                    --ref 8 --subme 9 --trellis 2\n"
+        "                                  - veryslow\n"
+        "                                    --b-adapt 2 --bframes 8 --direct auto\n"
+        "                                    --me umh --me-range 24 --partitions all\n"
+        "                                    --ref 16 --subme 10 --trellis 2\n"
+        "                                    --rc-lookahead 60\n"
+        "                                  - placebo\n"
+        "                                    --bframes 16 --b-adapt 2 --direct auto\n"
+        "                                    --slow-firstpass --no-fast-pskip\n"
+        "                                    --me tesa --me-range 24 --partitions all\n"
+        "                                    --rc-lookahead 60 --ref 16 --subme 10\n"
+        "                                    --trellis 2\n" );
+    else H0( "                                  - ultrafast,veryfast,faster,fast,medium\n"
+             "                                  - slow,slower,veryslow,placebo\n" );
     H0( "      --tune                  Tune the settings for a particular type of source\n" );
-    H0( "                                  Overridden by user settings\n");
-    H1( "                                  - film,animation,grain,psnr,ssim\n"
-        "                                  - fastdecode,touhou\n");
-    else H0( "                                  - film,animation,grain,psnr,ssim,fastdecode\n");
-    H0( "      --slow-firstpass        Don't use faster settings with --pass 1\n" );
+    H0( "                                  Overridden by user settings\n" );
+    H2( "                                  - film:\n"
+        "                                    --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.6\n"
+        "                                    --ref {Double if >1 else 1}\n"
+        "                                  - grain:\n"
+        "                                    --aq-strength 0.5 --no-dct-decimate\n"
+        "                                    --deadzone inter 6 --deadzone-intra 6\n"
+        "                                    --deblock -2:-2 --ipratio 1.1 \n"
+        "                                    --pbratio 1.1 --psy-rd <unset>:0.25\n"
+        "                                    --qcomp 0.8\n"
+        "                                  - psnr:\n"
+        "                                    --aq-mode 0 --no-psy\n"
+        "                                  - ssim:\n"
+        "                                    --aq-mode 2 --no-psy\n"
+        "                                  - fastdecode:\n"
+        "                                    --no-cabac --no-deblock --no-weightb\n"
+        "                                    --weightp 0\n"
+        "                                  - zerolatency:\n"
+        "                                    --bframes 0 --rc-lookahead 0\n"
+        "                                    --sync-lookahead 0 --sliced-threads\n"
+        "                                  - touhou:\n"
+        "                                    --aq-strength 1.3 --deblock -1:-1\n"
+        "                                    --partitions {p4x4 if p8x8 set}\n"
+        "                                    --psy-rd <unset>:0.2\n"
+        "                                    --ref {Double if >1 else 1}\n" );
+    else H0( "                                  - film,animation,grain,psnr,ssim\n"
+             "                                  - fastdecode,zerolatency\n" );
+    H1( "      --slow-firstpass        Don't use faster settings with --pass 1\n" );
     H0( "\n" );
     H0( "Frame-type options:\n" );
     H0( "\n" );
     H0( "  -I, --keyint <integer>      Maximum GOP size [%d]\n", defaults->i_keyint_max );
-    H1( "  -i, --min-keyint <integer>  Minimum GOP size [%d]\n", defaults->i_keyint_min );
-    H1( "      --no-scenecut           Disable adaptive I-frame decision\n" );
-    H1( "      --scenecut <integer>    How aggressively to insert extra I-frames [%d]\n", defaults->i_scenecut_threshold );
-    H0( "  -b, --bframes <integer>     Number of B-frames between I and P [%d]\n", defaults->i_bframe );
+    H2( "  -i, --min-keyint <integer>  Minimum GOP size [%d]\n", defaults->i_keyint_min );
+    H2( "      --no-scenecut           Disable adaptive I-frame decision\n" );
+    H2( "      --scenecut <integer>    How aggressively to insert extra I-frames [%d]\n", defaults->i_scenecut_threshold );
+    H1( "  -b, --bframes <integer>     Number of B-frames between I and P [%d]\n", defaults->i_bframe );
     H1( "      --b-adapt               Adaptive B-frame decision method [%d]\n"
         "                                  Higher values may lower threading efficiency.\n"
         "                                  - 0: Disabled\n"
         "                                  - 1: Fast\n"
         "                                  - 2: Optimal (slow with high --bframes)\n", defaults->i_bframe_adaptive );
-    H1( "      --b-bias <integer>      Influences how often B-frames are used [%d]\n", defaults->i_bframe_bias );
-    H0( "      --b-pyramid             Keep some B-frames as references\n" );
-    H0( "      --no-cabac              Disable CABAC\n" );
-    H0( "  -r, --ref <integer>         Number of reference frames [%d]\n", defaults->i_frame_reference );
+    H2( "      --b-bias <integer>      Influences how often B-frames are used [%d]\n", defaults->i_bframe_bias );
+    H1( "      --b-pyramid <string>    Keep some B-frames as references [%s]\n"
+        "                                  - none: Disabled\n"
+        "                                  - strict: Strictly hierarchical pyramid\n"
+        "                                  - normal: Non-strict (not Blu-ray compatible)\n",
+        strtable_lookup( x264_b_pyramid_names, defaults->i_bframe_pyramid ) );
+    H1( "      --no-cabac              Disable CABAC\n" );
+    H1( "  -r, --ref <integer>         Number of reference frames [%d]\n", defaults->i_frame_reference );
     H1( "      --no-deblock            Disable loop filter\n" );
-    H0( "  -f, --deblock <alpha:beta>  Loop filter AlphaC0 and Beta parameters [%d:%d]\n",
+    H1( "  -f, --deblock <alpha:beta>  Loop filter parameters [%d:%d]\n",
                                        defaults->i_deblocking_filter_alphac0, defaults->i_deblocking_filter_beta );
+    H2( "      --slices <integer>      Number of slices per frame; forces rectangular\n"
+        "                              slices and is overridden by other slicing options\n" );
+    else H1( "      --slices <integer>      Number of slices per frame\n" );
+    H2( "      --slice-max-size <integer> Limit the size of each slice in bytes\n");
+    H2( "      --slice-max-mbs <integer> Limit the size of each slice in macroblocks\n");
     H0( "      --interlaced            Enable pure-interlaced mode\n" );
+    H2( "      --constrained-intra     Enable constrained intra prediction.\n" );
     H0( "\n" );
     H0( "Ratecontrol:\n" );
     H0( "\n" );
-    H0( "  -q, --qp <integer>          Set QP (0-51, 0=lossless)\n" );
+    H1( "  -q, --qp <integer>          Force constant QP (0-51, 0=lossless)\n" );
     H0( "  -B, --bitrate <integer>     Set bitrate (kbit/s)\n" );
     H0( "      --crf <float>           Quality-based VBR (0-51, 0=lossless) [%.1f]\n", defaults->rc.f_rf_constant );
+    H1( "      --rc-lookahead <integer> Number of frames for frametype lookahead [%d]\n", defaults->rc.i_lookahead );
     H0( "      --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
     H0( "      --vbv-bufsize <integer> Set size of the VBV buffer (kbit) [%d]\n", defaults->rc.i_vbv_buffer_size );
-    H1( "      --vbv-init <float>      Initial VBV buffer occupancy [%.1f]\n", defaults->rc.f_vbv_buffer_init );
-    H1( "      --qpmin <integer>       Set min QP [%d]\n", defaults->rc.i_qp_min );
-    H1( "      --qpmax <integer>       Set max QP [%d]\n", defaults->rc.i_qp_max );
-    H1( "      --qpstep <integer>      Set max QP step [%d]\n", defaults->rc.i_qp_step );
-    H0( "      --ratetol <float>       Allowed variance of average bitrate [%.1f]\n", defaults->rc.f_rate_tolerance );
-    H0( "      --ipratio <float>       QP factor between I and P [%.2f]\n", defaults->rc.f_ip_factor );
-    H0( "      --pbratio <float>       QP factor between P and B [%.2f]\n", defaults->rc.f_pb_factor );
-    H1( "      --chroma-qp-offset <integer>  QP difference between chroma and luma [%d]\n", defaults->analyse.i_chroma_qp_offset );
-    H1( "      --aq-mode <integer>     AQ method [%d]\n"
+    H2( "      --vbv-init <float>      Initial VBV buffer occupancy [%.1f]\n", defaults->rc.f_vbv_buffer_init );
+    H2( "      --qpmin <integer>       Set min QP [%d]\n", defaults->rc.i_qp_min );
+    H2( "      --qpmax <integer>       Set max QP [%d]\n", defaults->rc.i_qp_max );
+    H2( "      --qpstep <integer>      Set max QP step [%d]\n", defaults->rc.i_qp_step );
+    H2( "      --ratetol <float>       Tolerance of ABR ratecontrol and VBV [%.1f]\n", defaults->rc.f_rate_tolerance );
+    H2( "      --ipratio <float>       QP factor between I and P [%.2f]\n", defaults->rc.f_ip_factor );
+    H2( "      --pbratio <float>       QP factor between P and B [%.2f]\n", defaults->rc.f_pb_factor );
+    H2( "      --chroma-qp-offset <integer>  QP difference between chroma and luma [%d]\n", defaults->analyse.i_chroma_qp_offset );
+    H2( "      --aq-mode <integer>     AQ method [%d]\n"
         "                                  - 0: Disabled\n"
         "                                  - 1: Variance AQ (complexity mask)\n"
         "                                  - 2: Auto-variance AQ (experimental)\n", defaults->rc.i_aq_mode );
-    H0( "      --aq-strength <float>   Reduces blocking and blurring in flat and\n"
-        "                              textured areas. [%.1f]\n"
-        "                                  - 0.5: weak AQ\n"
-        "                                  - 1.5: strong AQ\n", defaults->rc.f_aq_strength );
-    H0( "\n" );
-    H0( "  -p, --pass <1|2|3>          Enable multipass ratecontrol\n"
-        "                                  - 1: First pass, creates stats file\n"
-        "                                  - 2: Last pass, does not overwrite stats file\n"
-        "                                  - 3: Nth pass, overwrites stats file\n" );
-    H0( "      --stats <string>        Filename for 2 pass stats [\"%s\"]\n", defaults->rc.psz_stat_out );
-    H0( "      --qcomp <float>         QP curve compression: 0.0 => CBR, 1.0 => CQP [%.2f]\n", defaults->rc.f_qcompress );
-    H1( "      --cplxblur <float>      Reduce fluctuations in QP (before curve compression) [%.1f]\n", defaults->rc.f_complexity_blur );
-    H1( "      --qblur <float>         Reduce fluctuations in QP (after curve compression) [%.1f]\n", defaults->rc.f_qblur );
-    H0( "      --zones <zone0>/<zone1>/...  Tweak the bitrate of some regions of the video\n" );
-    H1( "                              Each zone is of the form\n"
+    H1( "      --aq-strength <float>   Reduces blocking and blurring in flat and\n"
+        "                              textured areas. [%.1f]\n", defaults->rc.f_aq_strength );
+    H1( "\n" );
+    H2( "  -p, --pass <1|2|3>          Enable multipass ratecontrol\n" );
+    else H0( "  -p, --pass <1|2>            Enable multipass ratecontrol\n" );
+    H0( "                                  - 1: First pass, creates stats file\n"
+        "                                  - 2: Last pass, does not overwrite stats file\n" );
+    H2( "                                  - 3: Nth pass, overwrites stats file\n" );
+    H1( "      --stats <string>        Filename for 2 pass stats [\"%s\"]\n", defaults->rc.psz_stat_out );
+    H2( "      --no-mbtree             Disable mb-tree ratecontrol.\n");
+    H2( "      --qcomp <float>         QP curve compression [%.2f]\n", defaults->rc.f_qcompress );
+    H2( "      --cplxblur <float>      Reduce fluctuations in QP (before curve compression) [%.1f]\n", defaults->rc.f_complexity_blur );
+    H2( "      --qblur <float>         Reduce fluctuations in QP (after curve compression) [%.1f]\n", defaults->rc.f_qblur );
+    H2( "      --zones <zone0>/<zone1>/...  Tweak the bitrate of regions of the video\n" );
+    H2( "                              Each zone is of the form\n"
         "                                  <start frame>,<end frame>,<option>\n"
         "                                  where <option> is either\n"
         "                                      q=<integer> (force QP)\n"
         "                                  or  b=<float> (bitrate multiplier)\n" );
-    H1( "      --qpfile <string>       Force frametypes and QPs for some or all frames\n"
+    H2( "      --qpfile <string>       Force frametypes and QPs for some or all frames\n"
         "                              Format of each line: framenumber frametype QP\n"
-        "                              QP of -1 lets x264 choose. Frametypes: I,i,P,B,b.\n" );
-    H0( "\n" );
-    H0( "Analysis:\n" );
-    H0( "\n" );
-    H0( "  -A, --partitions <string>   Partitions to consider [\"p8x8,b8x8,i8x8,i4x4\"]\n"
+        "                              QP of -1 lets x264 choose. Frametypes: I,i,P,B,b.\n"
+        "                              QPs are restricted by qpmin/qpmax.\n" );
+    H1( "\n" );
+    H1( "Analysis:\n" );
+    H1( "\n" );
+    H1( "  -A, --partitions <string>   Partitions to consider [\"p8x8,b8x8,i8x8,i4x4\"]\n"
         "                                  - p8x8, p4x4, b8x8, i8x8, i4x4\n"
         "                                  - none, all\n"
         "                                  (p4x4 requires p8x8. i8x8 requires --8x8dct.)\n" );
-    H0( "      --direct <string>       Direct MV prediction mode [\"%s\"]\n"
+    H1( "      --direct <string>       Direct MV prediction mode [\"%s\"]\n"
         "                                  - none, spatial, temporal, auto\n",
                                        strtable_lookup( x264_direct_pred_names, defaults->analyse.i_direct_mv_pred ) );
-    H0( "      --no-weightb            Disable weighted prediction for B-frames\n" );
-    H0( "      --me <string>           Integer pixel motion estimation method [\"%s\"]\n",
+    H2( "      --no-weightb            Disable weighted prediction for B-frames\n" );
+    H1( "      --weightp               Weighted prediction for P-frames [%d]\n"
+        "                              - 0: Disabled\n"
+        "                              - 1: Blind offset\n"
+        "                              - 2: Smart analysis\n", defaults->analyse.i_weighted_pred );
+    H1( "      --me <string>           Integer pixel motion estimation method [\"%s\"]\n",
                                        strtable_lookup( x264_motion_est_names, defaults->analyse.i_me_method ) );
-    H1( "                                  - dia: diamond search, radius 1 (fast)\n"
+    H2( "                                  - dia: diamond search, radius 1 (fast)\n"
         "                                  - hex: hexagonal search, radius 2\n"
         "                                  - umh: uneven multi-hexagon search\n"
         "                                  - esa: exhaustive search\n"
         "                                  - tesa: hadamard exhaustive search (slow)\n" );
-    else H0( "                                  - dia, hex, umh\n" );
-    H0( "      --merange <integer>     Maximum motion vector search range [%d]\n", defaults->analyse.i_me_range );
-    H1( "      --mvrange <integer>     Maximum motion vector length [-1 (auto)]\n" );
-    H1( "      --mvrange-thread <int>  Minimum buffer between threads [-1 (auto)]\n" );
-    H0( "  -m, --subme <integer>       Subpixel motion estimation and mode decision [%d]\n", defaults->analyse.i_subpel_refine );
-    H1( "                                  - 0: fullpel only (not recommended)\n"
+    else H1( "                                  - dia, hex, umh\n" );
+    H2( "      --merange <integer>     Maximum motion vector search range [%d]\n", defaults->analyse.i_me_range );
+    H2( "      --mvrange <integer>     Maximum motion vector length [-1 (auto)]\n" );
+    H2( "      --mvrange-thread <int>  Minimum buffer between threads [-1 (auto)]\n" );
+    H1( "  -m, --subme <integer>       Subpixel motion estimation and mode decision [%d]\n", defaults->analyse.i_subpel_refine );
+    H2( "                                  - 0: fullpel only (not recommended)\n"
         "                                  - 1: SAD mode decision, one qpel iteration\n"
         "                                  - 2: SATD mode decision\n"
         "                                  - 3-5: Progressively more qpel\n"
@@ -272,89 +368,97 @@ static void Help( x264_param_t *defaults, int b_longhelp )
         "                                  - 8: RD refinement for I/P-frames\n"
         "                                  - 9: RD refinement for all frames\n"
         "                                  - 10: QP-RD - requires trellis=2, aq-mode>0\n" );
-    else H0( "                                  decision quality: 1=fast, 10=best.\n"  );
-    H0( "      --psy-rd                Strength of psychovisual optimization [\"%.1f:%.1f\"]\n"
+    else H1( "                                  decision quality: 1=fast, 10=best.\n"  );
+    H1( "      --psy-rd                Strength of psychovisual optimization [\"%.1f:%.1f\"]\n"
         "                                  #1: RD (requires subme>=6)\n"
         "                                  #2: Trellis (requires trellis, experimental)\n",
                                        defaults->analyse.f_psy_rd, defaults->analyse.f_psy_trellis );
-    H0( "      --no-mixed-refs         Don't decide references on a per partition basis\n" );
-    H1( "      --no-chroma-me          Ignore chroma in motion estimation\n" );
-    H0( "      --no-8x8dct             Disable adaptive spatial transform size\n" );
-    H0( "  -t, --trellis <integer>     Trellis RD quantization. Requires CABAC. [%d]\n"
+    H2( "      --no-psy                Disable all visual optimizations that worsen\n"
+        "                              both PSNR and SSIM.\n" );
+    H2( "      --no-mixed-refs         Don't decide references on a per partition basis\n" );
+    H2( "      --no-chroma-me          Ignore chroma in motion estimation\n" );
+    H1( "      --no-8x8dct             Disable adaptive spatial transform size\n" );
+    H1( "  -t, --trellis <integer>     Trellis RD quantization. Requires CABAC. [%d]\n"
         "                                  - 0: disabled\n"
         "                                  - 1: enabled only on the final encode of a MB\n"
         "                                  - 2: enabled on all mode decisions\n", defaults->analyse.i_trellis );
-    H0( "      --no-fast-pskip         Disables early SKIP detection on P-frames\n" );
-    H0( "      --no-dct-decimate       Disables coefficient thresholding on P-frames\n" );
-    H0( "      --nr <integer>          Noise reduction [%d]\n", defaults->analyse.i_noise_reduction );
-    H1( "\n" );
-    H1( "      --deadzone-inter <int>  Set the size of the inter luma quantization deadzone [%d]\n", defaults->analyse.i_luma_deadzone[0] );
-    H1( "      --deadzone-intra <int>  Set the size of the intra luma quantization deadzone [%d]\n", defaults->analyse.i_luma_deadzone[1] );
-    H1( "                                  Deadzones should be in the range 0 - 32.\n" );
-    H1( "      --cqm <string>          Preset quant matrices [\"flat\"]\n"
+    H2( "      --no-fast-pskip         Disables early SKIP detection on P-frames\n" );
+    H2( "      --no-dct-decimate       Disables coefficient thresholding on P-frames\n" );
+    H1( "      --nr <integer>          Noise reduction [%d]\n", defaults->analyse.i_noise_reduction );
+    H2( "\n" );
+    H2( "      --deadzone-inter <int>  Set the size of the inter luma quantization deadzone [%d]\n", defaults->analyse.i_luma_deadzone[0] );
+    H2( "      --deadzone-intra <int>  Set the size of the intra luma quantization deadzone [%d]\n", defaults->analyse.i_luma_deadzone[1] );
+    H2( "                                  Deadzones should be in the range 0 - 32.\n" );
+    H2( "      --cqm <string>          Preset quant matrices [\"flat\"]\n"
         "                                  - jvt, flat\n" );
-    H0( "      --cqmfile <string>      Read custom quant matrices from a JM-compatible file\n" );
-    H1( "                                  Overrides any other --cqm* options.\n" );
-    H1( "      --cqm4 <list>           Set all 4x4 quant matrices\n"
+    H1( "      --cqmfile <string>      Read custom quant matrices from a JM-compatible file\n" );
+    H2( "                                  Overrides any other --cqm* options.\n" );
+    H2( "      --cqm4 <list>           Set all 4x4 quant matrices\n"
         "                                  Takes a comma-separated list of 16 integers.\n" );
-    H1( "      --cqm8 <list>           Set all 8x8 quant matrices\n"
+    H2( "      --cqm8 <list>           Set all 8x8 quant matrices\n"
         "                                  Takes a comma-separated list of 64 integers.\n" );
-    H1( "      --cqm4i, --cqm4p, --cqm8i, --cqm8p\n"
+    H2( "      --cqm4i, --cqm4p, --cqm8i, --cqm8p\n"
         "                              Set both luma and chroma quant matrices\n" );
-    H1( "      --cqm4iy, --cqm4ic, --cqm4py, --cqm4pc\n"
+    H2( "      --cqm4iy, --cqm4ic, --cqm4py, --cqm4pc\n"
         "                              Set individual quant matrices\n" );
-    H1( "\n" );
-    H1( "Video Usability Info (Annex E):\n" );
-    H1( "The VUI settings are not used by the encoder but are merely suggestions to\n" );
-    H1( "the playback equipment. See doc/vui.txt for details. Use at your own risk.\n" );
-    H1( "\n" );
-    H1( "      --overscan <string>     Specify crop overscan setting [\"%s\"]\n"
+    H2( "\n" );
+    H2( "Video Usability Info (Annex E):\n" );
+    H2( "The VUI settings are not used by the encoder but are merely suggestions to\n" );
+    H2( "the playback equipment. See doc/vui.txt for details. Use at your own risk.\n" );
+    H2( "\n" );
+    H2( "      --overscan <string>     Specify crop overscan setting [\"%s\"]\n"
         "                                  - undef, show, crop\n",
                                        strtable_lookup( x264_overscan_names, defaults->vui.i_overscan ) );
-    H1( "      --videoformat <string>  Specify video format [\"%s\"]\n"
+    H2( "      --videoformat <string>  Specify video format [\"%s\"]\n"
         "                                  - component, pal, ntsc, secam, mac, undef\n",
                                        strtable_lookup( x264_vidformat_names, defaults->vui.i_vidformat ) );
-    H1( "      --fullrange <string>    Specify full range samples setting [\"%s\"]\n"
+    H2( "      --fullrange <string>    Specify full range samples setting [\"%s\"]\n"
         "                                  - off, on\n",
                                        strtable_lookup( x264_fullrange_names, defaults->vui.b_fullrange ) );
-    H1( "      --colorprim <string>    Specify color primaries [\"%s\"]\n"
+    H2( "      --colorprim <string>    Specify color primaries [\"%s\"]\n"
         "                                  - undef, bt709, bt470m, bt470bg\n"
         "                                    smpte170m, smpte240m, film\n",
                                        strtable_lookup( x264_colorprim_names, defaults->vui.i_colorprim ) );
-    H1( "      --transfer <string>     Specify transfer characteristics [\"%s\"]\n"
+    H2( "      --transfer <string>     Specify transfer characteristics [\"%s\"]\n"
         "                                  - undef, bt709, bt470m, bt470bg, linear,\n"
         "                                    log100, log316, smpte170m, smpte240m\n",
                                        strtable_lookup( x264_transfer_names, defaults->vui.i_transfer ) );
-    H1( "      --colormatrix <string>  Specify color matrix setting [\"%s\"]\n"
+    H2( "      --colormatrix <string>  Specify color matrix setting [\"%s\"]\n"
         "                                  - undef, bt709, fcc, bt470bg\n"
         "                                    smpte170m, smpte240m, GBR, YCgCo\n",
                                        strtable_lookup( x264_colmatrix_names, defaults->vui.i_colmatrix ) );
-    H1( "      --chromaloc <integer>   Specify chroma sample location (0 to 5) [%d]\n",
+    H2( "      --chromaloc <integer>   Specify chroma sample location (0 to 5) [%d]\n",
                                        defaults->vui.i_chroma_loc );
     H0( "\n" );
     H0( "Input/Output:\n" );
     H0( "\n" );
     H0( "  -o, --output                Specify output file\n" );
+    H1( "      --stdout                Specify stdout format [\"%s\"]\n"
+        "                                  - raw, mkv, flv\n", stdout_format_names[0] );
+    H1( "      --stdin                 Specify stdin format [\"%s\"]\n"
+        "                                  - yuv, y4m\n", stdin_format_names[0] );
     H0( "      --sar width:height      Specify Sample Aspect Ratio\n" );
     H0( "      --fps <float|rational>  Specify framerate\n" );
     H0( "      --seek <integer>        First frame to encode\n" );
     H0( "      --frames <integer>      Maximum number of frames to encode\n" );
     H0( "      --level <string>        Specify level (as defined by Annex A)\n" );
-    H0( "\n" );
-    H0( "  -v, --verbose               Print stats for each frame\n" );
-    H0( "      --no-progress           Don't show the progress indicator while encoding\n" );
+    H1( "\n" );
+    H1( "  -v, --verbose               Print stats for each frame\n" );
+    H1( "      --no-progress           Don't show the progress indicator while encoding\n" );
     H0( "      --quiet                 Quiet Mode\n" );
-    H0( "      --psnr                  Enable PSNR computation\n" );
-    H0( "      --ssim                  Enable SSIM computation\n" );
-    H0( "      --threads <integer>     Force a specific number of threads\n" );
-    H1( "      --thread-input          Run Avisynth in its own thread\n" );
-    H1( "      --non-deterministic     Slightly improve quality of SMP, at the cost of repeatability\n" );
-    H1( "      --asm <integer>         Override CPU detection\n" );
-    H1( "      --no-asm                Disable all CPU optimizations\n" );
-    H1( "      --visualize             Show MB types overlayed on the encoded video\n" );
-    H1( "      --dump-yuv <string>     Save reconstructed frames\n" );
-    H1( "      --sps-id <integer>      Set SPS and PPS id numbers [%d]\n", defaults->i_sps_id );
-    H1( "      --aud                   Use access unit delimiters\n" );
+    H1( "      --psnr                  Enable PSNR computation\n" );
+    H1( "      --ssim                  Enable SSIM computation\n" );
+    H1( "      --threads <integer>     Force a specific number of threads\n" );
+    H2( "      --sliced-threads        Low-latency but lower-efficiency threading\n" );
+    H2( "      --thread-input          Run Avisynth in its own thread\n" );
+    H2( "      --sync-lookahead <integer> Number of buffer frames for threaded lookahead\n" );
+    H2( "      --non-deterministic     Slightly improve quality of SMP, at the cost of repeatability\n" );
+    H2( "      --asm <integer>         Override CPU detection\n" );
+    H2( "      --no-asm                Disable all CPU optimizations\n" );
+    H2( "      --visualize             Show MB types overlayed on the encoded video\n" );
+    H2( "      --dump-yuv <string>     Save reconstructed frames\n" );
+    H2( "      --sps-id <integer>      Set SPS and PPS id numbers [%d]\n", defaults->i_sps_id );
+    H2( "      --aud                   Use access unit delimiters\n" );
     H0( "\n" );
 }
 
@@ -370,12 +474,17 @@ static void Help( x264_param_t *defaults, int b_longhelp )
 #define OPT_PRESET 265
 #define OPT_TUNE 266
 #define OPT_SLOWFIRSTPASS 267
+#define OPT_FULLHELP 268
+#define OPT_FPS 269
+#define OPT_STDOUT_FORMAT 270
+#define OPT_STDIN_FORMAT 271
 
 static char short_options[] = "8A:B:b:f:hI:i:m:o:p:q:r:t:Vvw";
 static struct option long_options[] =
 {
     { "help",              no_argument, NULL, 'h' },
     { "longhelp",          no_argument, NULL, OPT_LONGHELP },
+    { "fullhelp",          no_argument, NULL, OPT_FULLHELP },
     { "version",           no_argument, NULL, 'V' },
     { "profile",     required_argument, NULL, OPT_PROFILE },
     { "preset",      required_argument, NULL, OPT_PRESET },
@@ -386,7 +495,7 @@ static struct option long_options[] =
     { "b-adapt",     required_argument, NULL, 0 },
     { "no-b-adapt",        no_argument, NULL, 0 },
     { "b-bias",      required_argument, NULL, 0 },
-    { "b-pyramid",         no_argument, NULL, 0 },
+    { "b-pyramid",   required_argument, NULL, 0 },
     { "min-keyint",  required_argument, NULL, 'i' },
     { "keyint",      required_argument, NULL, 'I' },
     { "scenecut",    required_argument, NULL, 0 },
@@ -396,6 +505,7 @@ static struct option long_options[] =
     { "filter",      required_argument, NULL, 0 },
     { "deblock",     required_argument, NULL, 'f' },
     { "interlaced",        no_argument, NULL, 0 },
+    { "constrained-intra", no_argument, NULL, 0 },
     { "cabac",             no_argument, NULL, 0 },
     { "no-cabac",          no_argument, NULL, 0 },
     { "qp",          required_argument, NULL, 'q' },
@@ -403,25 +513,31 @@ static struct option long_options[] =
     { "qpmax",       required_argument, NULL, 0 },
     { "qpstep",      required_argument, NULL, 0 },
     { "crf",         required_argument, NULL, 0 },
+    { "rc-lookahead",required_argument, NULL, 0 },
     { "ref",         required_argument, NULL, 'r' },
     { "asm",         required_argument, NULL, 0 },
     { "no-asm",            no_argument, NULL, 0 },
     { "sar",         required_argument, NULL, 0 },
-    { "fps",         required_argument, NULL, 0 },
+    { "fps",         required_argument, NULL, OPT_FPS },
     { "frames",      required_argument, NULL, OPT_FRAMES },
     { "seek",        required_argument, NULL, OPT_SEEK },
     { "output",      required_argument, NULL, 'o' },
+    { "stdout",      required_argument, NULL, OPT_STDOUT_FORMAT },
+    { "stdin",       required_argument, NULL, OPT_STDIN_FORMAT },
     { "analyse",     required_argument, NULL, 0 },
     { "partitions",  required_argument, NULL, 'A' },
     { "direct",      required_argument, NULL, 0 },
     { "weightb",           no_argument, NULL, 'w' },
     { "no-weightb",        no_argument, NULL, 0 },
+    { "weightp",     required_argument, NULL, 0 },
     { "me",          required_argument, NULL, 0 },
     { "merange",     required_argument, NULL, 0 },
     { "mvrange",     required_argument, NULL, 0 },
     { "mvrange-thread", required_argument, NULL, 0 },
     { "subme",       required_argument, NULL, 'm' },
     { "psy-rd",      required_argument, NULL, 0 },
+    { "no-psy",            no_argument, NULL, 0 },
+    { "psy",               no_argument, NULL, 0 },
     { "mixed-refs",        no_argument, NULL, 0 },
     { "no-mixed-refs",     no_argument, NULL, 0 },
     { "no-chroma-me",      no_argument, NULL, 0 },
@@ -446,12 +562,20 @@ static struct option long_options[] =
     { "pass",        required_argument, NULL, 'p' },
     { "stats",       required_argument, NULL, 0 },
     { "qcomp",       required_argument, NULL, 0 },
+    { "mbtree",            no_argument, NULL, 0 },
+    { "no-mbtree",         no_argument, NULL, 0 },
     { "qblur",       required_argument, NULL, 0 },
     { "cplxblur",    required_argument, NULL, 0 },
     { "zones",       required_argument, NULL, 0 },
     { "qpfile",      required_argument, NULL, OPT_QPFILE },
     { "threads",     required_argument, NULL, 0 },
+    { "sliced-threads",    no_argument, NULL, 0 },
+    { "no-sliced-threads", no_argument, NULL, 0 },
+    { "slice-max-size",    required_argument, NULL, 0 },
+    { "slice-max-mbs",     required_argument, NULL, 0 },
+    { "slices",            required_argument, NULL, 0 },
     { "thread-input",      no_argument, NULL, OPT_THREAD_INPUT },
+    { "sync-lookahead",    required_argument, NULL, 0 },
     { "non-deterministic", no_argument, NULL, 0 },
     { "psnr",              no_argument, NULL, 0 },
     { "ssim",              no_argument, NULL, 0 },
@@ -485,39 +609,114 @@ static struct option long_options[] =
     {0, 0, 0, 0}
 };
 
+static int select_output( char *filename, const char *pipe_format, x264_param_t *param )
+{
+    const char *ext = get_filename_extension( filename );
+    if( !strcmp( filename, "-" ) )
+        ext = pipe_format;
+
+    if( !strcasecmp( ext, "mp4" ) )
+    {
+#ifdef MP4_OUTPUT
+        output = mp4_output; // FIXME use b_annexb=0
+#else
+        fprintf( stderr, "x264 [error]: not compiled with MP4 output support\n" );
+        return -1;
+#endif
+    }
+    else if( !strcasecmp( ext, "mkv" ) )
+        output = mkv_output; // FIXME use b_annexb=0
+    else if( !strcasecmp( ext, "flv" ) )
+    {
+        output = flv_output;
+        param->b_annexb = 0;
+    }
+    else
+        output = raw_output;
+    return 0;
+}
+
+static int select_input( char *filename, char *resolution, const char *pipe_format, x264_param_t *param )
+{
+    const char *ext = get_filename_extension( filename );
+    if( !strcmp( filename, "-" ) )
+        ext = pipe_format;
+
+    if( !strcasecmp( ext, "avi" ) || !strcasecmp( ext, "avs" ) )
+    {
+#if defined(AVS_INPUT) || defined(VFW_INPUT)
+        input = avs_input;
+#else
+        fprintf( stderr, "x264 [error]: not compiled with AVS input support\n" );
+        return -1;
+#endif
+    }
+    else if( !strcasecmp( ext, "y4m" ) )
+        input = y4m_input;
+    else if( !strcasecmp( ext, "yuv" ) )
+    {
+        if( !resolution )
+        {
+            /* try to parse the file name */
+            char *p;
+            for( p = filename; *p; p++ )
+                if( *p >= '0' && *p <= '9' &&
+                    sscanf( p, "%ux%u", &param->i_width, &param->i_height ) == 2 )
+                {
+                    if( param->i_log_level >= X264_LOG_INFO )
+                        fprintf( stderr, "x264 [info]: %dx%d (given by file name) @ %.2f fps\n", param->i_width,
+                                 param->i_height, (double)param->i_fps_num / param->i_fps_den );
+                    break;
+                }
+        }
+        else
+        {
+            sscanf( resolution, "%ux%u", &param->i_width, &param->i_height );
+            if( param->i_log_level >= X264_LOG_INFO )
+                fprintf( stderr, "x264 [info]: %dx%d @ %.2f fps\n", param->i_width, param->i_height,
+                         (double)param->i_fps_num / param->i_fps_den );
+        }
+        if( !param->i_width || !param->i_height )
+        {
+            fprintf( stderr, "x264 [error]: Rawyuv input requires a resolution.\n" );
+            return -1;
+        }
+        input = yuv_input;
+    }
+    else
+    {
+#ifdef AVS_INPUT
+        input = avs_input;
+#else
+        input = yuv_input;
+#endif
+    }
+
+    return 0;
+}
+
 /*****************************************************************************
  * Parse:
  *****************************************************************************/
 static int  Parse( int argc, char **argv,
                    x264_param_t *param, cli_opt_t *opt )
 {
-    char *psz_filename = NULL;
+    char *input_filename = NULL;
+    const char *stdin_format = stdin_format_names[0];
+    char *output_filename = NULL;
+    const char *stdout_format = stdout_format_names[0];
     x264_param_t defaults = *param;
-    char *psz;
     char *profile = NULL;
-    int b_avis = 0;
-    int b_y4m = 0;
     int b_thread_input = 0;
     int b_turbo = 1;
     int b_pass1 = 0;
     int b_user_ref = 0;
+    int b_user_fps = 0;
+    int i;
 
     memset( opt, 0, sizeof(cli_opt_t) );
     opt->b_progress = 1;
 
-    /* Default input file driver */
-    p_open_infile = open_file_yuv;
-    p_get_frame_total = get_frame_total_yuv;
-    p_read_frame = read_frame_yuv;
-    p_close_infile = close_file_yuv;
-
-    /* Default output file driver */
-    p_open_outfile = open_file_bsf;
-    p_set_outfile_param = set_param_bsf;
-    p_write_nalu = write_nalu_bsf;
-    p_set_eop = set_eop_bsf;
-    p_close_outfile = close_file_bsf;
-
     /* Presets are applied before all other options. */
     for( optind = 0;; )
     {
@@ -542,6 +741,9 @@ static int  Parse( int argc, char **argv,
                 param->rc.i_aq_mode = 0;
                 param->analyse.b_mixed_references = 0;
                 param->analyse.i_trellis = 0;
+                param->i_bframe_adaptive = X264_B_ADAPT_NONE;
+                param->rc.b_mb_tree = 0;
+                param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
             }
             else if( !strcasecmp( optarg, "veryfast" ) )
             {
@@ -551,12 +753,22 @@ static int  Parse( int argc, char **argv,
                 param->i_frame_reference = 1;
                 param->analyse.b_mixed_references = 0;
                 param->analyse.i_trellis = 0;
+                param->rc.b_mb_tree = 0;
+                param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
             }
-            else if( !strcasecmp( optarg, "fast" ) )
+            else if( !strcasecmp( optarg, "faster" ) )
             {
                 param->analyse.b_mixed_references = 0;
                 param->i_frame_reference = 2;
                 param->analyse.i_subpel_refine = 4;
+                param->rc.b_mb_tree = 0;
+                param->analyse.i_weighted_pred = X264_WEIGHTP_BLIND;
+            }
+            else if( !strcasecmp( optarg, "fast" ) )
+            {
+                param->i_frame_reference = 2;
+                param->analyse.i_subpel_refine = 6;
+                param->rc.i_lookahead = 30;
             }
             else if( !strcasecmp( optarg, "medium" ) )
             {
@@ -569,6 +781,7 @@ static int  Parse( int argc, char **argv,
                 param->i_frame_reference = 5;
                 param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
                 param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
+                param->rc.i_lookahead = 50;
             }
             else if( !strcasecmp( optarg, "slower" ) )
             {
@@ -579,6 +792,20 @@ static int  Parse( int argc, char **argv,
                 param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
                 param->analyse.inter |= X264_ANALYSE_PSUB8x8;
                 param->analyse.i_trellis = 2;
+                param->rc.i_lookahead = 60;
+            }
+            else if( !strcasecmp( optarg, "veryslow" ) )
+            {
+                param->analyse.i_me_method = X264_ME_UMH;
+                param->analyse.i_subpel_refine = 10;
+                param->analyse.i_me_range = 24;
+                param->i_frame_reference = 16;
+                param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
+                param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
+                param->analyse.inter |= X264_ANALYSE_PSUB8x8;
+                param->analyse.i_trellis = 2;
+                param->i_bframe = 8;
+                param->rc.i_lookahead = 60;
             }
             else if( !strcasecmp( optarg, "placebo" ) )
             {
@@ -592,6 +819,8 @@ static int  Parse( int argc, char **argv,
                 param->analyse.b_fast_pskip = 0;
                 param->analyse.i_trellis = 2;
                 param->i_bframe = 16;
+                param->rc.i_lookahead = 60;
+                b_turbo = 0;
             }
             else
             {
@@ -642,19 +871,27 @@ static int  Parse( int argc, char **argv,
             }
             else if( !strcasecmp( optarg, "psnr" ) )
             {
-                param->analyse.f_psy_rd = 0;
                 param->rc.i_aq_mode = X264_AQ_NONE;
+                param->analyse.b_psy = 0;
             }
             else if( !strcasecmp( optarg, "ssim" ) )
             {
-                param->analyse.f_psy_rd = 0;
                 param->rc.i_aq_mode = X264_AQ_AUTOVARIANCE;
+                param->analyse.b_psy = 0;
             }
             else if( !strcasecmp( optarg, "fastdecode" ) )
             {
                 param->b_deblocking_filter = 0;
                 param->b_cabac = 0;
                 param->analyse.b_weighted_bipred = 0;
+                param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
+            }
+            else if( !strcasecmp( optarg, "zerolatency" ) )
+            {
+                param->rc.i_lookahead = 0;
+                param->i_sync_lookahead = 0;
+                param->i_bframe = 0;
+                param->b_sliced_threads = 1;
             }
             else if( !strcasecmp( optarg, "touhou" ) )
             {
@@ -662,7 +899,6 @@ static int  Parse( int argc, char **argv,
                 param->i_deblocking_filter_alphac0 = -1;
                 param->i_deblocking_filter_beta = -1;
                 param->analyse.f_psy_trellis = 0.2;
-                param->rc.f_ip_factor = 2.1;
                 param->rc.f_aq_strength = 1.3;
                 if( param->analyse.inter & X264_ANALYSE_PSUB16x16 )
                     param->analyse.inter |= X264_ANALYSE_PSUB8x8;
@@ -698,6 +934,9 @@ static int  Parse( int argc, char **argv,
             case OPT_LONGHELP:
                 Help( &defaults, 1 );
                 exit(0);
+            case OPT_FULLHELP:
+                Help( &defaults, 2 );
+                exit(0);
             case 'V':
 #ifdef X264_POINTVER
                 printf( "x264 "X264_POINTVER"\n" );
@@ -718,42 +957,41 @@ static int  Parse( int argc, char **argv,
                 opt->i_seek = atoi( optarg );
                 break;
             case 'o':
-                if( !strncasecmp(optarg + strlen(optarg) - 4, ".mp4", 4) )
+                output_filename = optarg;
+                break;
+            case OPT_STDOUT_FORMAT:
+                for( i = 0; stdout_format_names[i] && strcasecmp( stdout_format_names[i], optarg ); )
+                    i++;
+                if( !stdout_format_names[i] )
                 {
-#ifdef MP4_OUTPUT
-                    p_open_outfile = open_file_mp4;
-                    p_write_nalu = write_nalu_mp4;
-                    p_set_outfile_param = set_param_mp4;
-                    p_set_eop = set_eop_mp4;
-                    p_close_outfile = close_file_mp4;
-#else
-                    fprintf( stderr, "x264 [error]: not compiled with MP4 output support\n" );
+                    fprintf( stderr, "x264 [error]: invalid stdout format `%s'\n", optarg );
                     return -1;
-#endif
-                }
-                else if( !strncasecmp(optarg + strlen(optarg) - 4, ".mkv", 4) )
-                {
-                    p_open_outfile = open_file_mkv;
-                    p_write_nalu = write_nalu_mkv;
-                    p_set_outfile_param = set_param_mkv;
-                    p_set_eop = set_eop_mkv;
-                    p_close_outfile = close_file_mkv;
                 }
-                if( !strcmp(optarg, "-") )
-                    opt->hout = stdout;
-                else if( p_open_outfile( optarg, &opt->hout ) )
+                stdout_format = optarg;
+                break;
+            case OPT_STDIN_FORMAT:
+                for( i = 0; stdin_format_names[i] && strcasecmp( stdin_format_names[i], optarg ); )
+                    i++;
+                if( !stdin_format_names[i] )
                 {
-                    fprintf( stderr, "x264 [error]: can't open output file `%s'\n", optarg );
+                    fprintf( stderr, "x264 [error]: invalid stdin format `%s'\n", optarg );
                     return -1;
                 }
+                stdin_format = optarg;
                 break;
             case OPT_QPFILE:
-                opt->qpfile = fopen( optarg, "r" );
+                opt->qpfile = fopen( optarg, "rb" );
                 if( !opt->qpfile )
                 {
                     fprintf( stderr, "x264 [error]: can't open `%s'\n", optarg );
                     return -1;
                 }
+                else if( !x264_is_regular_file( opt->qpfile ) )
+                {
+                    fprintf( stderr, "x264 [error]: qpfile incompatible with non-regular file `%s'\n", optarg );
+                    fclose( opt->qpfile );
+                    return -1;
+                }
                 break;
             case OPT_THREAD_INPUT:
                 b_thread_input = 1;
@@ -790,6 +1028,9 @@ static int  Parse( int argc, char **argv,
             case 'p':
                 b_pass1 = atoi( optarg ) == 1;
                 goto generic_option;
+            case OPT_FPS:
+                b_user_fps = 1;
+                goto generic_option;
             default:
 generic_option:
             {
@@ -841,6 +1082,7 @@ generic_option:
             param->b_cabac = 0;
             param->i_cqm_preset = X264_CQM_FLAT;
             param->i_bframe = 0;
+            param->analyse.i_weighted_pred = X264_WEIGHTP_NONE;
             if( param->b_interlaced )
             {
                 fprintf( stderr, "x264 [error]: baseline profile doesn't support interlacing\n" );
@@ -870,97 +1112,53 @@ generic_option:
     }
 
     /* Get the file name */
-    if( optind > argc - 1 || !opt->hout )
+    if( optind > argc - 1 || !output_filename )
     {
         fprintf( stderr, "x264 [error]: No %s file. Run x264 --help for a list of options.\n",
                  optind > argc - 1 ? "input" : "output" );
         return -1;
     }
-    psz_filename = argv[optind++];
-
-    /* check demuxer type */
-    psz = psz_filename + strlen(psz_filename) - 1;
-    while( psz > psz_filename && *psz != '.' )
-        psz--;
-    if( !strncasecmp( psz, ".avi", 4 ) || !strncasecmp( psz, ".avs", 4 ) )
-        b_avis = 1;
-    if( !strncasecmp( psz, ".y4m", 4 ) )
-        b_y4m = 1;
-
-    if( !(b_avis || b_y4m) ) // raw yuv
-    {
-        if( optind > argc - 1 )
-        {
-            /* try to parse the file name */
-            for( psz = psz_filename; *psz; psz++ )
-            {
-                if( *psz >= '0' && *psz <= '9'
-                    && sscanf( psz, "%ux%u", &param->i_width, &param->i_height ) == 2 )
-                {
-                    if( param->i_log_level >= X264_LOG_INFO )
-                        fprintf( stderr, "x264 [info]: %dx%d (given by file name) @ %.2f fps\n", param->i_width, param->i_height, (double)param->i_fps_num / (double)param->i_fps_den);
-                    break;
-                }
-            }
-        }
-        else
-        {
-            sscanf( argv[optind++], "%ux%u", &param->i_width, &param->i_height );
-            if( param->i_log_level >= X264_LOG_INFO )
-                fprintf( stderr, "x264 [info]: %dx%d @ %.2f fps\n", param->i_width, param->i_height, (double)param->i_fps_num / (double)param->i_fps_den);
-        }
-    }
+    input_filename = argv[optind++];
 
-    if( !(b_avis || b_y4m) && ( !param->i_width || !param->i_height ) )
+    if( select_output( output_filename, stdout_format, param ) )
+        return -1;
+    if( output.open_file( output_filename, &opt->hout ) )
     {
-        fprintf( stderr, "x264 [error]: Rawyuv input requires a resolution.\n" );
+        fprintf( stderr, "x264 [error]: could not open output file `%s'\n", output_filename );
         return -1;
     }
 
-    /* open the input */
+    if( select_input( input_filename, optind < argc ? argv[optind++] : NULL, stdin_format, param ) )
+        return -1;
+
     {
-        if( b_avis )
+        int i_fps_num = param->i_fps_num;
+        int i_fps_den = param->i_fps_den;
+
+        if( input.open_file( input_filename, &opt->hin, param ) )
         {
-#ifdef AVIS_INPUT
-            p_open_infile = open_file_avis;
-            p_get_frame_total = get_frame_total_avis;
-            p_read_frame = read_frame_avis;
-            p_close_infile = close_file_avis;
-#else
-            fprintf( stderr, "x264 [error]: not compiled with AVIS input support\n" );
+            fprintf( stderr, "x264 [error]: could not open input file `%s'\n", input_filename );
             return -1;
-#endif
         }
-        if ( b_y4m )
-        {
-            p_open_infile = open_file_y4m;
-            p_get_frame_total = get_frame_total_y4m;
-            p_read_frame = read_frame_y4m;
-            p_close_infile = close_file_y4m;
-        }
-
-        if( p_open_infile( psz_filename, &opt->hin, param ) )
+        /* Restore the user's frame rate if fps has been explicitly set on the commandline. */
+        if( b_user_fps )
         {
-            fprintf( stderr, "x264 [error]: could not open input file '%s'\n", psz_filename );
-            return -1;
+            param->i_fps_num = i_fps_num;
+            param->i_fps_den = i_fps_den;
         }
     }
 
 #ifdef HAVE_PTHREAD
     if( b_thread_input || param->i_threads > 1
-        || (param->i_threads == 0 && x264_cpu_num_processors() > 1) )
+        || (param->i_threads == X264_THREADS_AUTO && x264_cpu_num_processors() > 1) )
     {
-        if( open_file_thread( NULL, &opt->hin, param ) )
+        if( thread_input.open_file( NULL, &opt->hin, param ) )
         {
-            fprintf( stderr, "x264 [warning]: threaded input failed\n" );
+            fprintf( stderr, "x264 [error]: threaded input failed\n" );
+            return -1;
         }
         else
-        {
-            p_open_infile = open_file_thread;
-            p_get_frame_total = get_frame_total_thread;
-            p_read_frame = read_frame_thread;
-            p_close_infile = close_file_thread;
-        }
+            input = thread_input;
     }
 #endif
 
@@ -996,14 +1194,14 @@ static void parse_qpfile( cli_opt_t *opt, x264_picture_t *pic, int i_frame )
     {
         file_pos = ftell( opt->qpfile );
         ret = fscanf( opt->qpfile, "%d %c %d\n", &num, &type, &qp );
-               if( num > i_frame || ret == EOF )
-               {
-                       pic->i_type = X264_TYPE_AUTO;
-                       pic->i_qpplus1 = 0;
-                       fseek( opt->qpfile , file_pos , SEEK_SET );
-                       break;
-               }
-        if( num < i_frame )
+        if( num > i_frame || ret == EOF )
+        {
+            pic->i_type = X264_TYPE_AUTO;
+            pic->i_qpplus1 = 0;
+            fseek( opt->qpfile, file_pos, SEEK_SET );
+            break;
+        }
+        if( num < i_frame && ret == 3 )
             continue;
         pic->i_qpplus1 = qp+1;
         if     ( type == 'I' ) pic->i_type = X264_TYPE_IDR;
@@ -1032,50 +1230,64 @@ static int  Encode_frame( x264_t *h, hnd_t hout, x264_picture_t *pic )
 {
     x264_picture_t pic_out;
     x264_nal_t *nal;
-    int i_nal, i;
+    int i_nal, i, i_nalu_size;
     int i_file = 0;
 
     if( x264_encoder_encode( h, &nal, &i_nal, pic, &pic_out ) < 0 )
     {
         fprintf( stderr, "x264 [error]: x264_encoder_encode failed\n" );
+        return -1;
     }
 
     for( i = 0; i < i_nal; i++ )
     {
-        int i_size;
-
-        if( mux_buffer_size < nal[i].i_payload * 3/2 + 4 )
-        {
-            mux_buffer_size = nal[i].i_payload * 2 + 4;
-            x264_free( mux_buffer );
-            mux_buffer = x264_malloc( mux_buffer_size );
-        }
-
-        i_size = mux_buffer_size;
-        x264_nal_encode( mux_buffer, &i_size, 1, &nal[i] );
-        i_file += p_write_nalu( hout, mux_buffer, i_size );
+        i_nalu_size = output.write_nalu( hout, nal[i].p_payload, nal[i].i_payload, &pic_out );
+        if( i_nalu_size < 0 )
+            return -1;
+        i_file += i_nalu_size;
     }
-    if (i_nal)
-        p_set_eop( hout, &pic_out );
+    if( i_nal )
+        output.set_eop( hout, &pic_out );
 
     return i_file;
 }
 
+static void Print_status( int64_t i_start, int i_frame, int i_frame_total, int64_t i_file, x264_param_t *param )
+{
+    char    buf[200];
+    int64_t i_elapsed = x264_mdate() - i_start;
+    double fps = i_elapsed > 0 ? i_frame * 1000000. / i_elapsed : 0;
+    double bitrate = (double) i_file * 8 * param->i_fps_num / ( (double) param->i_fps_den * i_frame * 1000 );
+    if( i_frame_total )
+    {
+        int eta = i_elapsed * (i_frame_total - i_frame) / ((int64_t)i_frame * 1000000);
+        sprintf( buf, "x264 [%.1f%%] %d/%d frames, %.2f fps, %.2f kb/s, eta %d:%02d:%02d",
+                 100. * i_frame / i_frame_total, i_frame, i_frame_total, fps, bitrate,
+                 eta/3600, (eta/60)%60, eta%60 );
+    }
+    else
+    {
+        sprintf( buf, "x264 %d frames: %.2f fps, %.2f kb/s", i_frame, fps, bitrate );
+    }
+    fprintf( stderr, "%s  \r", buf+5 );
+    SetConsoleTitle( buf );
+    fflush( stderr ); // needed in windows
+}
+
 static int  Encode( x264_param_t *param, cli_opt_t *opt )
 {
     x264_t *h;
     x264_picture_t pic;
 
-    int     i_frame, i_frame_total;
+    int     i_frame, i_frame_total, i_frame_output;
     int64_t i_start, i_end;
     int64_t i_file;
     int     i_frame_size;
     int     i_update_interval;
-    char    buf[200];
 
     opt->b_progress &= param->i_log_level < X264_LOG_DEBUG;
-    i_frame_total = p_get_frame_total( opt->hin );
-    i_frame_total -= opt->i_seek;
+    i_frame_total = input.get_frame_total( opt->hin );
+    i_frame_total = X264_MAX( i_frame_total - opt->i_seek, 0 );
     if( ( i_frame_total == 0 || param->i_frame_total < i_frame_total )
         && param->i_frame_total > 0 )
         i_frame_total = param->i_frame_total;
@@ -1085,27 +1297,31 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
     if( ( h = x264_encoder_open( param ) ) == NULL )
     {
         fprintf( stderr, "x264 [error]: x264_encoder_open failed\n" );
-        p_close_infile( opt->hin );
+        input.close_file( opt->hin );
         return -1;
     }
 
-    if( p_set_outfile_param( opt->hout, param ) )
+    if( output.set_param( opt->hout, param ) )
     {
         fprintf( stderr, "x264 [error]: can't set outfile param\n" );
-        p_close_infile( opt->hin );
-        p_close_outfile( opt->hout );
+        input.close_file( opt->hin );
+        output.close_file( opt->hout );
         return -1;
     }
 
     /* Create a new pic */
-    x264_picture_alloc( &pic, X264_CSP_I420, param->i_width, param->i_height );
+    if( input.picture_alloc( &pic, param->i_csp, param->i_width, param->i_height ) )
+    {
+        fprintf( stderr, "x264 [error]: malloc failed\n" );
+        return -1;
+    }
 
     i_start = x264_mdate();
 
     /* Encode frames */
-    for( i_frame = 0, i_file = 0; b_ctrl_c == 0 && (i_frame < i_frame_total || i_frame_total == 0); )
+    for( i_frame = 0, i_file = 0, i_frame_output = 0; b_ctrl_c == 0 && (i_frame < i_frame_total || i_frame_total == 0); )
     {
-        if( p_read_frame( &pic, opt->hin, i_frame + opt->i_seek ) )
+        if( input.read_frame( &pic, opt->hin, i_frame + opt->i_seek ) )
             break;
 
         pic.i_pts = (int64_t)i_frame * param->i_fps_den;
@@ -1119,61 +1335,57 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
             pic.i_qpplus1 = 0;
         }
 
-        i_file += Encode_frame( h, opt->hout, &pic );
+        i_frame_size = Encode_frame( h, opt->hout, &pic );
+        if( i_frame_size < 0 )
+            return -1;
+        i_file += i_frame_size;
+        if( i_frame_size )
+            i_frame_output++;
 
         i_frame++;
 
+        if( input.release_frame && input.release_frame( &pic, opt->hin ) )
+            break;
+
         /* update status line (up to 1000 times per input file) */
-        if( opt->b_progress && i_frame % i_update_interval == 0 )
-        {
-            int64_t i_elapsed = x264_mdate() - i_start;
-            double fps = i_elapsed > 0 ? i_frame * 1000000. / i_elapsed : 0;
-            double bitrate = (double) i_file * 8 * param->i_fps_num / ( (double) param->i_fps_den * i_frame * 1000 );
-            if( i_frame_total )
-            {
-                int eta = i_elapsed * (i_frame_total - i_frame) / ((int64_t)i_frame * 1000000);
-                sprintf( buf, "x264 [%.1f%%] %d/%d frames, %.2f fps, %.2f kb/s, eta %d:%02d:%02d",
-                         100. * i_frame / i_frame_total, i_frame, i_frame_total, fps, bitrate,
-                         eta/3600, (eta/60)%60, eta%60 );
-            }
-            else
-            {
-                sprintf( buf, "x264 %d frames: %.2f fps, %.2f kb/s", i_frame, fps, bitrate );
-            }
-            fprintf( stderr, "%s  \r", buf+5 );
-            SetConsoleTitle( buf );
-            fflush( stderr ); // needed in windows
-        }
+        if( opt->b_progress && i_frame_output % i_update_interval == 0 && i_frame_output )
+            Print_status( i_start, i_frame_output, i_frame_total, i_file, param );
     }
-    /* Flush delayed B-frames */
-    do {
-        i_file +=
+    /* Flush delayed frames */
+    while( !b_ctrl_c && x264_encoder_delayed_frames( h ) )
+    {
         i_frame_size = Encode_frame( h, opt->hout, NULL );
-    } while( i_frame_size );
+        if( i_frame_size < 0 )
+            return -1;
+        i_file += i_frame_size;
+        if( i_frame_size )
+            i_frame_output++;
+        if( opt->b_progress && i_frame_output % i_update_interval == 0 && i_frame_output )
+            Print_status( i_start, i_frame_output, i_frame_total, i_file, param );
+    }
 
     i_end = x264_mdate();
-    x264_picture_clean( &pic );
+    input.picture_clean( &pic );
     /* Erase progress indicator before printing encoding stats. */
     if( opt->b_progress )
         fprintf( stderr, "                                                                               \r" );
     x264_encoder_close( h );
-    x264_free( mux_buffer );
     fprintf( stderr, "\n" );
 
     if( b_ctrl_c )
-        fprintf( stderr, "aborted at input frame %d\n", opt->i_seek + i_frame );
+        fprintf( stderr, "aborted at input frame %d, output frame %d\n", opt->i_seek + i_frame, i_frame_output );
 
-    p_close_infile( opt->hin );
-    p_close_outfile( opt->hout );
+    input.close_file( opt->hin );
+    output.close_file( opt->hout );
 
-    if( i_frame > 0 )
+    if( i_frame_output > 0 )
     {
-        double fps = (double)i_frame * (double)1000000 /
+        double fps = (double)i_frame_output * (double)1000000 /
                      (double)( i_end - i_start );
 
-        fprintf( stderr, "encoded %d frames, %.2f fps, %.2f kb/s\n", i_frame, fps,
+        fprintf( stderr, "encoded %d frames, %.2f fps, %.2f kb/s\n", i_frame_output, fps,
                  (double) i_file * 8 * param->i_fps_num /
-                 ( (double) param->i_fps_den * i_frame * 1000 ) );
+                 ( (double) param->i_fps_den * i_frame_output * 1000 ) );
     }
 
     return 0;