/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_vout.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
+#ifdef PTW32_STATIC_LIB
+#include <pthread.h>
+#endif
#include <x264.h>
#define SOUT_CFG_PREFIX "sout-x264-"
#define WEIGHTB_LONGTEXT N_( "Weighted prediction for B-frames.")
#define ME_TEXT N_("Integer pixel motion estimation method")
+#if X264_BUILD >= 58 /* r728 */
+#define ME_LONGTEXT N_( "Selects the motion estimation algorithm: "\
+ " - dia: diamond search, radius 1 (fast)\n" \
+ " - hex: hexagonal search, radius 2\n" \
+ " - umh: uneven multi-hexagon search (better but slower)\n" \
+ " - esa: exhaustive search (extremely slow, primarily for testing)\n" \
+ " - tesa: hadamard exhaustive search (extremely slow, primarily for testing)\n" )
+#else
#define ME_LONGTEXT N_( "Selects the motion estimation algorithm: "\
" - dia: diamond search, radius 1 (fast)\n" \
" - hex: hexagonal search, radius 2\n" \
" - umh: uneven multi-hexagon search (better but slower)\n" \
" - esa: exhaustive search (extremely slow, primarily for testing)\n" )
+#endif
#if X264_BUILD >= 24
#define MERANGE_TEXT N_("Maximum motion vector search range")
#define AUD_TEXT N_("Access unit delimiters")
#define AUD_LONGTEXT N_( "Generate access unit delimiter NAL units.")
-#if X264_BUILD >= 24
+#if X264_BUILD >= 24 && X264_BUILD < 58
static const char *enc_me_list[] =
{ "dia", "hex", "umh", "esa" };
static const char *enc_me_list_text[] =
{ N_("dia"), N_("hex"), N_("umh"), N_("esa") };
#endif
+#if X264_BUILD >= 58 /* r728 */
+static const char *enc_me_list[] =
+ { "dia", "hex", "umh", "esa", "tesa" };
+static const char *enc_me_list_text[] =
+ { N_("dia"), N_("hex"), N_("umh"), N_("esa"), N_("tesa") };
+#endif
+
static const char *enc_analyse_list[] =
{ "none", "fast", "normal", "slow", "all" };
static const char *enc_analyse_list_text[] =
add_integer( SOUT_CFG_PREFIX "keyint", 250, NULL, KEYINT_TEXT,
KEYINT_LONGTEXT, VLC_FALSE );
- change_safe();
add_integer( SOUT_CFG_PREFIX "min-keyint", 25, NULL, MIN_KEYINT_TEXT,
MIN_KEYINT_LONGTEXT, VLC_FALSE );
- change_safe();
add_deprecated_alias( SOUT_CFG_PREFIX "keyint-min" ); /* Deprecated since 0.8.5 */
add_integer( SOUT_CFG_PREFIX "scenecut", 40, NULL, SCENE_TEXT,
SCENE_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( -1, 100 );
#if X264_BUILD >= 55 /* r607 */
add_bool( SOUT_CFG_PREFIX "pre-scenecut", 0, NULL, PRESCENE_TEXT,
PRESCENE_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_integer( SOUT_CFG_PREFIX "bframes", 0, NULL, BFRAMES_TEXT,
BFRAMES_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 16 );
#if X264_BUILD >= 0x0013 /* r137 */
add_bool( SOUT_CFG_PREFIX "b-adapt", 1, NULL, B_ADAPT_TEXT,
B_ADAPT_LONGTEXT, VLC_FALSE );
- change_safe();
add_integer( SOUT_CFG_PREFIX "b-bias", 0, NULL, B_BIAS_TEXT,
B_BIAS_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( -100, 100 );
#endif
add_bool( SOUT_CFG_PREFIX "bpyramid", 0, NULL, BPYRAMID_TEXT,
BPYRAMID_LONGTEXT, VLC_FALSE );
- change_safe();
add_bool( SOUT_CFG_PREFIX "cabac", 1, NULL, CABAC_TEXT, CABAC_LONGTEXT,
VLC_FALSE );
- change_safe();
add_integer( SOUT_CFG_PREFIX "ref", 1, NULL, REF_TEXT,
REF_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 1, 16 );
add_deprecated_alias( SOUT_CFG_PREFIX "frameref" ); /* Deprecated since 0.8.5 */
add_bool( SOUT_CFG_PREFIX "nf", 0, NULL, NF_TEXT,
NF_LONGTEXT, VLC_FALSE );
- change_safe();
add_deprecated_alias( SOUT_CFG_PREFIX "loopfilter" ); /* Deprecated since 0.8.5 */
add_string( SOUT_CFG_PREFIX "deblock", "0:0", NULL, FILTER_TEXT,
FILTER_LONGTEXT, VLC_FALSE );
- change_safe();
add_deprecated_alias( SOUT_CFG_PREFIX "filter" ); /* Deprecated since 0.8.6 */
add_string( SOUT_CFG_PREFIX "level", "5.1", NULL, LEVEL_TEXT,
LEVEL_LONGTEXT, VLC_FALSE );
- change_safe();
#if X264_BUILD >= 51 /* r570 */
add_bool( SOUT_CFG_PREFIX "interlaced", 0, NULL, INTERLACED_TEXT, INTERLACED_LONGTEXT,
VLC_FALSE );
- change_safe();
#endif
/* Ratecontrol */
add_integer( SOUT_CFG_PREFIX "qp", 26, NULL, QP_TEXT, QP_LONGTEXT,
VLC_FALSE );
- change_safe();
change_integer_range( 0, 51 ); /* QP 0 -> lossless encoding */
#if X264_BUILD >= 37 /* r334 */
add_integer( SOUT_CFG_PREFIX "crf", 0, NULL, CRF_TEXT,
CRF_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 51 );
#endif
add_integer( SOUT_CFG_PREFIX "qpmin", 10, NULL, QPMIN_TEXT,
QPMIN_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 51 );
add_deprecated_alias( SOUT_CFG_PREFIX "qp-min" ); /* Deprecated since 0.8.5 */
add_integer( SOUT_CFG_PREFIX "qpmax", 51, NULL, QPMAX_TEXT,
QPMAX_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 51 );
add_deprecated_alias( SOUT_CFG_PREFIX "qp-max" ); /* Deprecated since 0.8.5 */
add_integer( SOUT_CFG_PREFIX "qpstep", 4, NULL, QPSTEP_TEXT,
QPSTEP_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 51 );
add_float( SOUT_CFG_PREFIX "ratetol", 1.0, NULL, RATETOL_TEXT,
RATETOL_LONGTEXT, VLC_FALSE );
- change_safe();
change_float_range( 0, 100 );
add_deprecated_alias( SOUT_CFG_PREFIX "tolerance" ); /* Deprecated since 0.8.5 */
add_integer( SOUT_CFG_PREFIX "vbv-maxrate", 0, NULL, VBV_MAXRATE_TEXT,
VBV_MAXRATE_LONGTEXT, VLC_FALSE );
- change_safe();
add_integer( SOUT_CFG_PREFIX "vbv-bufsize", 0, NULL, VBV_BUFSIZE_TEXT,
VBV_BUFSIZE_LONGTEXT, VLC_FALSE );
- change_safe();
add_float( SOUT_CFG_PREFIX "vbv-init", 0.9, NULL, VBV_INIT_TEXT,
VBV_INIT_LONGTEXT, VLC_FALSE );
- change_safe();
change_float_range( 0, 1 );
add_float( SOUT_CFG_PREFIX "ipratio", 1.40, NULL, IPRATIO_TEXT,
IPRATIO_LONGTEXT, VLC_FALSE );
- change_safe();
change_float_range( 1, 2 );
add_float( SOUT_CFG_PREFIX "pbratio", 1.30, NULL, PBRATIO_TEXT,
PBRATIO_LONGTEXT, VLC_FALSE );
- change_safe();
change_float_range( 1, 2 );
#if X264_BUILD >= 23 /* r190 */
add_integer( SOUT_CFG_PREFIX "chroma-qp-offset", 0, NULL, CHROMA_QP_OFFSET_TEXT,
CHROMA_QP_OFFSET_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_integer( SOUT_CFG_PREFIX "pass", 0, NULL, PASS_TEXT,
PASS_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 3 );
add_float( SOUT_CFG_PREFIX "qcomp", 0.60, NULL, QCOMP_TEXT,
QCOMP_LONGTEXT, VLC_FALSE );
- change_safe();
change_float_range( 0, 1 );
add_float( SOUT_CFG_PREFIX "cplxblur", 20.0, NULL, CPLXBLUR_TEXT,
CPLXBLUR_LONGTEXT, VLC_FALSE );
- change_safe();
add_float( SOUT_CFG_PREFIX "qblur", 0.5, NULL, QBLUR_TEXT,
QBLUR_LONGTEXT, VLC_FALSE );
- change_safe();
/* Analysis */
/* x264 partitions = none (default). set at least "normal" mode. */
add_string( SOUT_CFG_PREFIX "partitions", "normal", NULL, ANALYSE_TEXT,
ANALYSE_LONGTEXT, VLC_FALSE );
- change_safe();
change_string_list( enc_analyse_list, enc_analyse_list_text, 0 );
add_deprecated_alias( SOUT_CFG_PREFIX "analyse" ); /* Deprecated since 0.8.6 */
add_string( SOUT_CFG_PREFIX "direct", "spatial", NULL, DIRECT_PRED_TEXT,
DIRECT_PRED_LONGTEXT, VLC_FALSE );
- change_safe();
change_string_list( direct_pred_list, direct_pred_list_text, 0 );
#if X264_BUILD >= 52 /* r573 */
- add_integer( SOUT_CFG_PREFIX "direct-8x8", 0, NULL, DIRECT_PRED_SIZE_TEXT,
+ add_integer( SOUT_CFG_PREFIX "direct-8x8", -1, NULL, DIRECT_PRED_SIZE_TEXT,
DIRECT_PRED_SIZE_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( -1, 1 );
#endif
#if X264_BUILD >= 0x0012 /* r134 */
add_bool( SOUT_CFG_PREFIX "weightb", 0, NULL, WEIGHTB_TEXT,
WEIGHTB_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 24 /* r221 */
add_string( SOUT_CFG_PREFIX "me", "hex", NULL, ME_TEXT,
ME_LONGTEXT, VLC_FALSE );
- change_safe();
change_string_list( enc_me_list, enc_me_list_text, 0 );
add_integer( SOUT_CFG_PREFIX "merange", 16, NULL, MERANGE_TEXT,
MERANGE_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 1, 64 );
#endif
add_integer( SOUT_CFG_PREFIX "mvrange", -1, NULL, MVRANGE_TEXT,
MVRANGE_LONGTEXT, VLC_FALSE );
- change_safe();
#if X264_BUILD >= 55 /* r607 */
add_integer( SOUT_CFG_PREFIX "mvrange-thread", -1, NULL, MVRANGE_THREAD_TEXT,
MVRANGE_THREAD_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_integer( SOUT_CFG_PREFIX "subme", 5, NULL, SUBME_TEXT,
SUBME_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 1, SUBME_MAX );
add_deprecated_alias( SOUT_CFG_PREFIX "subpel" ); /* Deprecated since 0.8.5 */
#if X264_BUILD >= 41 /* r368 */
add_bool( SOUT_CFG_PREFIX "b-rdo", 0, NULL, B_RDO_TEXT,
B_RDO_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 36 /* r318 */
add_bool( SOUT_CFG_PREFIX "mixed-refs", 0, NULL, MIXED_REFS_TEXT,
MIXED_REFS_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 23 /* r171 */
add_bool( SOUT_CFG_PREFIX "chroma-me", 1, NULL, CHROMA_ME_TEXT,
CHROMA_ME_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 43 /* r390 */
add_bool( SOUT_CFG_PREFIX "bime", 0, NULL, BIME_TEXT,
BIME_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 30 /* r251 */
add_bool( SOUT_CFG_PREFIX "8x8dct", 0, NULL, TRANSFORM_8X8DCT_TEXT,
TRANSFORM_8X8DCT_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 39 /* r360 */
add_integer( SOUT_CFG_PREFIX "trellis", 0, NULL, TRELLIS_TEXT,
TRELLIS_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 2 );
#endif
#if X264_BUILD >= 42 /* r384 */
add_bool( SOUT_CFG_PREFIX "fast-pskip", 1, NULL, FAST_PSKIP_TEXT,
FAST_PSKIP_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 46 /* r503 */
add_bool( SOUT_CFG_PREFIX "dct-decimate", 1, NULL, DCT_DECIMATE_TEXT,
DCT_DECIMATE_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
#if X264_BUILD >= 44 /* r398 */
add_integer( SOUT_CFG_PREFIX "nr", 0, NULL, NR_TEXT,
NR_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 1000 );
#endif
#if X264_BUILD >= 52 /* r573 */
add_integer( SOUT_CFG_PREFIX "deadzone-inter", 21, NULL, DEADZONE_INTER_TEXT,
DEADZONE_INTRA_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 32 );
add_integer( SOUT_CFG_PREFIX "deadzone-intra", 11, NULL, DEADZONE_INTRA_TEXT,
DEADZONE_INTRA_LONGTEXT, VLC_FALSE );
- change_safe();
change_integer_range( 0, 32 );
#endif
#if X264_BUILD >= 55 /* r607 */
add_bool( SOUT_CFG_PREFIX "non-deterministic", 0, NULL, NON_DETERMINISTIC_TEXT,
NON_DETERMINISTIC_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_bool( SOUT_CFG_PREFIX "asm", 1, NULL, ASM_TEXT,
ASM_LONGTEXT, VLC_FALSE );
- change_safe();
/* x264 psnr = 1 (default). disable PSNR computation for speed. */
add_bool( SOUT_CFG_PREFIX "psnr", 0, NULL, PSNR_TEXT,
PSNR_LONGTEXT, VLC_FALSE );
- change_safe();
#if X264_BUILD >= 50 /* r554 */
/* x264 ssim = 1 (default). disable SSIM computation for speed. */
add_bool( SOUT_CFG_PREFIX "ssim", 0, NULL, SSIM_TEXT,
SSIM_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_bool( SOUT_CFG_PREFIX "quiet", 0, NULL, QUIET_TEXT,
QUIET_LONGTEXT, VLC_FALSE );
- change_safe();
#if X264_BUILD >= 47 /* r518 */
add_integer( SOUT_CFG_PREFIX "sps-id", 0, NULL, SPS_ID_TEXT,
SPS_ID_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_bool( SOUT_CFG_PREFIX "aud", 0, NULL, AUD_TEXT,
AUD_LONGTEXT, VLC_FALSE );
- change_safe();
#if X264_BUILD >= 0x000e /* r81 */
add_bool( SOUT_CFG_PREFIX "verbose", 0, NULL, VERBOSE_TEXT,
VERBOSE_LONGTEXT, VLC_FALSE );
- change_safe();
#endif
add_string( SOUT_CFG_PREFIX "stats", "x264_2pass.log", NULL, STATS_TEXT,
return VLC_EGENERIC;
}
+ /* X264_POINTVER or X264_VERSION are not available */
+ msg_Dbg ( p_enc, "version x264 0.%d.X", X264_BUILD );
+
#if X264_BUILD < 37
if( p_enc->fmt_in.video.i_width % 16 != 0 ||
p_enc->fmt_in.video.i_height % 16 != 0 )
var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
var_Get( p_enc, SOUT_CFG_PREFIX "qpmin", &val );
- if( val.i_int >= 0 && val.i_int <= 51 ) i_qmin = val.i_int;
+ if( val.i_int >= 0 && val.i_int <= 51 )
+ {
+ i_qmin = val.i_int;
+ p_sys->param.rc.i_qp_min = i_qmin;
+ }
var_Get( p_enc, SOUT_CFG_PREFIX "qpmax", &val );
- if( val.i_int >= 0 && val.i_int <= 51 ) i_qmax = val.i_int;
+ if( val.i_int >= 0 && val.i_int <= 51 )
+ {
+ i_qmax = val.i_int;
+ p_sys->param.rc.i_qp_max = i_qmax;
+ }
var_Get( p_enc, SOUT_CFG_PREFIX "qp", &val );
if( val.i_int >= 0 && val.i_int <= 51 )
if( i_qmin > val.i_int ) i_qmin = val.i_int;
if( i_qmax < val.i_int ) i_qmax = val.i_int;
+ p_sys->param.rc.i_rc_method = X264_RC_CQP;
#if X264_BUILD >= 0x000a
p_sys->param.rc.i_qp_constant = val.i_int;
p_sys->param.rc.i_qp_min = i_qmin;
{
p_sys->param.analyse.i_me_method = X264_ME_ESA;
}
- if( val.psz_string ) free( val.psz_string );
+ #if X264_BUILD >= 58 /* r728 */
+ else if( !strcmp( val.psz_string, "tesa" ) )
+ {
+ p_sys->param.analyse.i_me_method = X264_ME_TESA;
+ }
+ #endif
+ free( val.psz_string );
var_Get( p_enc, SOUT_CFG_PREFIX "merange", &val );
if( val.i_int >= 0 && val.i_int <= 64 )
p_sys->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_AUTO;
}
#endif
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
var_Get( p_enc, SOUT_CFG_PREFIX "psnr", &val );
p_sys->param.analyse.b_psnr = val.b_bool;
p_sys->param.analyse.inter |= X264_ANALYSE_I8x8;
#endif
}
- if( val.psz_string ) free( val.psz_string );
+ free( val.psz_string );
#if X264_BUILD >= 30
var_Get( p_enc, SOUT_CFG_PREFIX "8x8dct", &val );
p_sys->param.cpu &= ~X264_CPU_SSE2;
}
+ /* BUILD 29 adds support for multi-threaded encoding while BUILD 49 (r543)
+ also adds support for threads = 0 for automatically selecting an optimal
+ value (cores * 1.5) based on detected CPUs. Default behavior for x264 is
+ threads = 1, however VLC usage differs and uses threads = 0 (auto) by
+ default unless ofcourse transcode threads is explicitly specified.. */
#if X264_BUILD >= 29
- /* As of r543 x264 will autodetect the number of cpus and will set
- the number of threads accordingly unless ofcourse the number of
- threads is explicitly specified... */
- if( p_enc->i_threads >= 1 )
- p_sys->param.i_threads = p_enc->i_threads;
+ p_sys->param.i_threads = p_enc->i_threads;
#endif
var_Get( p_enc, SOUT_CFG_PREFIX "stats", &val );
p_sys->param.rc.b_stat_read = val.i_int & 2;
}
+ /* We need to initialize pthreadw32 before we open the encoder,
+ but only oncce for the whole application. Since pthreadw32
+ doesn't keep a refcount, do it ourselves. */
+#ifdef PTW32_STATIC_LIB
+ vlc_value_t lock, count;
+
+ var_Create( p_enc->p_libvlc, "pthread_win32_mutex", VLC_VAR_MUTEX );
+ var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock );
+ vlc_mutex_lock( lock.p_address );
+
+ var_Create( p_enc->p_libvlc, "pthread_win32_count", VLC_VAR_INTEGER );
+ var_Get( p_enc->p_libvlc, "pthread_win32_count", &count );
+
+ if( count.i_int == 0 )
+ {
+ msg_Dbg( p_enc, "initializing pthread-win32" );
+ if( !pthread_win32_process_attach_np() || !pthread_win32_thread_attach_np() )
+ {
+ msg_Warn( p_enc, "pthread Win32 Initialization failed" );
+ vlc_mutex_unlock( lock.p_address );
+ return VLC_EGENERIC;
+ }
+ }
+
+ count.i_int++;
+ var_Set( p_enc->p_libvlc, "pthread_win32_count", count );
+ vlc_mutex_unlock( lock.p_address );
+
+#endif
+
/* Open the encoder */
p_sys->h = x264_encoder_open( &p_sys->param );
p_enc->fmt_out.p_extra = realloc( p_enc->fmt_out.p_extra, p_enc->fmt_out.i_extra + i_size );
- memcpy( p_enc->fmt_out.p_extra + p_enc->fmt_out.i_extra,
- p_sys->p_buffer, i_size );
+ memcpy( (uint8_t*)p_enc->fmt_out.p_extra + p_enc->fmt_out.i_extra,
+ p_sys->p_buffer, i_size );
p_enc->fmt_out.i_extra += i_size;
}
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys;
-
- if( p_sys->psz_stat_name )
- free( p_sys->psz_stat_name );
+
+ free( p_sys->psz_stat_name );
x264_encoder_close( p_sys->h );
+
+#ifdef PTW32_STATIC_LIB
+ vlc_value_t lock, count;
+
+ var_Create( p_enc->p_libvlc, "pthread_win32_mutex", VLC_VAR_MUTEX );
+ var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock );
+ vlc_mutex_lock( lock.p_address );
+
+ var_Create( p_enc->p_libvlc, "pthread_win32_count", VLC_VAR_INTEGER );
+ var_Get( p_enc->p_libvlc, "pthread_win32_count", &count );
+ count.i_int--;
+ var_Set( p_enc->p_libvlc, "pthread_win32_count", count );
+
+ if( count.i_int == 0 )
+ {
+ pthread_win32_thread_detach_np();
+ pthread_win32_process_detach_np();
+ msg_Dbg( p_enc, "pthread-win32 deinitialized" );
+ }
+ vlc_mutex_unlock( lock.p_address );
+#endif
+
free( p_sys->p_buffer );
free( p_sys );
}