Skip to content

V
vlc-2-2
Commit 1e0a7a8c authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

avcodec: settings pts doesn't segfault with mp4v

parent aba8eb02
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 33 deletions
modules/codec/avcodec/encoder.c
View file @ 1e0a7a8c
...@@ -871,51 +871,44 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) ...@@ -871,51 +871,44 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
frame->interlaced_frame = !p_pict->b_progressive; frame->interlaced_frame = !p_pict->b_progressive;
frame->top_field_first = !!p_pict->b_top_field_first; frame->top_field_first = !!p_pict->b_top_field_first;
/* Set the pts of the frame being encoded (segfaults with mpeg4!)*/ /* Set the pts of the frame being encoded */
if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V ) frame->pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
if ( p_sys->b_hurry_up && frame->pts != (int64_t)AV_NOPTS_VALUE )
{ {
frame->pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE; mtime_t current_date = mdate();
if ( p_sys->b_hurry_up && frame->pts != (int64_t)AV_NOPTS_VALUE ) if ( current_date + HURRY_UP_GUARD3 > frame->pts )
{
p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
p_sys->p_context->trellis = 0;
msg_Dbg( p_enc, "hurry up mode 3" );
}
else
{ {
mtime_t current_date = mdate(); p_sys->p_context->mb_decision = p_sys->i_hq;
if ( current_date + HURRY_UP_GUARD3 > frame->pts ) if ( current_date + HURRY_UP_GUARD2 > frame->pts )
{ {
p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
p_sys->p_context->trellis = 0; p_sys->p_context->trellis = 0;
msg_Dbg( p_enc, "hurry up mode 3" ); p_sys->p_context->noise_reduction = p_sys->i_noise_reduction
+ (HURRY_UP_GUARD2 + current_date - frame->pts) / 500;
msg_Dbg( p_enc, "hurry up mode 2" );
} }
else else
{ {
p_sys->p_context->mb_decision = p_sys->i_hq; p_sys->p_context->trellis = p_sys->b_trellis;
if ( current_date + HURRY_UP_GUARD2 > frame->pts )
{
p_sys->p_context->trellis = 0;
p_sys->p_context->noise_reduction = p_sys->i_noise_reduction
+ (HURRY_UP_GUARD2 + current_date - frame->pts) / 500;
msg_Dbg( p_enc, "hurry up mode 2" );
}
else
{
p_sys->p_context->trellis = p_sys->b_trellis;
p_sys->p_context->noise_reduction =
p_sys->i_noise_reduction;
}
}
if ( current_date + HURRY_UP_GUARD1 > frame->pts ) p_sys->p_context->noise_reduction =
{ p_sys->i_noise_reduction;
frame->pict_type = AV_PICTURE_TYPE_P;
/* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
} }
} }
}
else if ( current_date + HURRY_UP_GUARD1 > frame->pts )
{ {
frame->pts = (int64_t)AV_NOPTS_VALUE; frame->pict_type = AV_PICTURE_TYPE_P;
/* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
}
} }
if ( frame->pts != (int64_t)AV_NOPTS_VALUE && frame->pts != 0 ) if ( frame->pts != (int64_t)AV_NOPTS_VALUE && frame->pts != 0 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment