/*****************************************************************************
* x264: h264 encoder testing program.
*****************************************************************************
- * Copyright (C) 2003 Laurent Aimar
- * $Id: x264.c,v 1.1 2004/06/03 19:24:12 fenrir Exp $
+ * Copyright (C) 2003-2008 x264 project
*
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Authors: Loren Merritt <lorenm@u.washington.edu>
+ * Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, 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>
#define _GNU_SOURCE
#include <getopt.h>
-#ifdef _MSC_VER
-#include <io.h> /* _setmode() */
-#include <fcntl.h> /* _O_BINARY */
-#endif
+#include "common/common.h"
+#include "common/cpu.h"
+#include "x264.h"
+#include "muxers.h"
#ifndef _MSC_VER
#include "config.h"
#endif
-#include "common/common.h"
-#include "x264.h"
-#include "muxers.h"
-
-#define DATA_MAX 3000000
-uint8_t data[DATA_MAX];
+uint8_t *mux_buffer = NULL;
+int mux_buffer_size = 0;
/* Ctrl-C handler */
static int b_ctrl_c = 0;
{
x264_param_t param;
cli_opt_t opt;
+ int ret;
+
+#ifdef PTW32_STATIC_LIB
+ pthread_win32_process_attach_np();
+ pthread_win32_thread_attach_np();
+#endif
-#ifdef _MSC_VER
+#ifdef _WIN32
_setmode(_fileno(stdin), _O_BINARY);
_setmode(_fileno(stdout), _O_BINARY);
#endif
/* Control-C handler */
signal( SIGINT, SigIntHandler );
- return Encode( ¶m, &opt );
+ ret = Encode( ¶m, &opt );
+
+#ifdef PTW32_STATIC_LIB
+ pthread_win32_thread_detach_np();
+ pthread_win32_process_detach_np();
+#endif
+
+ return ret;
}
static char const *strtable_lookup( const char * const table[], int index )
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( " --aq-mode <integer> How AQ distributes bits [%d]\n"
+ " - 0: Disabled\n"
+ " - 1: Avoid moving bits between frames\n"
+ " - 2: Move bits between frames\n", defaults->rc.i_aq_mode );
+ H0( " --aq-strength <float> Reduces blocking and blurring in flat and\n"
+ " textured areas. [%.1f]\n"
+ " - 0.5: weak AQ\n"
+ " - 1.5: strong AQ\n", defaults->rc.f_aq_strength );
H0( "\n" );
H0( " -p, --pass <1|2|3> Enable multipass ratecontrol\n"
" - 1: First pass, creates stats file\n"
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" );
+ " - esa: exhaustive search\n"
+ " - tesa: hadamard exhaustive search (slow)\n" );
else H0( " - dia, hex, umh\n" );
H0( " --merange <integer> Maximum motion vector search range [%d]\n", defaults->analyse.i_me_range );
H1( " --mvrange <integer> Maximum motion vector length [-1 (auto)]\n" );
H0( " --threads <integer> Parallel encoding\n" );
H0( " --thread-input Run Avisynth in its own thread\n" );
H1( " --non-deterministic Slightly improve quality of SMP, at the cost of repeatability\n" );
+ H1( " --asm <integer> Override CPU detection\n" );
H1( " --no-asm Disable all CPU optimizations\n" );
H1( " --visualize Show MB types overlayed on the encoded video\n" );
+ H1( " --dump-yuv <string> Save reconstructed frames\n" );
H1( " --sps-id <integer> Set SPS and PPS id numbers [%d]\n", defaults->i_sps_id );
H1( " --aud Use access unit delimiters\n" );
H0( "\n" );
{ "qpstep", required_argument, NULL, 0 },
{ "crf", required_argument, NULL, 0 },
{ "ref", required_argument, NULL, 'r' },
+ { "asm", required_argument, NULL, 0 },
{ "no-asm", no_argument, NULL, 0 },
{ "sar", required_argument, NULL, 0 },
{ "fps", required_argument, NULL, 0 },
{ "trellis", required_argument, NULL, 't' },
{ "no-fast-pskip", no_argument, NULL, 0 },
{ "no-dct-decimate", no_argument, NULL, 0 },
+ { "aq-strength", required_argument, NULL, 0 },
+ { "aq-mode", required_argument, NULL, 0 },
{ "deadzone-inter", required_argument, NULL, '0' },
{ "deadzone-intra", required_argument, NULL, '0' },
{ "level", required_argument, NULL, 0 },
{ "verbose", no_argument, NULL, 'v' },
{ "progress",no_argument, NULL, OPT_PROGRESS },
{ "visualize",no_argument, NULL, OPT_VISUALIZE },
+ { "dump-yuv",required_argument, NULL, 0 },
{ "sps-id", required_argument, NULL, 0 },
{ "aud", no_argument, NULL, 0 },
{ "nr", required_argument, NULL, 0 },
}
#ifdef HAVE_PTHREAD
- if( b_thread_input || param->i_threads > 1 )
+ if( b_thread_input || param->i_threads > 1
+ || (param->i_threads == 0 && x264_cpu_num_processors() > 1) )
{
if( open_file_thread( NULL, &opt->hin, param ) )
{
}
/*****************************************************************************
- * Decode:
+ * Encode:
*****************************************************************************/
static int Encode_frame( x264_t *h, hnd_t hout, x264_picture_t *pic )
for( i = 0; i < i_nal; i++ )
{
int i_size;
- int i_data;
- i_data = DATA_MAX;
- if( ( i_size = x264_nal_encode( data, &i_data, 1, &nal[i] ) ) > 0 )
- {
- i_file += p_write_nalu( hout, data, i_size );
- }
- else if( i_size < 0 )
+ if( mux_buffer_size < nal[i].i_payload * 3/2 + 4 )
{
- fprintf( stderr, "x264 [error]: need to increase buffer size (size=%d)\n", -i_size );
+ mux_buffer_size = nal[i].i_payload * 2 + 4;
+ x264_free( mux_buffer );
+ mux_buffer = x264_malloc( mux_buffer_size );
}
+
+ i_size = mux_buffer_size;
+ x264_nal_encode( mux_buffer, &i_size, 1, &nal[i] );
+ i_file += p_write_nalu( hout, mux_buffer, i_size );
}
if (i_nal)
p_set_eop( hout, &pic_out );
return i_file;
}
-/*****************************************************************************
- * Encode:
- *****************************************************************************/
static int Encode( x264_param_t *param, cli_opt_t *opt )
{
x264_t *h;
{
fprintf( stderr, "x264 [error]: x264_encoder_open failed\n" );
p_close_infile( opt->hin );
- p_close_outfile( opt->hout );
return -1;
}
projects / x264 / blobdiff