x264_param_t param;
x264_nal_t * nal;
int nal_count;
- int nal_size;
hb_work_private_t * pv = calloc( 1, sizeof( hb_work_private_t ) );
w->private_data = pv;
x264_param_default( ¶m );
+ /* Default weightp to off for baseline,
+ overridable through x264 option strings. */
+ if( job->x264opts != NULL && *job->x264opts != '\0' )
+ {
+ char *x264opts, *x264opts_start;
+
+ x264opts = x264opts_start = strdup(job->x264opts);
+
+ while( x264opts_start && *x264opts )
+ {
+ char *name = x264opts;
+ char *value;
+
+ x264opts += strcspn( x264opts, ":" );
+ if( *x264opts )
+ {
+ *x264opts = 0;
+ x264opts++;
+ }
+
+ value = strchr( name, '=' );
+ if( value )
+ {
+ *value = 0;
+ value++;
+ }
+
+ /*
+ When B-frames are enabled, the max frame count increments
+ by 1 (regardless of the number of B-frames). If you don't
+ change the duration of the video track when you mux, libmp4
+ barfs. So, check if the x264opts aren't using B-frames, and
+ when they aren't, set the boolean job->areBframes as false.
+ */
+ if( !( strcmp( name, "bframes" ) ) )
+ {
+ if( atoi( value ) == 0 )
+ {
+ param.analyse.i_weighted_pred = X264_WEIGHTP_NONE;
+ }
+ }
+ }
+ }
+
/* Enable metrics */
param.analyse.b_psnr = 1;
param.analyse.b_ssim = 1;
param.i_fps_num = job->vrate;
param.i_fps_den = job->vrate_base;
+ /* Disable annexb. Inserts size into nal header instead of start code */
+ param.b_annexb = 0;
+
/* Set min:max key intervals ratio to 1:10 of fps.
* This section is skipped if fps=25 (default).
*/
param.i_level_idc );
}
+ /* B-frames are on by default.*/
+ job->areBframes = 1;
+
/*
This section passes the string x264opts to libx264 for parsing into
parameter names and values.
When B-frames are enabled, the max frame count increments
by 1 (regardless of the number of B-frames). If you don't
change the duration of the video track when you mux, libmp4
- barfs. So, check if the x264opts are using B-frames, and
- when they are, set the boolean job->areBframes as true.
+ barfs. So, check if the x264opts aren't using B-frames, and
+ when they aren't, set the boolean job->areBframes as false.
*/
-
if( !( strcmp( name, "bframes" ) ) )
{
- if( atoi( value ) > 0 )
+ if( atoi( value ) == 0 )
{
- job->areBframes = 1;
+ job->areBframes = 0;
}
}
{
job->areBframes = 2;
}
+ if( value == NULL || !strcmp( value, "1" ) )
+ {
+ value = "normal";
+ }
+ else if( !strcmp( value, "0" ) )
+ {
+ value = "none";
+ }
}
/* Here's where the strings are passed to libx264 for parsing. */
if( job->vquality > 0.0 && job->vquality < 1.0 )
{
- switch( job->crf )
- {
- case 1:
- /*Constant RF*/
- param.rc.i_rc_method = X264_RC_CRF;
- param.rc.f_rf_constant = 51 - job->vquality * 51;
- hb_log( "encx264: Encoding at constant RF %f",
- param.rc.f_rf_constant );
- break;
-
- case 0:
- /*Constant QP*/
- param.rc.i_rc_method = X264_RC_CQP;
- param.rc.i_qp_constant = 51 - job->vquality * 51;
- hb_log( "encx264: encoding at constant QP %d",
- param.rc.i_qp_constant );
- break;
- }
+ /*Constant RF*/
+ param.rc.i_rc_method = X264_RC_CRF;
+ param.rc.f_rf_constant = 51 - job->vquality * 51;
+ hb_log( "encx264: Encoding at constant RF %f", param.rc.f_rf_constant );
}
else if( job->vquality == 0 || job->vquality >= 1.0 )
{
/* Use the vquality as a raw RF or QP
instead of treating it like a percentage. */
- switch( job->crf )
- {
- case 1:
- /*Constant RF*/
- param.rc.i_rc_method = X264_RC_CRF;
- param.rc.f_rf_constant = job->vquality;
- hb_log( "encx264: Encoding at constant RF %f",
- param.rc.f_rf_constant );
- break;
-
- case 0:
- /*Constant QP*/
- param.rc.i_rc_method = X264_RC_CQP;
- param.rc.i_qp_constant = job->vquality;
- hb_log( "encx264: encoding at constant QP %d",
- param.rc.i_qp_constant );
- break;
- }
+ /*Constant RF*/
+ param.rc.i_rc_method = X264_RC_CRF;
+ param.rc.f_rf_constant = job->vquality;
+ hb_log( "encx264: Encoding at constant RF %f", param.rc.f_rf_constant );
}
else
{
x264_encoder_headers( pv->x264, &nal, &nal_count );
/* Sequence Parameter Set */
- x264_nal_encode( w->config->h264.sps, &nal_size, 0, &nal[1] );
- w->config->h264.sps_length = nal_size;
+ memcpy(w->config->h264.sps, nal[1].p_payload + 4, nal[1].i_payload - 4);
+ w->config->h264.sps_length = nal[1].i_payload - 4;
/* Picture Parameter Set */
- x264_nal_encode( w->config->h264.pps, &nal_size, 0, &nal[2] );
- w->config->h264.pps_length = nal_size;
+ memcpy(w->config->h264.pps, nal[2].p_payload + 4, nal[2].i_payload - 4);
+ w->config->h264.pps_length = nal[2].i_payload - 4;
x264_picture_alloc( &pv->pic_in, X264_CSP_I420,
job->width, job->height );
int i;
for( i = 0; i < i_nal; i++ )
{
- int data = buf->alloc - buf->size;
- int size = x264_nal_encode( buf->data + buf->size, &data, 1, &nal[i] );
+ int size = nal[i].i_payload;
+ memcpy(buf->data + buf->size, nal[i].p_payload, size);
if( size < 1 )
{
continue;
break;
}
- /* H.264 in mp4 (stolen from mp4creator) */
- buf->data[buf->size+0] = ( ( size - 4 ) >> 24 ) & 0xFF;
- buf->data[buf->size+1] = ( ( size - 4 ) >> 16 ) & 0xFF;
- buf->data[buf->size+2] = ( ( size - 4 ) >> 8 ) & 0xFF;
- buf->data[buf->size+3] = ( ( size - 4 ) >> 0 ) & 0xFF;
-
/* Decide what type of frame we have. */
switch( pic_out->i_type )
{