X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=x264.c;h=74d5e2645a01b5d696aac1b79aac1f9fe82f57d9;hb=485172deeb75ca1eb88ac24b6ab6719b8a16825b;hp=50f503f7403060b00cfc5708bb7e7377409dcfdd;hpb=6fe92323b2e007e3a31714fb5b090b732fc24e62;p=x264

diff --git a/x264.c b/x264.c
index 50f503f7..74d5e264 100644
--- a/x264.c
+++ b/x264.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * x264: h264 encoder/decoder testing program.
+ * x264: h264 encoder testing program.
  *****************************************************************************
  * Copyright (C) 2003 Laurent Aimar
  * $Id: x264.c,v 1.1 2004/06/03 19:24:12 fenrir Exp $
@@ -21,10 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-
 #include <math.h>
 
 #include <signal.h>
@@ -36,30 +38,17 @@
 #include <fcntl.h>  /* _O_BINARY */
 #endif
 
-#ifdef AVIS_INPUT
-#include <windows.h>
-#include <vfw.h>
-#endif
-
-#ifdef MP4_OUTPUT
-#include <gpac/isomedia.h>
-#endif
-
-
-#include "common/common.h"
-#include "x264.h"
-
 #ifndef _MSC_VER
 #include "config.h"
 #endif
 
-#include "matroska.h"
+#include "common/common.h"
+#include "x264.h"
+#include "muxers.h"
 
 #define DATA_MAX 3000000
 uint8_t data[DATA_MAX];
 
-typedef void *hnd_t;
-
 /* Ctrl-C handler */
 static int     b_ctrl_c = 0;
 static int     b_exit_on_ctrl_c = 0;
@@ -71,30 +60,18 @@ static void    SigIntHandler( int a )
 }
 
 typedef struct {
-    int b_decompress;
     int b_progress;
     int i_seek;
     hnd_t hin;
     hnd_t hout;
+    FILE *qpfile;
 } cli_opt_t;
 
 /* input file operation function pointers */
-static int (*p_open_infile)( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-static int (*p_get_frame_total)( hnd_t handle, int i_width, int i_height );
-static int (*p_read_frame)( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height );
-static int (*p_close_infile)( hnd_t handle );
-
-static int open_file_yuv( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-static int get_frame_total_yuv( hnd_t handle, int i_width, int i_height );
-static int read_frame_yuv( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height );
-static int close_file_yuv( hnd_t handle );
-
-#ifdef AVIS_INPUT
-static int open_file_avis( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param );
-static int get_frame_total_avis( hnd_t handle, int i_width, int i_height );
-static int read_frame_avis( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height );
-static int close_file_avis( hnd_t handle );
-#endif
+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 );
 
 /* output file operation function pointers */
 static int (*p_open_outfile)( char *psz_filename, hnd_t *p_handle );
@@ -103,27 +80,7 @@ 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 );
 
-static int open_file_bsf( char *psz_filename, hnd_t *p_handle );
-static int set_param_bsf( hnd_t handle, x264_param_t *p_param );
-static int write_nalu_bsf( hnd_t handle, uint8_t *p_nal, int i_size );
-static int set_eop_bsf( hnd_t handle,  x264_picture_t *p_picture );
-static int close_file_bsf( hnd_t handle );
-
-#ifdef MP4_OUTPUT
-static int open_file_mp4( char *psz_filename, hnd_t *p_handle );
-static int set_param_mp4( hnd_t handle, x264_param_t *p_param );
-static int write_nalu_mp4( hnd_t handle, uint8_t *p_nal, int i_size );
-static int set_eop_mp4( hnd_t handle, x264_picture_t *p_picture );
-static int close_file_mp4( hnd_t handle );
-#endif
-
-static int open_file_mkv( char *psz_filename, hnd_t *p_handle );
-static int set_param_mkv( hnd_t handle, x264_param_t *p_param );
-static int write_nalu_mkv( hnd_t handle, uint8_t *p_nal, int i_size );
-static int set_eop_mkv( hnd_t handle, x264_picture_t *p_picture );
-static int close_file_mkv( hnd_t handle );
-
-static void Help( x264_param_t *defaults );
+static void Help( x264_param_t *defaults, int b_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 );
 
@@ -137,7 +94,7 @@ int main( int argc, char **argv )
     cli_opt_t opt;
 
 #ifdef _MSC_VER
-    _setmode(_fileno(stdin), _O_BINARY);    /* thanks to Marcos Morais <morais at dee.ufcg.edu.br> */
+    _setmode(_fileno(stdin), _O_BINARY);
     _setmode(_fileno(stdout), _O_BINARY);
 #endif
 
@@ -153,13 +110,6 @@ int main( int argc, char **argv )
     return Encode( &param, &opt );
 }
 
-static const char * const overscan_str[] = { "undef", "show", "crop", NULL };
-static const char * const vidformat_str[] = { "component", "pal", "ntsc", "secam", "mac", "undef", NULL };
-static const char * const fullrange_str[] = { "off", "on", NULL };
-static const char * const colorprim_str[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "film", NULL };
-static const char * const transfer_str[] = { "", "bt709", "undef", "", "bt470m", "bt470bg", "smpte170m", "smpte240m", "linear", "log100", "log316", NULL };
-static const char * const colmatrix_str[] = { "GBR", "bt709", "undef", "", "fcc", "bt470bg", "smpte170m", "smpte240m", "YCgCo", NULL };
-
 static char const *strtable_lookup( const char * const table[], int index )
 {
     int i = 0; while( table[i] ) i++;
@@ -169,223 +119,190 @@ static char const *strtable_lookup( const char * const table[], int index )
 /*****************************************************************************
  * Help:
  *****************************************************************************/
-static void Help( x264_param_t *defaults )
-{
-    fprintf( stderr,
-             "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 AVI or Avisynth if compiled with AVIS support (%s).\n"
-             "Outfile type is selected by filename:\n"
-             " .264 -> Raw bytestream\n"
-             " .mkv -> Matroska\n"
-             " .mp4 -> MP4 if compiled with GPAC support (%s)\n"
-             "\n"
-             "Options:\n"
-             "\n"
-             "  -h, --help                  Print this help\n"
-             "\n"
-             "Frame-type options:\n"
-             "\n"
-             "  -I, --keyint <integer>      Maximum GOP size [%d]\n"
-             "  -i, --min-keyint <integer>  Minimum GOP size [%d]\n"
-             "      --scenecut <integer>    How aggressively to insert extra I-frames [%d]\n"
-             "  -b, --bframes <integer>     Number of B-frames between I and P [%d]\n"
-             "      --no-b-adapt            Disable adaptive B-frame decision\n"
-             "      --b-bias <integer>      Influences how often B-frames are used [%d]\n"
-             "      --b-pyramid             Keep some B-frames as references\n"
-             "\n"
-             "      --no-cabac              Disable CABAC\n"
-             "  -r, --ref <integer>         Number of reference frames [%d]\n"
-             "      --nf                    Disable loop filter\n"
-             "  -f, --filter <alpha:beta>   Loop filter AlphaC0 and Beta parameters [%d:%d]\n"
-             "\n"
-             "Ratecontrol:\n"
-             "\n"
-             "  -q, --qp <integer>          Set QP (0=lossless) [%d]\n"
-             "  -B, --bitrate <integer>     Set bitrate\n"
-             "      --crf <integer>         Quality-based VBR (nominal QP)\n"
-             "      --qpmin <integer>       Set min QP [%d]\n"
-             "      --qpmax <integer>       Set max QP [%d]\n"
-             "      --qpstep <integer>      Set max QP step [%d]\n"
-             "      --ratetol <float>       Allowed variance of average bitrate [%.1f]\n"
-             "      --vbv-maxrate <integer> Max local bitrate [%d]\n"
-             "      --vbv-bufsize <integer> Size of VBV buffer [%d]\n"
-             "      --vbv-init <float>      Initial VBV buffer occupancy [%.1f]\n"
-             "\n"
-             "      --ipratio <float>       QP factor between I and P [%.2f]\n"
-             "      --pbratio <float>       QP factor between P and B [%.2f]\n"
-             "      --chroma-qp-offset <integer>  QP difference between chroma and luma [%d]\n"
-             "\n"
-             "  -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"
-             "      --stats <string>        Filename for 2 pass stats [\"%s\"]\n"
-             "      --rceq <string>         Ratecontrol equation [\"%s\"]\n"
-             "      --qcomp <float>         QP curve compression: 0.0 => CBR, 1.0 => CQP [%.2f]\n"
-             "      --cplxblur <float>      Reduce fluctuations in QP (before curve compression) [%.1f]\n"
-             "      --qblur <float>         Reduce fluctuations in QP (after curve compression) [%.1f]\n"
-             "\n"
-             "      --zones <zone0>/<zone1>/...\n"
-             "                              Tweak the bitrate of some regions of the video\n"
-             "                              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"
-             "\n"
-             "Analysis:\n"
-             "\n"
-             "  -A, --analyse <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"
-             "      --direct <string>       Direct MV prediction mode [\"%s\"]\n"
-             "                                  - none, spatial, temporal\n"
-             "  -w, --weightb               Weighted prediction for B-frames\n"
-             "      --me <string>           Integer pixel motion estimation method [\"%s\"]\n"
-             "                                  - dia: diamond search, radius 1 (fast)\n"
-             "                                  - hex: hexagonal search, radius 2\n"
-             "                                  - umh: uneven multi-hexagon search\n"
-             "                                  - esa: exhaustive search (slow)\n"
-             "      --merange <integer>     Maximum motion vector search range [%d]\n"
-             "  -m, --subme <integer>       Subpixel motion estimation and partition\n"
-             "                                  decision quality: 1=fast, 6=best. [%d]\n"
-             "      --b-rdo                 RD based mode decision for B-frames. Requires subme 6.\n"
-             "      --mixed-refs            Decide references on a per partition basis\n"
-             "      --no-chroma-me          Ignore chroma in motion estimation\n"
-             "  -8, --8x8dct                Adaptive spatial transform size\n"
-             "  -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"
-             "\n"
-             "      --cqm <string>          Preset quant matrices [\"flat\"]\n"
-             "                                  - jvt, flat\n"
-             "      --cqmfile <string>      Read quant matrices from a JM-compatible file\n"
-             "                                  Overrides any other --cqm* options.\n"
-             "      --cqm4 <list>           Set all 4x4 quant matrices\n"
-             "                                  Takes a comma-separated list of 16 integers.\n"
-             "      --cqm8 <list>           Set all 8x8 quant matrices\n"
-             "                                  Takes a comma-separated list of 64 integers.\n"
-             "      --cqm4i, --cqm4p, --cqm8i, --cqm8p\n"
-             "                              Set both luma and chroma quant matrices\n"
-             "      --cqm4iy, --cqm4ic, --cqm4py, --cqm4pc\n"
-             "                              Set individual quant matrices\n"
-             "\n"
-             "Video Usability Info (Annex E):\n"
-             "The VUI settings are not used by the encoder but are merely suggestions to\n"
-             "the playback equipment. See doc/vui.txt for details. Use at your own risk.\n"
-             "\n"
-             "      --sar width:height      Specify Sample Aspect Ratio\n"
-             "      --overscan <string>     Specify crop overscan setting [\"%s\"]\n"
-             "                                  - undef, show, crop\n"
-             "      --videoformat <string>  Specify video format [\"%s\"]\n"
-             "                                  - component, pal, ntsc, secam, mac, undef\n"
-             "      --fullrange <string>    Specify full range samples setting [\"%s\"]\n"
-             "                                  - off, on\n"
-             "      --colorprim <string>    Specify color primaries [\"%s\"]\n"
-             "                                  - undef, bt709, bt470m, bt470bg\n"
-             "                                    smpte170m, smpte240m, film\n"
-             "      --transfer <string>     Specify transfer characteristics [\"%s\"]\n"
-             "                                  - undef, bt709, bt470m, bt470bg, linear,\n"
-             "                                    log100, log316, smpte170m, smpte240m\n"
-             "      --colormatrix <string>  Specify color matrix setting [\"%s\"]\n"
-             "                                  - undef, bt709, fcc, bt470bg\n"
-             "                                    smpte170m, smpte240m, GBR, YCgCo\n"
-             "      --chromaloc <integer>   Specify chroma sample location (0 to 5) [%d]\n"
-             "\n"
-             "Input/Output:\n"
-             "\n"
-             "      --level <string>        Specify level (as defined by Annex A)\n"
-             "      --fps <float|rational>  Specify framerate\n"
-             "      --seek <integer>        First frame to encode\n"
-             "      --frames <integer>      Maximum number of frames to encode\n"
-             "  -o, --output                Specify output file\n"
-             "\n"
-             "      --threads <integer>     Parallel encoding (uses slices)\n"
-             "      --no-asm                Disable all CPU optimizations\n"
-             "      --no-psnr               Disable PSNR computation\n"
-             "      --quiet                 Quiet Mode\n"
-             "  -v, --verbose               Print stats for each frame\n"
-             "      --progress              Show a progress indicator while encoding\n"
-             "      --visualize             Show MB types overlayed on the encoded video\n"
-             "      --aud                   Use access unit delimiters\n"
-             "\n",
-            X264_BUILD, X264_VERSION,
+static void Help( x264_param_t *defaults, int b_longhelp )
+{
+#define H0 printf
+#define H1 if(b_longhelp) 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"
+        "Outfile type is selected by filename:\n"
+        " .264 -> Raw bytestream\n"
+        " .mkv -> Matroska\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"
+        "\n",
+        X264_BUILD, X264_VERSION,
 #ifdef AVIS_INPUT
-            "yes",
+        "yes",
 #else
-            "no",
+        "no",
 #endif
 #ifdef MP4_OUTPUT
-            "yes",
+        "yes"
 #else
-            "no",
+        "no"
 #endif
-            defaults->i_keyint_max,
-            defaults->i_keyint_min,
-            defaults->i_scenecut_threshold,
-            defaults->i_bframe,
-            defaults->i_bframe_bias,
-            defaults->i_frame_reference,
-            defaults->i_deblocking_filter_alphac0,
-            defaults->i_deblocking_filter_beta,
-            defaults->rc.i_qp_constant,
-            defaults->rc.i_qp_min,
-            defaults->rc.i_qp_max,
-            defaults->rc.i_qp_step,
-            defaults->rc.f_rate_tolerance,
-            defaults->rc.i_vbv_max_bitrate,
-            defaults->rc.i_vbv_buffer_size,
-            defaults->rc.f_vbv_buffer_init,
-            defaults->rc.f_ip_factor,
-            defaults->rc.f_pb_factor,
-            defaults->analyse.i_chroma_qp_offset,
-            defaults->rc.psz_stat_out,
-            defaults->rc.psz_rc_eq,
-            defaults->rc.f_qcompress,
-            defaults->rc.f_complexity_blur,
-            defaults->rc.f_qblur,
-            strtable_lookup( x264_direct_pred_names, defaults->analyse.i_direct_mv_pred ),
-            strtable_lookup( x264_motion_est_names, defaults->analyse.i_me_method ),
-            defaults->analyse.i_me_range,
-            defaults->analyse.i_subpel_refine,
-            defaults->analyse.i_trellis,
-            strtable_lookup( overscan_str, defaults->vui.i_overscan ),
-            strtable_lookup( vidformat_str, defaults->vui.i_vidformat ),
-            strtable_lookup( fullrange_str, defaults->vui.b_fullrange ),
-            strtable_lookup( colorprim_str, defaults->vui.i_colorprim ),
-            strtable_lookup( transfer_str, defaults->vui.i_transfer ),
-            strtable_lookup( colmatrix_str, defaults->vui.i_colmatrix ),
-            defaults->vui.i_chroma_loc
-           );
-}
-
-static int parse_enum( const char *arg, const char * const *names, int *dst )
-{
-    int i;
-    for( i = 0; names[i]; i++ )
-        if( !strcmp( arg, names[i] ) )
-        {
-            *dst = i;
-            return 0;
-        }
-    return -1;
-}
-
-static int parse_cqm( const char *str, uint8_t *cqm, int length )
-{
-    int i = 0;
-    do {
-        int coef;
-        if( !sscanf( str, "%d", &coef ) || coef < 1 || coef > 255 )
-            return -1;
-        cqm[i++] = coef;
-    } while( i < length && (str = strchr( str, ',' )) && str++ );
-    return (i == length) ? 0 : -1;
+      );
+    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( "      --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 );
+    H1( "      --no-b-adapt            Disable adaptive B-frame decision\n" );
+    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 );
+    H1( "      --no-deblock            Disable loop filter\n" );
+    H0( "  -f, --deblock <alpha:beta>  Loop filter AlphaC0 and Beta parameters [%d:%d]\n",
+                                       defaults->i_deblocking_filter_alphac0, defaults->i_deblocking_filter_beta );
+    H0( "      --interlaced            Enable pure-interlaced mode\n" );
+    H0( "\n" );
+    H0( "Ratecontrol:\n" );
+    H0( "\n" );
+    H0( "  -q, --qp <integer>          Set QP (0=lossless) [%d]\n", defaults->rc.i_qp_constant );
+    H0( "  -B, --bitrate <integer>     Set bitrate (kbit/s)\n" );
+    H0( "      --crf <float>           Quality-based VBR (nominal QP)\n" );
+    H1( "      --vbv-maxrate <integer> Max local bitrate (kbit/s) [%d]\n", defaults->rc.i_vbv_max_bitrate );
+    H0( "      --vbv-bufsize <integer> Enable CBR and 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 );
+    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 );
+    H1( "      --rceq <string>         Ratecontrol equation [\"%s\"]\n", defaults->rc.psz_rc_eq );
+    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"
+        "                                  <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\n" );
+    H0( "\n" );
+    H0( "Analysis:\n" );
+    H0( "\n" );
+    H0( "  -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"
+        "                                  - none, spatial, temporal, auto\n",
+                                       strtable_lookup( x264_direct_pred_names, defaults->analyse.i_direct_mv_pred ) );
+    H1( "      --direct-8x8 <-1|0|1>   Direct prediction size [%d]\n"
+        "                                  -  0: 4x4\n"
+        "                                  -  1: 8x8\n"
+        "                                  - -1: smallest possible according to level\n",
+                                       defaults->analyse.i_direct_8x8_inference );
+    H0( "  -w, --weightb               Weighted prediction for B-frames\n" );
+    H0( "      --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"
+        "                                  - hex: hexagonal search, radius 2\n"
+        "                                  - umh: uneven multi-hexagon search\n"
+        "                                  - esa: 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 );
+    H0( "  -m, --subme <integer>       Subpixel motion estimation and partition\n"
+        "                                  decision quality: 1=fast, 7=best. [%d]\n", defaults->analyse.i_subpel_refine );
+    H0( "      --b-rdo                 RD based mode decision for B-frames. Requires subme 6.\n" );
+    H0( "      --mixed-refs            Decide references on a per partition basis\n" );
+    H1( "      --no-chroma-me          Ignore chroma in motion estimation\n" );
+    H1( "      --bime                  Jointly optimize both MVs in B-frames\n" );
+    H0( "  -8, --8x8dct                Adaptive spatial transform size\n" );
+    H0( "  -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"
+        "                                  - 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"
+        "                                  Takes a comma-separated list of 16 integers.\n" );
+    H1( "      --cqm8 <list>           Set all 8x8 quant matrices\n"
+        "                                  Takes a comma-separated list of 64 integers.\n" );
+    H1( "      --cqm4i, --cqm4p, --cqm8i, --cqm8p\n"
+        "                              Set both luma and chroma quant matrices\n" );
+    H1( "      --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"
+        "                                  - undef, show, crop\n",
+                                       strtable_lookup( x264_overscan_names, defaults->vui.i_overscan ) );
+    H1( "      --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"
+        "                                  - off, on\n",
+                                       strtable_lookup( x264_fullrange_names, defaults->vui.b_fullrange ) );
+    H1( "      --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"
+        "                                  - 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"
+        "                                  - 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",
+                                       defaults->vui.i_chroma_loc );
+    H0( "\n" );
+    H0( "Input/Output:\n" );
+    H0( "\n" );
+    H0( "  -o, --output                Specify output file\n" );
+    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( "      --progress              Show a progress indicator while encoding\n" );
+    H0( "      --quiet                 Quiet Mode\n" );
+    H0( "      --no-psnr               Disable PSNR computation\n" );
+    H0( "      --no-ssim               Disable SSIM computation\n" );
+    H0( "      --threads <integer>     Parallel encoding (uses slices)\n" );
+    H0( "      --thread-input          Run Avisynth in its own thread\n" );
+    H1( "      --no-asm                Disable all CPU optimizations\n" );
+    H1( "      --visualize             Show MB types overlayed on the encoded video\n" );
+    H1( "      --sps-id <integer>      Set SPS and PPS id numbers [%d]\n", defaults->i_sps_id );
+    H1( "      --aud                   Use access unit delimiters\n" );
+    H0( "\n" );
 }
 
 /*****************************************************************************
@@ -397,7 +314,9 @@ static int  Parse( int argc, char **argv,
     char *psz_filename = NULL;
     x264_param_t defaults = *param;
     char *psz;
-    char b_avis = 0;
+    int b_avis = 0;
+    int b_y4m = 0;
+    int b_thread_input = 0;
 
     memset( opt, 0, sizeof(cli_opt_t) );
 
@@ -415,155 +334,120 @@ static int  Parse( int argc, char **argv,
     p_close_outfile = close_file_bsf;
 
     /* Parse command line options */
-    opterr = 0; // no error message
     for( ;; )
     {
         int b_error = 0;
-        int long_options_index;
-#define OPT_QPMIN 256
-#define OPT_QPMAX 257
-#define OPT_QPSTEP 258
-#define OPT_IPRATIO 260
-#define OPT_PBRATIO 261
-#define OPT_RATETOL 262
-#define OPT_RCSTATS 264
-#define OPT_RCEQ 265
-#define OPT_QCOMP 266
-#define OPT_NOPSNR 267
-#define OPT_QUIET 268
-#define OPT_SCENECUT 270
-#define OPT_QBLUR 271
-#define OPT_CPLXBLUR 272
-#define OPT_FRAMES 273
-#define OPT_FPS 274
-#define OPT_DIRECT 275
-#define OPT_LEVEL 276
-#define OPT_NOBADAPT 277
-#define OPT_BBIAS 278
-#define OPT_BPYRAMID 279
-#define OPT_CHROMA_QP 280
-#define OPT_NO_CHROMA_ME 281
-#define OPT_NO_CABAC 282
-#define OPT_AUD 283
-#define OPT_PROGRESS 284
-#define OPT_ME 285
-#define OPT_MERANGE 286
-#define OPT_VBVMAXRATE 287
-#define OPT_VBVBUFSIZE 288
-#define OPT_VBVINIT 289
-#define OPT_VISUALIZE 290
-#define OPT_SEEK 291
-#define OPT_ZONES 292
-#define OPT_THREADS 293
-#define OPT_CQM 294
-#define OPT_CQM4 295
-#define OPT_CQM4I 296
-#define OPT_CQM4IY 297
-#define OPT_CQM4IC 298
-#define OPT_CQM4P 299
-#define OPT_CQM4PY 300
-#define OPT_CQM4PC 301
-#define OPT_CQM8 302
-#define OPT_CQM8I 303
-#define OPT_CQM8P 304
-#define OPT_CQMFILE 305
-#define OPT_SAR 306
-#define OPT_OVERSCAN 307
-#define OPT_VIDFORMAT 308
-#define OPT_FULLRANGE 309
-#define OPT_COLOURPRIM 310
-#define OPT_TRANSFER 311
-#define OPT_COLOURMATRIX 312
-#define OPT_CHROMALOC 313
-#define OPT_MIXED_REFS 314
-#define OPT_CRF 315
-#define OPT_B_RDO 316
+        int long_options_index = -1;
+
+#define OPT_FRAMES 256
+#define OPT_SEEK 257
+#define OPT_QPFILE 258
+#define OPT_THREAD_INPUT 259
+#define OPT_QUIET 260
+#define OPT_PROGRESS 261
+#define OPT_VISUALIZE 262
+#define OPT_LONGHELP 263
 
         static struct option long_options[] =
         {
             { "help",    no_argument,       NULL, 'h' },
+            { "longhelp",no_argument,       NULL, OPT_LONGHELP },
+            { "version", no_argument,       NULL, 'V' },
             { "bitrate", required_argument, NULL, 'B' },
             { "bframes", required_argument, NULL, 'b' },
-            { "no-b-adapt", no_argument,    NULL, OPT_NOBADAPT },
-            { "b-bias",  required_argument, NULL, OPT_BBIAS },
-            { "b-pyramid", no_argument,     NULL, OPT_BPYRAMID },
+            { "no-b-adapt", no_argument,    NULL, 0 },
+            { "b-bias",  required_argument, NULL, 0 },
+            { "b-pyramid", no_argument,     NULL, 0 },
             { "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' },
-            { "no-cabac",no_argument,       NULL, OPT_NO_CABAC },
+            { "scenecut",required_argument, NULL, 0 },
+            { "nf",      no_argument,       NULL, 0 },
+            { "no-deblock", no_argument,    NULL, 0 },
+            { "filter",  required_argument, NULL, 0 },
+            { "deblock", required_argument, NULL, 'f' },
+            { "interlaced", no_argument,    NULL, 0 },
+            { "no-cabac",no_argument,       NULL, 0 },
             { "qp",      required_argument, NULL, 'q' },
-            { "qpmin",   required_argument, NULL, OPT_QPMIN },
-            { "qpmax",   required_argument, NULL, OPT_QPMAX },
-            { "qpstep",  required_argument, NULL, OPT_QPSTEP },
-            { "crf",     required_argument, NULL, OPT_CRF },
+            { "qpmin",   required_argument, NULL, 0 },
+            { "qpmax",   required_argument, NULL, 0 },
+            { "qpstep",  required_argument, NULL, 0 },
+            { "crf",     required_argument, NULL, 0 },
             { "ref",     required_argument, NULL, 'r' },
-            { "no-asm",  no_argument,       NULL, 'C' },
-            { "sar",     required_argument, NULL, OPT_SAR },
-            { "fps",     required_argument, NULL, OPT_FPS },
+            { "no-asm",  no_argument,       NULL, 0 },
+            { "sar",     required_argument, NULL, 0 },
+            { "fps",     required_argument, NULL, 0 },
             { "frames",  required_argument, NULL, OPT_FRAMES },
             { "seek",    required_argument, NULL, OPT_SEEK },
             { "output",  required_argument, NULL, 'o' },
-            { "analyse", required_argument, NULL, 'A' },
-            { "direct",  required_argument, NULL, OPT_DIRECT },
+            { "analyse", required_argument, NULL, 0 },
+            { "partitions", required_argument, NULL, 'A' },
+            { "direct",  required_argument, NULL, 0 },
+            { "direct-8x8", required_argument, NULL, 0 },
             { "weightb", no_argument,       NULL, 'w' },
-            { "me",      required_argument, NULL, OPT_ME },
-            { "merange", required_argument, NULL, OPT_MERANGE },
+            { "me",      required_argument, NULL, 0 },
+            { "merange", required_argument, NULL, 0 },
             { "subme",   required_argument, NULL, 'm' },
-            { "b-rdo", no_argument,    NULL, OPT_B_RDO },
-            { "mixed-refs", no_argument,    NULL, OPT_MIXED_REFS },
-            { "no-chroma-me", no_argument,  NULL, OPT_NO_CHROMA_ME },
+            { "b-rdo",   no_argument,       NULL, 0 },
+            { "mixed-refs", no_argument,    NULL, 0 },
+            { "no-chroma-me", no_argument,  NULL, 0 },
+            { "bime",    no_argument,       NULL, 0 },
             { "8x8dct",  no_argument,       NULL, '8' },
             { "trellis", required_argument, NULL, 't' },
-            { "level",   required_argument, NULL, OPT_LEVEL },
-            { "ratetol", required_argument, NULL, OPT_RATETOL },
-            { "vbv-maxrate", required_argument, NULL, OPT_VBVMAXRATE },
-            { "vbv-bufsize", required_argument, NULL, OPT_VBVBUFSIZE },
-            { "vbv-init", required_argument,NULL,  OPT_VBVINIT },
-            { "ipratio", required_argument, NULL, OPT_IPRATIO },
-            { "pbratio", required_argument, NULL, OPT_PBRATIO },
-            { "chroma-qp-offset", required_argument, NULL, OPT_CHROMA_QP },
+            { "no-fast-pskip", no_argument, NULL, 0 },
+            { "no-dct-decimate", no_argument, NULL, 0 },
+            { "deadzone-inter", required_argument, NULL, '0' },
+            { "deadzone-intra", required_argument, NULL, '0' },
+            { "level",   required_argument, NULL, 0 },
+            { "ratetol", required_argument, NULL, 0 },
+            { "vbv-maxrate", required_argument, NULL, 0 },
+            { "vbv-bufsize", required_argument, NULL, 0 },
+            { "vbv-init", required_argument,NULL,  0 },
+            { "ipratio", required_argument, NULL, 0 },
+            { "pbratio", required_argument, NULL, 0 },
+            { "chroma-qp-offset", required_argument, NULL, 0 },
             { "pass",    required_argument, NULL, 'p' },
-            { "stats",   required_argument, NULL, OPT_RCSTATS },
-            { "rceq",    required_argument, NULL, OPT_RCEQ },
-            { "qcomp",   required_argument, NULL, OPT_QCOMP },
-            { "qblur",   required_argument, NULL, OPT_QBLUR },
-            { "cplxblur",required_argument, NULL, OPT_CPLXBLUR },
-            { "zones",   required_argument, NULL, OPT_ZONES },
-            { "threads", required_argument, NULL, OPT_THREADS },
-            { "no-psnr", no_argument,       NULL, OPT_NOPSNR },
+            { "stats",   required_argument, NULL, 0 },
+            { "rceq",    required_argument, NULL, 0 },
+            { "qcomp",   required_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 },
+            { "thread-input", no_argument,  NULL, OPT_THREAD_INPUT },
+            { "no-psnr", no_argument,       NULL, 0 },
+            { "no-ssim", no_argument,       NULL, 0 },
             { "quiet",   no_argument,       NULL, OPT_QUIET },
             { "verbose", no_argument,       NULL, 'v' },
             { "progress",no_argument,       NULL, OPT_PROGRESS },
             { "visualize",no_argument,      NULL, OPT_VISUALIZE },
-            { "aud",     no_argument,       NULL, OPT_AUD },
-            { "cqm",     required_argument, NULL, OPT_CQM },
-            { "cqmfile", required_argument, NULL, OPT_CQMFILE },
-            { "cqm4",    required_argument, NULL, OPT_CQM4 },
-            { "cqm4i",   required_argument, NULL, OPT_CQM4I },
-            { "cqm4iy",  required_argument, NULL, OPT_CQM4IY },
-            { "cqm4ic",  required_argument, NULL, OPT_CQM4IC },
-            { "cqm4p",   required_argument, NULL, OPT_CQM4P },
-            { "cqm4py",  required_argument, NULL, OPT_CQM4PY },
-            { "cqm4pc",  required_argument, NULL, OPT_CQM4PC },
-            { "cqm8",    required_argument, NULL, OPT_CQM8 },
-            { "cqm8i",   required_argument, NULL, OPT_CQM8I },
-            { "cqm8p",   required_argument, NULL, OPT_CQM8P },
-            { "overscan", required_argument, NULL, OPT_OVERSCAN },
-            { "videoformat", required_argument, NULL, OPT_VIDFORMAT },
-            { "fullrange", required_argument, NULL, OPT_FULLRANGE },
-            { "colorprim", required_argument, NULL, OPT_COLOURPRIM },
-            { "transfer", required_argument, NULL, OPT_TRANSFER },
-            { "colormatrix", required_argument, NULL, OPT_COLOURMATRIX },
-            { "chromaloc", required_argument, NULL, OPT_CHROMALOC },
+            { "sps-id",  required_argument, NULL, 0 },
+            { "aud",     no_argument,       NULL, 0 },
+            { "nr",      required_argument, NULL, 0 },
+            { "cqm",     required_argument, NULL, 0 },
+            { "cqmfile", required_argument, NULL, 0 },
+            { "cqm4",    required_argument, NULL, 0 },
+            { "cqm4i",   required_argument, NULL, 0 },
+            { "cqm4iy",  required_argument, NULL, 0 },
+            { "cqm4ic",  required_argument, NULL, 0 },
+            { "cqm4p",   required_argument, NULL, 0 },
+            { "cqm4py",  required_argument, NULL, 0 },
+            { "cqm4pc",  required_argument, NULL, 0 },
+            { "cqm8",    required_argument, NULL, 0 },
+            { "cqm8i",   required_argument, NULL, 0 },
+            { "cqm8p",   required_argument, NULL, 0 },
+            { "overscan", required_argument, NULL, 0 },
+            { "videoformat", required_argument, NULL, 0 },
+            { "fullrange", required_argument, NULL, 0 },
+            { "colorprim", required_argument, NULL, 0 },
+            { "transfer", required_argument, NULL, 0 },
+            { "colormatrix", required_argument, NULL, 0 },
+            { "chromaloc", required_argument, NULL, 0 },
             {0, 0, 0, 0}
         };
 
-        int c;
-
-        c = getopt_long( argc, argv, "hi:I:b:r:cxB:q:f:o:A:m:p:t:vw8",
-                         long_options, &long_options_index);
+        int c = getopt_long( argc, argv, "8A:B:b:f:hI:i:m:o:p:q:r:t:Vvw",
+                             long_options, &long_options_index);
 
         if( c == -1 )
         {
@@ -573,77 +457,18 @@ static int  Parse( int argc, char **argv,
         switch( c )
         {
             case 'h':
-                Help( &defaults );
-                return -1;
-
-            case 0:
-                break;
-            case 'B':
-                param->rc.i_bitrate = atol( optarg );
-                param->rc.b_cbr = 1;
-                break;
-            case OPT_CRF:
-                param->rc.i_rf_constant = atol( optarg );
-                break;
-            case 'b':
-                param->i_bframe = atol( optarg );
-                break;
-            case OPT_NOBADAPT:
-                param->b_bframe_adaptive = 0;
-                break;
-            case OPT_BBIAS:
-                param->i_bframe_bias = atol( optarg );
-                break;
-            case OPT_BPYRAMID:
-                param->b_bframe_pyramid = 1;
-                break;
-            case 'i':
-                param->i_keyint_min = atol( optarg );
-                if( param->i_keyint_max < param->i_keyint_min )
-                    param->i_keyint_max = param->i_keyint_min;
-                break;
-            case 'I':
-                param->i_keyint_max = atol( optarg );
-                if( param->i_keyint_min > param->i_keyint_max )
-                    param->i_keyint_min = param->i_keyint_max;
-                break;
-            case OPT_SCENECUT:
-                param->i_scenecut_threshold = atol( optarg );
-                break;
-            case 'n':
-                param->b_deblocking_filter = 0;
-                break;
-            case 'f':
-            {
-                char *p = strchr( optarg, ':' );
-                param->i_deblocking_filter_alphac0 = atoi( optarg );
-                param->i_deblocking_filter_beta = p ? atoi( p+1 ) : param->i_deblocking_filter_alphac0;
-                break;
-            }
-            case 'q':
-                param->rc.i_qp_constant = atoi( optarg );
-                break;
-            case OPT_QPMIN:
-                param->rc.i_qp_min = atoi( optarg );
-                break;
-            case OPT_QPMAX:
-                param->rc.i_qp_max = atoi( optarg );
-                break;
-            case OPT_QPSTEP:
-                param->rc.i_qp_step = atoi( optarg );
-                break;
-            case 'r':
-                param->i_frame_reference = atoi( optarg );
-                break;
-            case OPT_NO_CABAC:
-                param->b_cabac = 0;
-                break;
-            case 'x':
-                opt->b_decompress = 1;
-                break;
-            case 'C':
-                param->cpu = 0;
-                break;
+                Help( &defaults, 0 );
+                exit(0);
+            case OPT_LONGHELP:
+                Help( &defaults, 1 );
+                exit(0);
+            case 'V':
+#ifdef X264_POINTVER
+                printf( "x264 "X264_POINTVER"\n" );
+#else
+                printf( "x264 0.%d.X\n", X264_BUILD );
+#endif
+                exit(0);
             case OPT_FRAMES:
                 param->i_frame_total = atoi( optarg );
                 break;
@@ -660,7 +485,7 @@ static int  Parse( int argc, char **argv,
                     p_set_eop = set_eop_mp4;
                     p_close_outfile = close_file_mp4;
 #else
-                    fprintf( stderr, "not compiled with MP4 output support\n" );
+                    fprintf( stderr, "x264 [error]: not compiled with MP4 output support\n" );
                     return -1;
 #endif
                 }
@@ -676,141 +501,22 @@ static int  Parse( int argc, char **argv,
                     opt->hout = stdout;
                 else if( p_open_outfile( optarg, &opt->hout ) )
                 {
-                    fprintf( stderr, "cannot open output file `%s'\n", optarg );
+                    fprintf( stderr, "x264 [error]: can't open output file `%s'\n", optarg );
                     return -1;
                 }
                 break;
-            case OPT_SAR:
-            {
-                char *p = strchr( optarg, ':' );
-                if( p )
+            case OPT_QPFILE:
+                opt->qpfile = fopen( optarg, "r" );
+                if( !opt->qpfile )
                 {
-                    param->vui.i_sar_width = atoi( optarg );
-                    param->vui.i_sar_height = atoi( p + 1 );
-                }
-                break;
-            }
-            case OPT_FPS:
-            {
-                float fps;
-                if( sscanf( optarg, "%d/%d", &param->i_fps_num, &param->i_fps_den ) == 2 )
-                    ;
-                else if( sscanf( optarg, "%f", &fps ) )
-                {
-                    param->i_fps_num = (int)(fps * 1000 + .5);
-                    param->i_fps_den = 1000;
-                }
-                else
-                {
-                    fprintf( stderr, "bad fps `%s'\n", optarg );
+                    fprintf( stderr, "x264 [error]: can't open `%s'\n", optarg );
                     return -1;
                 }
+                param->i_scenecut_threshold = -1;
+                param->b_bframe_adaptive = 0;
                 break;
-            }
-            case 'A':
-                param->analyse.inter = 0;
-                if( strstr( optarg, "none" ) )  param->analyse.inter =  0;
-                if( strstr( optarg, "all" ) )   param->analyse.inter = ~0;
-
-                if( strstr( optarg, "i4x4" ) )  param->analyse.inter |= X264_ANALYSE_I4x4;
-                if( strstr( optarg, "i8x8" ) )  param->analyse.inter |= X264_ANALYSE_I8x8;
-                if( strstr( optarg, "p8x8" ) )  param->analyse.inter |= X264_ANALYSE_PSUB16x16;
-                if( strstr( optarg, "p4x4" ) )  param->analyse.inter |= X264_ANALYSE_PSUB8x8;
-                if( strstr( optarg, "b8x8" ) )  param->analyse.inter |= X264_ANALYSE_BSUB16x16;
-                break;
-            case OPT_DIRECT:
-                b_error |= parse_enum( optarg, x264_direct_pred_names, &param->analyse.i_direct_mv_pred );
-                break;
-            case 'w':
-                param->analyse.b_weighted_bipred = 1;
-                break;
-            case OPT_ME:
-                b_error |= parse_enum( optarg, x264_motion_est_names, &param->analyse.i_me_method );
-                break;
-            case OPT_MERANGE:
-                param->analyse.i_me_range = atoi(optarg);
-                break;
-            case 'm':
-                param->analyse.i_subpel_refine = atoi(optarg);
-                break;
-            case OPT_B_RDO:
-                param->analyse.b_bframe_rdo = 1;
-                break;
-            case OPT_MIXED_REFS:
-                param->analyse.b_mixed_references = 1;
-                break;
-            case OPT_NO_CHROMA_ME:
-                param->analyse.b_chroma_me = 0;
-                break;
-            case '8':
-                param->analyse.b_transform_8x8 = 1;
-                break;
-            case 't':
-                param->analyse.i_trellis = atoi(optarg);
-                break;
-            case OPT_LEVEL:
-                if( atof(optarg) < 6 )
-                    param->i_level_idc = (int)(10*atof(optarg)+.5);
-                else
-                    param->i_level_idc = atoi(optarg);
-                break;
-            case OPT_RATETOL:
-                param->rc.f_rate_tolerance = !strncmp("inf", optarg, 3) ? 1e9 : atof(optarg);
-                break;
-            case OPT_VBVMAXRATE:
-                param->rc.i_vbv_max_bitrate = atoi( optarg );
-                break;
-            case OPT_VBVBUFSIZE:
-                param->rc.i_vbv_buffer_size = atoi( optarg );
-                break;
-            case OPT_VBVINIT:
-                param->rc.f_vbv_buffer_init = atof(optarg);
-                break;
-            case OPT_IPRATIO:
-                param->rc.f_ip_factor = atof(optarg);
-                break;
-            case OPT_PBRATIO:
-                param->rc.f_pb_factor = atof(optarg);
-                break;
-            case OPT_CHROMA_QP:
-                param->analyse.i_chroma_qp_offset = atoi(optarg);
-                break;
-            case 'p':
-            {
-                int i_pass = atoi(optarg);
-                if( i_pass == 1 )
-                    param->rc.b_stat_write = 1;
-                else if( i_pass == 2 )
-                    param->rc.b_stat_read = 1;
-                else if( i_pass > 2 )
-                    param->rc.b_stat_read =
-                    param->rc.b_stat_write = 1;
-                break;
-            }
-            case OPT_RCSTATS:
-                param->rc.psz_stat_in = optarg;
-                param->rc.psz_stat_out = optarg;
-                break;
-            case OPT_RCEQ:
-                param->rc.psz_rc_eq = optarg;
-               break;
-            case OPT_QCOMP:
-                param->rc.f_qcompress = atof(optarg);
-                break;
-            case OPT_QBLUR:
-                param->rc.f_qblur = atof(optarg);
-                break;
-            case OPT_CPLXBLUR:
-                param->rc.f_complexity_blur = atof(optarg);
-                break;
-            case OPT_ZONES:
-                param->rc.psz_zones = optarg;
-                break;
-            case OPT_THREADS:
-                param->i_threads = atoi(optarg);
-                break;
-            case OPT_NOPSNR:
-                param->analyse.b_psnr = 0;
+            case OPT_THREAD_INPUT:
+                b_thread_input = 1;
                 break;
             case OPT_QUIET:
                 param->i_log_level = X264_LOG_NONE;
@@ -818,9 +524,6 @@ static int  Parse( int argc, char **argv,
             case 'v':
                 param->i_log_level = X264_LOG_DEBUG;
                 break;
-            case OPT_AUD:
-                param->b_aud = 1;
-                break;
             case OPT_PROGRESS:
                 opt->b_progress = 1;
                 break;
@@ -829,99 +532,35 @@ static int  Parse( int argc, char **argv,
                 param->b_visualize = 1;
                 b_exit_on_ctrl_c = 1;
 #else
-                fprintf( stderr, "not compiled with visualization support\n" );
+                fprintf( stderr, "x264 [warning]: not compiled with visualization support\n" );
 #endif
                 break;
-            case OPT_CQM:
-                if( strstr( optarg, "flat" ) )
-                    param->i_cqm_preset = X264_CQM_FLAT;
-                else if( strstr( optarg, "jvt" ) )
-                    param->i_cqm_preset = X264_CQM_JVT;
-                else
+            default:
+            {
+                int i;
+                if( long_options_index < 0 )
                 {
-                    fprintf( stderr, "bad CQM preset `%s'\n", optarg );
-                    return -1;
+                    for( i = 0; long_options[i].name; i++ )
+                        if( long_options[i].val == c )
+                        {
+                            long_options_index = i;
+                            break;
+                        }
+                    if( long_options_index < 0 )
+                    {
+                        /* getopt_long already printed an error message */
+                        return -1;
+                    }
                 }
-                break;
-            case OPT_CQMFILE:
-                param->psz_cqm_file = optarg;
-                break;
-            case OPT_CQM4:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4iy, 16 );
-                b_error |= parse_cqm( optarg, param->cqm_4ic, 16 );
-                b_error |= parse_cqm( optarg, param->cqm_4py, 16 );
-                b_error |= parse_cqm( optarg, param->cqm_4pc, 16 );
-                break;
-            case OPT_CQM8:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_8iy, 64 );
-                b_error |= parse_cqm( optarg, param->cqm_8py, 64 );
-                break;
-            case OPT_CQM4I:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4iy, 16 );
-                b_error |= parse_cqm( optarg, param->cqm_4ic, 16 );
-                break;
-            case OPT_CQM4P:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4py, 16 );
-                b_error |= parse_cqm( optarg, param->cqm_4pc, 16 );
-                break;
-            case OPT_CQM4IY:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4iy, 16 );
-                break;
-            case OPT_CQM4IC:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4ic, 16 );
-                break;
-            case OPT_CQM4PY:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4iy, 16 );
-                break;
-            case OPT_CQM4PC:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_4ic, 16 );
-                break;
-            case OPT_CQM8I:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_8iy, 64 );
-                break;
-            case OPT_CQM8P:
-                param->i_cqm_preset = X264_CQM_CUSTOM;
-                b_error |= parse_cqm( optarg, param->cqm_8py, 64 );
-                break;
-            case OPT_OVERSCAN:
-                b_error |= parse_enum( optarg, overscan_str, &param->vui.i_overscan );
-                break;
-            case OPT_VIDFORMAT:
-                b_error |= parse_enum( optarg, vidformat_str, &param->vui.i_vidformat );
-                break;
-            case OPT_FULLRANGE:
-                b_error |= parse_enum( optarg, fullrange_str, &param->vui.b_fullrange );
-                break;
-            case OPT_COLOURPRIM:
-                b_error |= parse_enum( optarg, colorprim_str, &param->vui.i_colorprim );
-                break;
-            case OPT_TRANSFER:
-                b_error |= parse_enum( optarg, transfer_str, &param->vui.i_transfer );
-                break;
-            case OPT_COLOURMATRIX:
-                b_error |= parse_enum( optarg, colmatrix_str, &param->vui.i_colmatrix );
-                break;
-            case OPT_CHROMALOC:
-                param->vui.i_chroma_loc = atoi( optarg );
-                b_error = ( param->vui.i_chroma_loc < 0 || param->vui.i_chroma_loc > 5 );
-                break;
-            default:
-                fprintf( stderr, "unknown option (%c)\n", optopt );
-                return -1;
+
+                b_error |= x264_param_parse( param, long_options[long_options_index].name, optarg );
+            }
         }
 
         if( b_error )
         {
-            fprintf( stderr, "bad argument: %s %s\n", argv[optind-2], optarg );
+            const char *name = long_options_index > 0 ? long_options[long_options_index].name : argv[optind-2];
+            fprintf( stderr, "x264 [error]: invalid argument: %s = %s\n", name, optarg );
             return -1;
         }
     }
@@ -929,12 +568,22 @@ static int  Parse( int argc, char **argv,
     /* Get the file name */
     if( optind > argc - 1 || !opt->hout )
     {
-        Help( &defaults );
+        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++];
 
-    if( !opt->b_decompress )
+    /* 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 )
         {
@@ -954,29 +603,15 @@ static int  Parse( int argc, char **argv,
         {
             sscanf( argv[optind++], "%ux%u", &param->i_width, &param->i_height );
         }
+    }
         
-        /* check avis input */
-        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( !b_avis && ( !param->i_width || !param->i_height ) )
-        {
-            Help( &defaults );
-            return -1;
-        }
+    if( !(b_avis || b_y4m) && ( !param->i_width || !param->i_height ) )
+    {
+        fprintf( stderr, "x264 [error]: Rawyuv input requires a resolution.\n" );
+        return -1;
     }
 
     /* open the input */
-    if( !strcmp( psz_filename, "-" ) )
-    {
-        opt->hin = stdin;
-        optind++;
-    }
-    else
     {
         if( b_avis )
         {
@@ -986,20 +621,73 @@ static int  Parse( int argc, char **argv,
             p_read_frame = read_frame_avis;
             p_close_infile = close_file_avis;
 #else
-            fprintf( stderr, "not compiled with AVIS input support\n" );
+            fprintf( stderr, "x264 [error]: not compiled with AVIS input support\n" );
             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 ) )
         {
-            fprintf( stderr, "could not open input file '%s'\n", psz_filename );
+            fprintf( stderr, "x264 [error]: could not open input file '%s'\n", psz_filename );
             return -1;
         }
     }
 
+#ifdef HAVE_PTHREAD
+    if( b_thread_input || param->i_threads > 1 )
+    {
+        if( open_file_thread( NULL, &opt->hin, param ) )
+        {
+            fprintf( stderr, "x264 [warning]: threaded input failed\n" );
+        }
+        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;
+        }
+    }
+#endif
+
     return 0;
 }
 
+static void parse_qpfile( cli_opt_t *opt, x264_picture_t *pic, int i_frame )
+{
+    int num = -1, qp;
+    char type;
+    while( num < i_frame )
+    {
+        int ret = fscanf( opt->qpfile, "%d %c %d\n", &num, &type, &qp );
+        if( num < i_frame )
+            continue;
+        pic->i_qpplus1 = qp+1;
+        if     ( type == 'I' ) pic->i_type = X264_TYPE_IDR;
+        else if( type == 'i' ) pic->i_type = X264_TYPE_I;
+        else if( type == 'P' ) pic->i_type = X264_TYPE_P;
+        else if( type == 'B' ) pic->i_type = X264_TYPE_BREF;
+        else if( type == 'b' ) pic->i_type = X264_TYPE_B;
+        else ret = 0;
+        if( ret != 3 || qp < 0 || qp > 51 || num > i_frame )
+        {
+            fprintf( stderr, "x264 [error]: can't parse qpfile for frame %d\n", i_frame );
+            fclose( opt->qpfile );
+            opt->qpfile = NULL;
+            pic->i_type = X264_TYPE_AUTO;
+            pic->i_qpplus1 = 0;
+            break;
+        }
+    }
+}
+
 /*****************************************************************************
  * Decode:
  *****************************************************************************/
@@ -1011,15 +699,9 @@ static int  Encode_frame( x264_t *h, hnd_t hout, x264_picture_t *pic )
     int i_nal, i;
     int i_file = 0;
 
-    /* Do not force any parameters */
-    if( pic )
-    {
-        pic->i_type = X264_TYPE_AUTO;
-        pic->i_qpplus1 = 0;
-    }
     if( x264_encoder_encode( h, &nal, &i_nal, pic, &pic_out ) < 0 )
     {
-        fprintf( stderr, "x264_encoder_encode failed\n" );
+        fprintf( stderr, "x264 [error]: x264_encoder_encode failed\n" );
     }
 
     for( i = 0; i < i_nal; i++ )
@@ -1034,7 +716,7 @@ static int  Encode_frame( x264_t *h, hnd_t hout, x264_picture_t *pic )
         }
         else if( i_size < 0 )
         {
-            fprintf( stderr, "need to increase buffer size (size=%d)\n", -i_size );
+            fprintf( stderr, "x264 [error]: need to increase buffer size (size=%d)\n", -i_size );
         }
     }
     if (i_nal)
@@ -1057,7 +739,7 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
     int     i_frame_size;
     int     i_progress;
 
-    i_frame_total = p_get_frame_total( opt->hin, param->i_width, param->i_height );
+    i_frame_total = p_get_frame_total( opt->hin );
     i_frame_total -= opt->i_seek;
     if( ( i_frame_total == 0 || param->i_frame_total < i_frame_total )
         && param->i_frame_total > 0 )
@@ -1066,7 +748,7 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
 
     if( ( h = x264_encoder_open( param ) ) == NULL )
     {
-        fprintf( stderr, "x264_encoder_open failed\n" );
+        fprintf( stderr, "x264 [error]: x264_encoder_open failed\n" );
         p_close_infile( opt->hin );
         p_close_outfile( opt->hout );
         return -1;
@@ -1074,7 +756,7 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
 
     if( p_set_outfile_param( opt->hout, param ) )
     {
-        fprintf( stderr, "can't set outfile param\n" );
+        fprintf( stderr, "x264 [error]: can't set outfile param\n" );
         p_close_infile( opt->hin );
         p_close_outfile( opt->hout );
         return -1;
@@ -1089,11 +771,20 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
     for( i_frame = 0, i_file = 0, i_progress = 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, param->i_width, param->i_height ) )
+        if( p_read_frame( &pic, opt->hin, i_frame + opt->i_seek ) )
             break;
 
         pic.i_pts = (int64_t)i_frame * param->i_fps_den;
 
+        if( opt->qpfile )
+            parse_qpfile( opt, &pic, i_frame + opt->i_seek );
+        else
+        {
+            /* Do not force any parameters */
+            pic.i_type = X264_TYPE_AUTO;
+            pic.i_qpplus1 = 0;
+        }
+
         i_file += Encode_frame( h, opt->hout, &pic );
 
         i_frame++;
@@ -1147,655 +838,3 @@ static int  Encode( x264_param_t *param, cli_opt_t *opt )
 
     return 0;
 }
-
-/* raw 420 yuv file operation */
-static int open_file_yuv( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param )
-{
-    if ((*p_handle = fopen(psz_filename, "rb")) == NULL)
-        return -1;
-    return 0;
-}
-
-static int get_frame_total_yuv( hnd_t handle, int i_width, int i_height )
-{
-    FILE *f = (FILE *)handle;
-    int i_frame_total = 0;
-
-    if( !fseek( f, 0, SEEK_END ) )
-    {
-        int64_t i_size = ftell( f );
-        fseek( f, 0, SEEK_SET );
-        i_frame_total = (int)(i_size / ( i_width * i_height * 3 / 2 ));
-    }
-
-    return i_frame_total;
-}
-
-static int read_frame_yuv( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height )
-{
-    static int prev_frame = -1;
-    FILE *f = (FILE *)handle;
-
-    if( i_frame != prev_frame+1 )
-        if( fseek( f, i_frame * i_width * i_height * 3 / 2, SEEK_SET ) )
-            return -1;
-
-    if( fread( p_pic->img.plane[0], 1, i_width * i_height, f ) <= 0
-            || fread( p_pic->img.plane[1], 1, i_width * i_height / 4, f ) <= 0
-            || fread( p_pic->img.plane[2], 1, i_width * i_height / 4, f ) <= 0 )
-        return -1;
-
-    prev_frame = i_frame;
-
-    return 0;
-}
-
-static int close_file_yuv(hnd_t handle)
-{
-    if (handle == NULL)
-        return 0;
-    return fclose((FILE *)handle);
-}
-
-
-/* avs/avi input file support under cygwin */
-
-#ifdef AVIS_INPUT
-
-static int gcd(int a, int b)
-{
-    int c;
-
-    while (1)
-    {
-        c = a % b;
-        if (!c)
-            return b;
-        a = b;
-        b = c;
-    }
-}
-
-static int open_file_avis( char *psz_filename, hnd_t *p_handle, x264_param_t *p_param )
-{
-    AVISTREAMINFO info;
-    PAVISTREAM p_avi = NULL;
-    int i;
-
-    *p_handle = NULL;
-
-    AVIFileInit();
-    if( AVIStreamOpenFromFile( &p_avi, psz_filename, streamtypeVIDEO, 0, OF_READ, NULL ) )
-    {
-        AVIFileExit();
-        return -1;
-    }
-
-    if( AVIStreamInfo(p_avi, &info, sizeof(AVISTREAMINFO)) )
-    {
-        AVIStreamRelease(p_avi);
-        AVIFileExit();
-        return -1;
-    }
-
-    // check input format
-    if (info.fccHandler != MAKEFOURCC('Y', 'V', '1', '2'))
-    {
-        fprintf( stderr, "avis [error]: unsupported input format (%c%c%c%c)\n",
-            (char)(info.fccHandler & 0xff), (char)((info.fccHandler >> 8) & 0xff),
-            (char)((info.fccHandler >> 16) & 0xff), (char)((info.fccHandler >> 24)) );
-
-        AVIStreamRelease(p_avi);
-        AVIFileExit();
-
-        return -1;
-    }
-
-    p_param->i_width = info.rcFrame.right - info.rcFrame.left;
-    p_param->i_height = info.rcFrame.bottom - info.rcFrame.top;
-    i = gcd(info.dwRate, info.dwScale);
-    p_param->i_fps_den = info.dwScale / i;
-    p_param->i_fps_num = info.dwRate / i;
-
-    fprintf( stderr, "avis [info]: %dx%d @ %.2f fps (%d frames)\n",  
-        p_param->i_width, p_param->i_height,
-        (double)p_param->i_fps_num / (double)p_param->i_fps_den,
-        (int)info.dwLength );
-
-    *p_handle = (hnd_t)p_avi;
-
-    return 0;
-}
-
-static int get_frame_total_avis( hnd_t handle, int i_width, int i_height )
-{
-    PAVISTREAM p_avi = (PAVISTREAM)handle;
-    AVISTREAMINFO info;
-
-    if( AVIStreamInfo(p_avi, &info, sizeof(AVISTREAMINFO)) )
-        return -1;
-
-    return info.dwLength;
-}
-
-static int read_frame_avis( x264_picture_t *p_pic, hnd_t handle, int i_frame, int i_width, int i_height )
-{
-    PAVISTREAM p_avi = (PAVISTREAM)handle;
-    
-    p_pic->img.i_csp = X264_CSP_YV12;
-    
-    if( AVIStreamRead(p_avi, i_frame, 1, p_pic->img.plane[0], i_width * i_height * 3 / 2, NULL, NULL ) )
-        return -1;
-
-    return 0;
-}
-
-static int close_file_avis( hnd_t handle )
-{
-    PAVISTREAM p_avi = (PAVISTREAM)handle;
-
-    AVIStreamRelease(p_avi);
-    AVIFileExit();
-
-    return 0;
-}
-
-#endif
-
-
-static int open_file_bsf( char *psz_filename, hnd_t *p_handle )
-{
-    if ((*p_handle = fopen(psz_filename, "w+b")) == NULL)
-        return -1;
-
-    return 0;
-}
-
-static int set_param_bsf( hnd_t handle, x264_param_t *p_param )
-{
-    return 0;
-}
-
-static int write_nalu_bsf( hnd_t handle, uint8_t *p_nalu, int i_size )
-{
-    if (fwrite(p_nalu, i_size, 1, (FILE *)handle) > 0)
-        return i_size;
-    return -1;
-}
-
-static int set_eop_bsf( hnd_t handle,  x264_picture_t *p_picture )
-{
-    return 0;
-}
-
-static int close_file_bsf( hnd_t handle )
-{
-    if ((handle == NULL) || (handle == stdout))
-        return 0;
-
-    return fclose((FILE *)handle);
-}
-
-/* -- mp4 muxing support ------------------------------------------------- */
-#ifdef MP4_OUTPUT
-
-typedef struct
-{
-    GF_ISOFile *p_file;
-    GF_AVCConfig *p_config;
-    GF_ISOSample *p_sample;
-    int i_track;
-    int i_descidx;
-    int i_time_inc;
-    int i_time_res;
-    int i_numframe;
-    int i_init_delay;
-    uint8_t b_sps;
-    uint8_t b_pps;
-} mp4_t;
-
-
-static void recompute_bitrate_mp4(GF_ISOFile *p_file, int i_track)
-{
-    u32 i, count, di, timescale, time_wnd, rate;
-    u64 offset;
-    Double br;
-    GF_ESD *esd;
-
-    esd = gf_isom_get_esd(p_file, i_track, 1);
-    if (!esd) return;
-
-    esd->decoderConfig->avgBitrate = 0;
-    esd->decoderConfig->maxBitrate = 0;
-    rate = time_wnd = 0;
-
-    timescale = gf_isom_get_media_timescale(p_file, i_track);
-    count = gf_isom_get_sample_count(p_file, i_track);
-    for (i=0; i<count; i++) {
-        GF_ISOSample *samp = gf_isom_get_sample_info(p_file, i_track, i+1, &di, &offset);
-
-        if (samp->dataLength>esd->decoderConfig->bufferSizeDB) esd->decoderConfig->bufferSizeDB = samp->dataLength;
-
-        if (esd->decoderConfig->bufferSizeDB < samp->dataLength) esd->decoderConfig->bufferSizeDB = samp->dataLength;
-        esd->decoderConfig->avgBitrate += samp->dataLength;
-        rate += samp->dataLength;
-        if (samp->DTS > time_wnd + timescale) {
-            if (rate > esd->decoderConfig->maxBitrate) esd->decoderConfig->maxBitrate = rate;
-            time_wnd = samp->DTS;
-            rate = 0;
-        }
-
-        gf_isom_sample_del(&samp);
-    }
-
-    br = (Double) (s64) gf_isom_get_media_duration(p_file, i_track);
-    br /= timescale;
-    esd->decoderConfig->avgBitrate = (u32) (esd->decoderConfig->avgBitrate / br);
-    /*move to bps*/
-    esd->decoderConfig->avgBitrate *= 8;
-    esd->decoderConfig->maxBitrate *= 8;
-
-    gf_isom_change_mpeg4_description(p_file, i_track, 1, esd);
-    gf_odf_desc_del((GF_Descriptor *) esd);
-}
-
-
-static int close_file_mp4( hnd_t handle )
-{
-    mp4_t *p_mp4 = (mp4_t *)handle;
-
-    if (p_mp4 == NULL)
-        return 0;
-
-    if (p_mp4->p_config)
-        gf_odf_avc_cfg_del(p_mp4->p_config);
-
-    if (p_mp4->p_sample)
-    {
-        if (p_mp4->p_sample->data)
-            free(p_mp4->p_sample->data);
-
-        gf_isom_sample_del(&p_mp4->p_sample);
-    }
-
-    if (p_mp4->p_file)
-    {
-        recompute_bitrate_mp4(p_mp4->p_file, p_mp4->i_track);
-        gf_isom_set_pl_indication(p_mp4->p_file, GF_ISOM_PL_VISUAL, 0x15);
-        gf_isom_set_storage_mode(p_mp4->p_file, GF_ISOM_STORE_FLAT);
-        gf_isom_close(p_mp4->p_file);
-    }
-
-    free(p_mp4);
-
-    return 0;
-}
-
-static int open_file_mp4( char *psz_filename, hnd_t *p_handle )
-{
-    mp4_t *p_mp4;
-
-    *p_handle = NULL;
-
-    if ((p_mp4 = (mp4_t *)malloc(sizeof(mp4_t))) == NULL)
-        return -1;
-
-    memset(p_mp4, 0, sizeof(mp4_t));
-    p_mp4->p_file = gf_isom_open(psz_filename, GF_ISOM_OPEN_WRITE, NULL);
-
-    if ((p_mp4->p_sample = gf_isom_sample_new()) == NULL)
-    {
-        close_file_mp4( p_mp4 );
-        return -1;
-    }
-
-    gf_isom_set_brand_info(p_mp4->p_file, GF_ISOM_BRAND_AVC1, 0);
-
-    *p_handle = p_mp4;
-
-    return 0;
-}
-
-
-static int set_param_mp4( hnd_t handle, x264_param_t *p_param )
-{
-    mp4_t *p_mp4 = (mp4_t *)handle;
-
-    p_mp4->i_track = gf_isom_new_track(p_mp4->p_file, 0, GF_ISOM_MEDIA_VISUAL, 
-        p_param->i_fps_num);
-
-    p_mp4->p_config = gf_odf_avc_cfg_new();
-    gf_isom_avc_config_new(p_mp4->p_file, p_mp4->i_track, p_mp4->p_config, 
-        NULL, NULL, &p_mp4->i_descidx);
-
-    gf_isom_set_visual_info(p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, 
-        p_param->i_width, p_param->i_height);
-
-    p_mp4->p_sample->data = (char *)malloc(p_param->i_width * p_param->i_height * 3 / 2);
-    if (p_mp4->p_sample->data == NULL)
-        return -1;
-
-    p_mp4->i_time_res = p_param->i_fps_num;
-    p_mp4->i_time_inc = p_param->i_fps_den;
-    p_mp4->i_init_delay = p_param->i_bframe ? (p_param->b_bframe_pyramid ? 2 : 1) : 0;
-    p_mp4->i_init_delay *= p_mp4->i_time_inc;
-    fprintf(stderr, "mp4 [info]: initial delay %d (scale %d)\n", 
-        p_mp4->i_init_delay, p_mp4->i_time_res);
-
-    return 0;
-}
-
-
-static int write_nalu_mp4( hnd_t handle, uint8_t *p_nalu, int i_size )
-{
-    mp4_t *p_mp4 = (mp4_t *)handle;
-    GF_AVCConfigSlot *p_slot;
-    uint8_t type = p_nalu[4] & 0x1f;
-    int psize;
-
-    switch(type)
-    {
-    // sps
-    case 0x07:
-        if (!p_mp4->b_sps)
-        {
-            p_mp4->p_config->configurationVersion = 1;
-            p_mp4->p_config->AVCProfileIndication = p_nalu[5];
-            p_mp4->p_config->profile_compatibility = p_nalu[6];
-            p_mp4->p_config->AVCLevelIndication = p_nalu[7];
-            p_slot = (GF_AVCConfigSlot *)malloc(sizeof(GF_AVCConfigSlot));
-            p_slot->size = i_size - 4;
-            p_slot->data = (char *)malloc(p_slot->size);
-            memcpy(p_slot->data, p_nalu + 4, i_size - 4);
-            gf_list_add(p_mp4->p_config->sequenceParameterSets, p_slot);
-            p_slot = NULL;
-            p_mp4->b_sps = 1;
-        }
-        break;
-
-    // pps      
-    case 0x08:
-        if (!p_mp4->b_pps)
-        {
-            p_slot = (GF_AVCConfigSlot *)malloc(sizeof(GF_AVCConfigSlot));
-            p_slot->size = i_size - 4;
-            p_slot->data = (char *)malloc(p_slot->size);
-            memcpy(p_slot->data, p_nalu + 4, i_size - 4);
-            gf_list_add(p_mp4->p_config->pictureParameterSets, p_slot);
-            p_slot = NULL;
-            p_mp4->b_pps = 1;
-            if (p_mp4->b_sps)
-                gf_isom_avc_config_update(p_mp4->p_file, p_mp4->i_track, 1, p_mp4->p_config);
-        }
-        break;
-
-    // slice, sei
-    case 0x1:
-    case 0x5:
-    case 0x6:
-        psize = i_size - 4 ;
-        memcpy(p_mp4->p_sample->data + p_mp4->p_sample->dataLength, p_nalu, i_size);
-        p_mp4->p_sample->data[p_mp4->p_sample->dataLength + 0] = (psize >> 24) & 0xff;
-        p_mp4->p_sample->data[p_mp4->p_sample->dataLength + 1] = (psize >> 16) & 0xff;
-        p_mp4->p_sample->data[p_mp4->p_sample->dataLength + 2] = (psize >> 8) & 0xff;
-        p_mp4->p_sample->data[p_mp4->p_sample->dataLength + 3] = (psize >> 0) & 0xff;
-        p_mp4->p_sample->dataLength += i_size;
-        break;
-    }
-
-    return i_size;
-}
-
-static int set_eop_mp4( hnd_t handle, x264_picture_t *p_picture )
-{
-    mp4_t *p_mp4 = (mp4_t *)handle;
-    uint32_t dts = p_mp4->i_numframe * p_mp4->i_time_inc;
-    uint32_t pts = p_picture->i_pts;
-    int offset = p_mp4->i_init_delay + pts - dts;
-
-    p_mp4->p_sample->IsRAP = p_picture->i_type == X264_TYPE_IDR ? 1 : 0;
-    p_mp4->p_sample->DTS = dts;
-    p_mp4->p_sample->CTS_Offset = offset;
-    gf_isom_add_sample(p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_mp4->p_sample);
-
-    p_mp4->p_sample->dataLength = 0;
-    p_mp4->i_numframe++;
-
-    return 0;
-}
-
-#endif
-
-
-/* -- mkv muxing support ------------------------------------------------- */
-typedef struct
-{
-    mk_Writer *w;
-
-    uint8_t   *sps, *pps;
-    int       sps_len, pps_len;
-
-    int       width, height, d_width, d_height;
-
-    int64_t   frame_duration;
-    int       fps_num;
-
-    int       b_header_written;
-    char      b_writing_frame;
-} mkv_t;
-
-static int write_header_mkv( mkv_t *p_mkv )
-{
-    int       ret;
-    uint8_t   *avcC;
-    int  avcC_len;
-
-    if( p_mkv->sps == NULL || p_mkv->pps == NULL ||
-        p_mkv->width == 0 || p_mkv->height == 0 ||
-        p_mkv->d_width == 0 || p_mkv->d_height == 0)
-        return -1;
-
-    avcC_len = 5 + 1 + 2 + p_mkv->sps_len + 1 + 2 + p_mkv->pps_len;
-    avcC = malloc(avcC_len);
-    if (avcC == NULL)
-        return -1;
-
-    avcC[0] = 1;
-    avcC[1] = p_mkv->sps[1];
-    avcC[2] = p_mkv->sps[2];
-    avcC[3] = p_mkv->sps[3];
-    avcC[4] = 0xfe; // nalu size length is three bytes
-    avcC[5] = 0xe1; // one sps
-
-    avcC[6] = p_mkv->sps_len >> 8;
-    avcC[7] = p_mkv->sps_len;
-
-    memcpy(avcC+8, p_mkv->sps, p_mkv->sps_len);
-
-    avcC[8+p_mkv->sps_len] = 1; // one pps
-    avcC[9+p_mkv->sps_len] = p_mkv->pps_len >> 8;
-    avcC[10+p_mkv->sps_len] = p_mkv->pps_len;
-
-    memcpy( avcC+11+p_mkv->sps_len, p_mkv->pps, p_mkv->pps_len );
-
-    ret = mk_writeHeader( p_mkv->w, "x264", "V_MPEG4/ISO/AVC",
-                          avcC, avcC_len, p_mkv->frame_duration, 50000,
-                          p_mkv->width, p_mkv->height,
-                          p_mkv->d_width, p_mkv->d_height );
-
-    free( avcC );
-
-    p_mkv->b_header_written = 1;
-
-    return ret;
-}
-
-static int open_file_mkv( char *psz_filename, hnd_t *p_handle )
-{
-    mkv_t *p_mkv;
-
-    *p_handle = NULL;
-
-    p_mkv  = malloc(sizeof(*p_mkv));
-    if (p_mkv == NULL)
-        return -1;
-
-    memset(p_mkv, 0, sizeof(*p_mkv));
-
-    p_mkv->w = mk_createWriter(psz_filename);
-    if (p_mkv->w == NULL)
-    {
-        free(p_mkv);
-        return -1;
-    }
-
-    *p_handle = p_mkv;
-
-    return 0;
-}
-
-static int set_param_mkv( hnd_t handle, x264_param_t *p_param )
-{
-    mkv_t   *p_mkv = handle;
-    int64_t dw, dh;
-
-    if( p_param->i_fps_num > 0 )
-    {
-        p_mkv->frame_duration = (int64_t)p_param->i_fps_den *
-                                (int64_t)1000000000 / p_param->i_fps_num;
-        p_mkv->fps_num = p_param->i_fps_num;
-    }
-    else
-    {
-        p_mkv->frame_duration = 0;
-        p_mkv->fps_num = 1;
-    }
-
-    p_mkv->width = p_param->i_width;
-    p_mkv->height = p_param->i_height;
-
-    if( p_param->vui.i_sar_width && p_param->vui.i_sar_height )
-    {
-        dw = (int64_t)p_param->i_width  * p_param->vui.i_sar_width;
-        dh = (int64_t)p_param->i_height * p_param->vui.i_sar_height;
-    }
-    else
-    {
-        dw = p_param->i_width;
-        dh = p_param->i_height;
-    }
-
-    if( dw > 0 && dh > 0 )
-    {
-        int64_t a = dw, b = dh;
-
-        for (;;)
-        {
-            int64_t c = a % b;
-            if( c == 0 )
-              break;
-            a = b;
-            b = c;
-        }
-
-        dw /= b;
-        dh /= b;
-    }
-
-    p_mkv->d_width = (int)dw;
-    p_mkv->d_height = (int)dh;
-
-    return 0;
-}
-
-static int write_nalu_mkv( hnd_t handle, uint8_t *p_nalu, int i_size )
-{
-    mkv_t *p_mkv = handle;
-    uint8_t type = p_nalu[4] & 0x1f;
-    uint8_t dsize[3];
-    int psize;
-
-    switch( type )
-    {
-    // sps
-    case 0x07:
-        if( !p_mkv->sps )
-        {
-            p_mkv->sps = malloc(i_size - 4);
-            if (p_mkv->sps == NULL)
-                return -1;
-            p_mkv->sps_len = i_size - 4;
-            memcpy(p_mkv->sps, p_nalu + 4, i_size - 4);
-        }
-        break;
-
-    // pps
-    case 0x08:
-        if( !p_mkv->pps )
-        {
-            p_mkv->pps = malloc(i_size - 4);
-            if (p_mkv->pps == NULL)
-                return -1;
-            p_mkv->pps_len = i_size - 4;
-            memcpy(p_mkv->pps, p_nalu + 4, i_size - 4);
-        }
-        break;
-
-    // slice, sei
-    case 0x1:
-    case 0x5:
-    case 0x6:
-        if( !p_mkv->b_writing_frame )
-        {
-            if( mk_startFrame(p_mkv->w) < 0 )
-                return -1;
-            p_mkv->b_writing_frame = 1;
-        }
-        psize = i_size - 4 ;
-        dsize[0] = psize >> 16;
-        dsize[1] = psize >> 8;
-        dsize[2] = psize;
-        if( mk_addFrameData(p_mkv->w, dsize, 3) < 0 ||
-            mk_addFrameData(p_mkv->w, p_nalu + 4, i_size - 4) < 0 )
-            return -1;
-        break;
-
-    default:
-        break;
-    }
-
-    if( !p_mkv->b_header_written && p_mkv->pps && p_mkv->sps &&
-        write_header_mkv(p_mkv) < 0 )
-        return -1;
-
-    return i_size;
-}
-
-static int set_eop_mkv( hnd_t handle, x264_picture_t *p_picture )
-{
-    mkv_t *p_mkv = handle;
-    int64_t i_stamp = (int64_t)(p_picture->i_pts * 1e9 / p_mkv->fps_num);
-
-    p_mkv->b_writing_frame = 0;
-
-    return mk_setFrameFlags( p_mkv->w, i_stamp,
-                             p_picture->i_type == X264_TYPE_IDR );
-}
-
-static int close_file_mkv( hnd_t handle )
-{
-    mkv_t *p_mkv = handle;
-    int   ret;
-
-    if( p_mkv->sps )
-        free( p_mkv->sps );
-    if( p_mkv->pps )
-        free( p_mkv->pps );
-
-    ret = mk_close(p_mkv->w);
-
-    free( p_mkv );
-
-    return ret;
-}
-