]> git.sesse.net Git - x264/blobdiff - x264.c
display final ratefactor in abr when a loose vbv is applied. (still disabled in true...
[x264] / x264.c
diff --git a/x264.c b/x264.c
index 1e5d6e5a698f2640c34234cbc45e4d4c0e4b016b..74d5e2645a01b5d696aac1b79aac1f9fe82f57d9 100644 (file)
--- 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 $
  * 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>
 #include <fcntl.h>  /* _O_BINARY */
 #endif
 
-#ifdef _CYGWIN
-#include <windows.h>
-#include <vfw.h>
-#define AVIS_INPUT
+#ifndef _MSC_VER
+#include "config.h"
 #endif
 
 #include "common/common.h"
-#include "config.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     i_ctrl_c = 0;
+static int     b_ctrl_c = 0;
+static int     b_exit_on_ctrl_c = 0;
 static void    SigIntHandler( int a )
 {
-    i_ctrl_c = 1;
+    if( b_exit_on_ctrl_c )
+        exit(0);
+    b_ctrl_c = 1;
 }
 
-/* input file operation function pointers */
-static int (*p_open_file)( 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_width, int i_height );
-static int (*p_close_file)( hnd_t handle );
+typedef struct {
+    int b_progress;
+    int i_seek;
+    hnd_t hin;
+    hnd_t hout;
+    FILE *qpfile;
+} cli_opt_t;
 
-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_width, int i_height );
-static int close_file_yuv( hnd_t handle );
+/* 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 );
 
-#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_width, int i_height );
-static int close_file_avis( hnd_t handle );
-#endif
+/* 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 );
 
-static void Help( x264_param_t *defaults );
-static int  Parse( int argc, char **argv, x264_param_t  *param, hnd_t *p_hin, FILE **p_fout, int *pb_decompress );
-static int  Encode( x264_param_t  *param, hnd_t hin,  FILE *fout );
-static int  Decode( x264_param_t  *param, FILE *fh26l, FILE *fout );
+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 );
 
 
 /****************************************************************************
@@ -88,239 +91,363 @@ static int  Decode( x264_param_t  *param, FILE *fh26l, FILE *fout );
 int main( int argc, char **argv )
 {
     x264_param_t param;
-
-    FILE    *fout;
-    hnd_t   hin;
-
-    int     b_decompress;
-    int     i_ret;
+    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
 
     x264_param_default( &param );
 
     /* Parse command line */
-    if( Parse( argc, argv, &param, &hin, &fout, &b_decompress ) < 0 )
-    {
+    if( Parse( argc, argv, &param, &opt ) < 0 )
         return -1;
-    }
 
     /* Control-C handler */
     signal( SIGINT, SigIntHandler );
 
-    if( b_decompress )
-        i_ret = Decode( &param, hin, fout );
-    else
-        i_ret = Encode( &param, hin, fout );
+    return Encode( &param, &opt );
+}
 
-    return i_ret;
+static char const *strtable_lookup( const char * const table[], int index )
+{
+    int i = 0; while( table[i] ) i++;
+    return ( ( index >= 0 && index < i ) ? table[ index ] : "???" );
 }
 
 /*****************************************************************************
  * Help:
  *****************************************************************************/
-static void Help( x264_param_t *defaults )
+static void Help( x264_param_t *defaults, int b_longhelp )
 {
-    fprintf( stderr,
-             "x264 build:%d%s\n"
-             "Syntax: x264 [options] [-o out.264] in.yuv widthxheigh\n"
-             "\n"
-             "  -h, --help                  Print this help\n"
-             "\n"
-             "  -I, --keyint <integer>      Maximum GOP size [%d]\n"
-             "  -i, --min-keyint <integer>  Minimum GOP size [%d]\n"
-             "      --scenecut <integer>    How aggresively to insert extra I frames [%d]\n"
-             "  -b, --bframe <integer>      Number of B-frames between I and P [%d]\n"
-             "      --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"
-             "  -n, --nf                    Disable loop filter\n"
-             "  -f, --filter <alpha:beta>   Loop filter AlphaC0 and Beta parameters [%d:%d]\n"
-             "\n"
-             "  -q, --qp <integer>          Set QP [%d]\n"
-             "  -B, --bitrate <integer>     Set bitrate\n"
-             "      --qpmin <integer>       Set min QP [%d]\n"
-             "      --qpmax <integer>       Set max QP [%d]\n"
-             "      --qpstep <integer>      Set max QP step [%d]\n"
-             "      --rcsens <integer>      CBR ratecontrol sensitivity [%d]\n"
-             "      --rcbuf <integer>       Size of VBV buffer [%d]\n"
-             "      --rcinitbuf <integer>   Initial VBV buffer occupancy [%d]\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>         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"
-
-             "  -A, --analyse <string>      Analyse options: [\"i4x4|p8x8|b8x8\"]\n"
-             "                                  - i4x4\n"
-             "                                  - p8x8, p4x4, b8x8\n"
-             "                                  - none, all\n"
-             "      --direct <string>       Direct MV prediction mode [\"temporal\"]\n"
-             "                                  - none, spatial, temporal\n"
-             "  -w, --weightb               Weighted prediction for B-frames\n"
-             "  -m, --subme <integer>       Subpixel motion estimation quality: 1=fast, 5=best. [%d]\n"
-             "\n"
-             "      --level <integer>       Specify level (as defined by Annex A)\n"
-             "  -s, --sar width:height      Specify Sample Aspect Ratio\n"
-             "      --fps <float|rational>  Specify framerate\n"
-             "      --frames <integer>      Maximum number of frames to encode\n"
-             "  -o, --output                Specify output file\n"
-             "\n"
-             "      --no-asm                Disable any CPU optims\n"
-             "      --no-psnr               Disable PSNR computaion\n"
-             "      --quiet                 Quiet Mode\n"
-             "  -v, --verbose               Print stats for each frame\n"
-             "\n",
-            X264_BUILD, X264_VERSION,
-            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.i_rc_sens,
-            defaults->rc.i_rc_buffer_size,
-            defaults->rc.i_rc_init_buffer,
-            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,
-            defaults->analyse.i_subpel_refine
-           );
+#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",
+#else
+        "no",
+#endif
+#ifdef MP4_OUTPUT
+        "yes"
+#else
+        "no"
+#endif
+      );
+    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" );
 }
 
 /*****************************************************************************
  * Parse:
  *****************************************************************************/
 static int  Parse( int argc, char **argv,
-                   x264_param_t  *param,
-                   hnd_t *p_hin, FILE **p_fout, int *pb_decompress )
+                   x264_param_t *param, cli_opt_t *opt )
 {
     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;
 
-    /* Default output */
-    *p_fout = stdout;
-    *p_hin  = stdin;
-    *pb_decompress = 0;
+    memset( opt, 0, sizeof(cli_opt_t) );
 
     /* Default input file driver */
-    p_open_file = open_file_yuv;
+    p_open_infile = open_file_yuv;
     p_get_frame_total = get_frame_total_yuv;
     p_read_frame = read_frame_yuv;
-    p_close_file = close_file_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;
 
     /* Parse command line options */
-    opterr = 0; // no error message
     for( ;; )
     {
-        int long_options_index;
-#define OPT_QPMIN 256
-#define OPT_QPMAX 257
-#define OPT_QPSTEP 258
-#define OPT_RCSENS 259
-#define OPT_IPRATIO 260
-#define OPT_PBRATIO 261
-#define OPT_RCBUF 262
-#define OPT_RCIBUF 263
-#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
+        int b_error = 0;
+        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' },
-            { "bframe",  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 },
+            { "bframes", required_argument, NULL, 'b' },
+            { "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 },
+            { "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, 's' },
-            { "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, 0 },
+            { "merange", required_argument, NULL, 0 },
             { "subme",   required_argument, NULL, 'm' },
-            { "no-chroma-me", no_argument,  NULL, OPT_NO_CHROMA_ME },
-            { "level",   required_argument, NULL, OPT_LEVEL },
-            { "rcsens",  required_argument, NULL, OPT_RCSENS },
-            { "rcbuf",   required_argument, NULL, OPT_RCBUF },
-            { "rcinitbuf",required_argument,NULL, OPT_RCIBUF },
-            { "ipratio", required_argument, NULL, OPT_IPRATIO },
-            { "pbratio", required_argument, NULL, OPT_PBRATIO },
-            { "chroma-qp-offset", required_argument, NULL, OPT_CHROMA_QP },
+            { "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' },
+            { "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 },
-            { "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 },
+            { "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:nf:o:s:A:m:p:vw",
-                         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 )
         {
@@ -330,189 +457,66 @@ 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 '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 );
-                break;
-            case 'I':
-                param->i_keyint_max = atol( optarg );
-                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, ':' );
-                if( p )
-                {
-                    param->i_deblocking_filter_alphac0 = atoi( optarg );
-                    param->i_deblocking_filter_beta = atoi( p );
-                }
-                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':
-                *pb_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_maxframes = atoi( optarg );
+                param->i_frame_total = atoi( optarg );
                 break;
-            case'o':
-                if( ( *p_fout = fopen( optarg, "wb" ) ) == NULL )
+            case OPT_SEEK:
+                opt->i_seek = atoi( optarg );
+                break;
+            case 'o':
+                if( !strncasecmp(optarg + strlen(optarg) - 4, ".mp4", 4) )
                 {
-                    fprintf( stderr, "cannot open output file `%s'\n", optarg );
+#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" );
                     return -1;
+#endif
                 }
-                break;
-            case 's':
-            {
-                char *p = strchr( optarg, ':' );
-                if( p )
+                else if( !strncasecmp(optarg + strlen(optarg) - 4, ".mkv", 4) )
                 {
-                    param->vui.i_sar_width = atoi( optarg );
-                    param->vui.i_sar_height = atoi( p + 1 );
+                    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;
                 }
-                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 ) )
+                if( !strcmp(optarg, "-") )
+                    opt->hout = stdout;
+                else if( p_open_outfile( optarg, &opt->hout ) )
                 {
-                    param->i_fps_num = (int)(fps * 1000 + .5);
-                    param->i_fps_den = 1000;
+                    fprintf( stderr, "x264 [error]: can't open output file `%s'\n", optarg );
+                    return -1;
                 }
-                else
+                break;
+            case OPT_QPFILE:
+                opt->qpfile = fopen( optarg, "r" );
+                if( !opt->qpfile )
                 {
-                    fprintf( stderr, "bad fps `%s'\n", optarg );
+                    fprintf( stderr, "x264 [error]: can't open `%s'\n", optarg );
                     return -1;
                 }
-            }
-            case 'A':
-                param->analyse.inter = 0;
-                if( strstr( optarg, "none" ) )  param->analyse.inter = 0x000000;
-                if( strstr( optarg, "all" ) )   param->analyse.inter = X264_ANALYSE_I4x4|X264_ANALYSE_PSUB16x16|X264_ANALYSE_PSUB8x8|X264_ANALYSE_BSUB16x16;
-
-                if( strstr( optarg, "i4x4" ) )  param->analyse.inter |= X264_ANALYSE_I4x4;
-                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:
-                if( strstr( optarg, "temporal" ) )
-                    param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_TEMPORAL;
-                else if( strstr( optarg, "spatial" ) )
-                    param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL;
-                else if( strstr( optarg, "none" ) )
-                    param->analyse.i_direct_mv_pred = X264_DIRECT_PRED_NONE;
-                else
-                    param->analyse.i_direct_mv_pred = atoi( optarg );
-                break;
-            case 'w':
-                param->analyse.b_weighted_bipred = 1;
-                break;
-            case 'm':
-                param->analyse.i_subpel_refine = atoi(optarg);
-                break;
-            case OPT_NO_CHROMA_ME:
-                param->analyse.b_chroma_me = 0;
-                break;
-            case OPT_LEVEL:
-                param->i_level_idc = atoi(optarg);
-                break;
-            case OPT_RCBUF:
-                param->rc.i_rc_buffer_size = atoi(optarg);
-                break;
-            case OPT_RCIBUF:
-                param->rc.i_rc_init_buffer = atoi(optarg);
-                break;
-            case OPT_RCSENS:
-                param->rc.i_rc_sens = atoi(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);
+                param->i_scenecut_threshold = -1;
+                param->b_bframe_adaptive = 0;
                 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;
@@ -520,21 +524,66 @@ static int  Parse( int argc, char **argv,
             case 'v':
                 param->i_log_level = X264_LOG_DEBUG;
                 break;
+            case OPT_PROGRESS:
+                opt->b_progress = 1;
+                break;
+            case OPT_VISUALIZE:
+#ifdef VISUALIZE
+                param->b_visualize = 1;
+                b_exit_on_ctrl_c = 1;
+#else
+                fprintf( stderr, "x264 [warning]: not compiled with visualization support\n" );
+#endif
+                break;
             default:
-                fprintf( stderr, "unknown option (%c)\n", optopt );
-                return -1;
+            {
+                int i;
+                if( long_options_index < 0 )
+                {
+                    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;
+                    }
+                }
+
+                b_error |= x264_param_parse( param, long_options[long_options_index].name, optarg );
+            }
+        }
+
+        if( b_error )
+        {
+            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;
         }
     }
 
     /* Get the file name */
-    if( optind > argc - 1 )
+    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( !(*pb_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 )
         {
@@ -544,7 +593,8 @@ static int  Parse( int argc, char **argv,
                 if( *psz >= '0' && *psz <= '9'
                     && sscanf( psz, "%ux%u", &param->i_width, &param->i_height ) == 2 )
                 {
-                    fprintf( stderr, "x264: file name gives %dx%d\n", param->i_width, param->i_height );
+                    if( param->i_log_level >= X264_LOG_INFO )
+                        fprintf( stderr, "x264 [info]: file name gives %dx%d\n", param->i_width, param->i_height );
                     break;
                 }
             }
@@ -553,209 +603,105 @@ 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( !strncmp( psz, ".avi", 4 ) || !strncmp( 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, "-" ) )
     {
-        *p_hin = stdin;
-        optind++;
-    }
-    else
-    {
-#ifdef AVIS_INPUT
         if( b_avis )
         {
-            p_open_file = open_file_avis;
+#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_file = close_file_avis;
-        }
-#endif
-        if( p_open_file( psz_filename, p_hin, param ) )
-        {
-            fprintf( stderr, "could not open input file '%s'\n", psz_filename );
+            p_close_infile = close_file_avis;
+#else
+            fprintf( stderr, "x264 [error]: not compiled with AVIS input support\n" );
             return -1;
+#endif
         }
-    }
-
-    return 0;
-}
-
-/*****************************************************************************
- * Decode:
- *****************************************************************************/
-static int  Decode( x264_param_t  *param, FILE *fh26l, FILE *fout )
-{
-    fprintf( stderr, "decompressor not working (help is welcome)\n" );
-    return -1;
-#if 0
-    x264_nal_t nal;
-    int i_data;
-    int b_eof;
-
-    //param.cpu = 0;
-    if( ( h = x264_decoder_open( &param ) ) == NULL )
-    {
-        fprintf( stderr, "x264_decoder_open failed\n" );
-        return -1;
-    }
-
-    i_start = x264_mdate();
-    b_eof = 0;
-    i_frame = 0;
-    i_data  = 0;
-    nal.p_payload = malloc( DATA_MAX );
-
-    while( !i_ctrl_c )
-    {
-        uint8_t *p, *p_next, *end;
-        int i_size;
-        /* fill buffer */
-        if( i_data < DATA_MAX && !b_eof )
-        {
-            int i_read = fread( &data[i_data], 1, DATA_MAX - i_data, fh26l );
-            if( i_read <= 0 )
-            {
-                b_eof = 1;
-            }
-            else
-            {
-                i_data += i_read;
-            }
-        }
-
-        if( i_data < 3 )
+        if ( b_y4m )
         {
-            break;
+            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;
         }
 
-        end = &data[i_data];
-
-        /* extract one nal */
-        p = &data[0];
-        while( p < end - 3 )
+        if( p_open_infile( psz_filename, &opt->hin, param ) )
         {
-            if( p[0] == 0x00 && p[1] == 0x00 && p[2] == 0x01 )
-            {
-                break;
-            }
-            p++;
+            fprintf( stderr, "x264 [error]: could not open input file '%s'\n", psz_filename );
+            return -1;
         }
+    }
 
-        if( p >= end - 3 )
+#ifdef HAVE_PTHREAD
+    if( b_thread_input || param->i_threads > 1 )
+    {
+        if( open_file_thread( NULL, &opt->hin, param ) )
         {
-            fprintf( stderr, "garbage (i_data = %d)\n", i_data );
-            i_data = 0;
-            continue;
+            fprintf( stderr, "x264 [warning]: threaded input failed\n" );
         }
-
-        p_next = p + 3;
-        while( p_next < end - 3 )
+        else
         {
-            if( p_next[0] == 0x00 && p_next[1] == 0x00 && p_next[2] == 0x01 )
-            {
-                break;
-            }
-            p_next++;
+            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
 
-        if( p_next == end - 3 && i_data < DATA_MAX )
-        {
-            p_next = end;
-        }
+    return 0;
+}
 
-        /* decode this nal */
-        i_size = p_next - p - 3;
-        if( i_size <= 0 )
-        {
-            if( b_eof )
-            {
-                break;
-            }
-            fprintf( stderr, "nal too large (FIXME) ?\n" );
-            i_data = 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;
-        }
-
-        x264_nal_decode( &nal, p +3, i_size );
-
-        /* decode the content of the nal */
-        x264_decoder_decode( h, &pic, &nal );
-
-        if( pic != NULL )
+        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 )
         {
-            int i;
-
-            i_frame++;
-
-            for( i = 0; i < pic->i_plane;i++ )
-            {
-                int i_line;
-                int i_div;
-
-                i_div = i==0 ? 1 : 2;
-                for( i_line = 0; i_line < pic->i_height/i_div; i_line++ )
-                {
-                    fwrite( pic->plane[i]+i_line*pic->i_stride[i], 1, pic->i_width/i_div, fout );
-                }
-            }
+            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;
         }
-
-        memmove( &data[0], p_next, end - p_next );
-        i_data -= p_next - &data[0];
     }
-
-    i_end = x264_mdate();
-    free( nal.p_payload );
-    fprintf( stderr, "\n" );
-
-    x264_decoder_close( h );
-
-    fclose( fh26l );
-    if( fout != stdout )
-    {
-        fclose( fout );
-    }
-    if( i_frame > 0 )
-    {
-        double fps = (double)i_frame * (double)1000000 /
-                     (double)( i_end - i_start );
-        fprintf( stderr, "decoded %d frames %ffps\n", i_frame, fps );
-    }
-#endif
 }
 
-static int  Encode_frame( x264_t *h, FILE *fout, x264_picture_t *pic )
+/*****************************************************************************
+ * Decode:
+ *****************************************************************************/
+
+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_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++ )
@@ -766,20 +712,23 @@ static int  Encode_frame( x264_t *h, FILE *fout, x264_picture_t *pic )
         i_data = DATA_MAX;
         if( ( i_size = x264_nal_encode( data, &i_data, 1, &nal[i] ) ) > 0 )
         {
-            i_file += fwrite( data, 1, i_size, fout );
+            i_file += p_write_nalu( hout, data, i_size );
         }
         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)
+        p_set_eop( hout, &pic_out );
+
     return i_file;
 }
 
 /*****************************************************************************
  * Encode:
  *****************************************************************************/
-static int  Encode( x264_param_t  *param, hnd_t hin, FILE *fout )
+static int  Encode( x264_param_t *param, cli_opt_t *opt )
 {
     x264_t *h;
     x264_picture_t pic;
@@ -788,12 +737,28 @@ static int  Encode( x264_param_t  *param, hnd_t hin, FILE *fout )
     int64_t i_start, i_end;
     int64_t i_file;
     int     i_frame_size;
+    int     i_progress;
 
-    i_frame_total = p_get_frame_total( 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 )
+        i_frame_total = param->i_frame_total;
+    param->i_frame_total = i_frame_total;
 
     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;
+    }
+
+    if( p_set_outfile_param( opt->hout, param ) )
+    {
+        fprintf( stderr, "x264 [error]: can't set outfile param\n" );
+        p_close_infile( opt->hin );
+        p_close_outfile( opt->hout );
         return -1;
     }
 
@@ -801,21 +766,53 @@ static int  Encode( x264_param_t  *param, hnd_t hin, FILE *fout )
     x264_picture_alloc( &pic, X264_CSP_I420, param->i_width, param->i_height );
 
     i_start = x264_mdate();
-    for( i_frame = 0, i_file = 0; i_ctrl_c == 0 && i_frame < i_frame_total; i_frame++ )
+
+    /* Encode frames */
+    for( i_frame = 0, i_file = 0, i_progress = 0;
+         b_ctrl_c == 0 && (i_frame < i_frame_total || i_frame_total == 0); )
     {
-        if (param->i_maxframes!=0 && i_frame>=param->i_maxframes)
+        if( p_read_frame( &pic, opt->hin, i_frame + opt->i_seek ) )
             break;
 
-        /* read a frame */
-        if ( p_read_frame( &pic, hin, param->i_width, param->i_height ) )
-            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_file += Encode_frame( h, fout, &pic );
+        i_frame++;
+
+        /* update status line (up to 1000 times per input file) */
+        if( opt->b_progress && param->i_log_level < X264_LOG_DEBUG && 
+            ( i_frame_total ? i_frame * 1000 / i_frame_total > i_progress
+                            : i_frame % 10 == 0 ) )
+        {
+            int64_t i_elapsed = x264_mdate() - i_start;
+            double fps = i_elapsed > 0 ? i_frame * 1000000. / i_elapsed : 0;
+            if( i_frame_total )
+            {
+                int eta = i_elapsed * (i_frame_total - i_frame) / ((int64_t)i_frame * 1000000);
+                i_progress = i_frame * 1000 / i_frame_total;
+                fprintf( stderr, "encoded frames: %d/%d (%.1f%%), %.2f fps, eta %d:%02d:%02d  \r",
+                         i_frame, i_frame_total, (float)i_progress / 10, fps,
+                         eta/3600, (eta/60)%60, eta%60 );
+            }
+            else
+                fprintf( stderr, "encoded frames: %d, %.2f fps   \r", i_frame, fps );
+            fflush( stderr ); // needed in windows
+        }
     }
     /* Flush delayed B-frames */
     do {
         i_file +=
-        i_frame_size = Encode_frame( h, fout, NULL );
+        i_frame_size = Encode_frame( h, opt->hout, NULL );
     } while( i_frame_size );
 
     i_end = x264_mdate();
@@ -823,168 +820,21 @@ static int  Encode( x264_param_t  *param, hnd_t hin, FILE *fout )
     x264_encoder_close( h );
     fprintf( stderr, "\n" );
 
-    p_close_file( hin );
-    if( fout != stdout )
-    {
-        fclose( fout );
-    }
+    if( b_ctrl_c )
+        fprintf( stderr, "aborted at input frame %d\n", opt->i_seek + i_frame );
+
+    p_close_infile( opt->hin );
+    p_close_outfile( opt->hout );
 
     if( i_frame > 0 )
     {
         double fps = (double)i_frame * (double)1000000 /
                      (double)( i_end - i_start );
 
-        fprintf( stderr, "encoded %d frames, %.2f fps, %.2f kb/s\n", i_frame, fps, (double) i_file * 8 * param->i_fps_num / ( param->i_fps_den * i_frame * 1000 ) );
+        fprintf( stderr, "encoded %d frames, %.2f fps, %.2f kb/s\n", i_frame, fps,
+                 (double) i_file * 8 * param->i_fps_num /
+                 ( (double) param->i_fps_den * i_frame * 1000 ) );
     }
 
     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_width, int i_height )
-{
-       FILE *f = (FILE *)handle;
-       
-       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;
-       
-       return 0;
-}
-
-static int close_file_yuv(hnd_t handle)
-{
-       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_width, int i_height )
-{
-    static int i_index = 0;
-    PAVISTREAM p_avi = (PAVISTREAM)handle;
-    
-    p_pic->img.i_csp = X264_CSP_YV12;
-    
-    if(  AVIStreamRead(p_avi, i_index, 1, p_pic->img.plane[0], i_width * i_height * 3 / 2, NULL, NULL ) )
-        return -1;
-
-    i_index++;
-
-    return 0;
-}
-
-static int close_file_avis( hnd_t handle )
-{
-    PAVISTREAM p_avi = (PAVISTREAM)handle;
-       
-    AVIStreamRelease(p_avi);
-    AVIFileExit();
-
-    return 0;
-}
-
-#endif