else if( job->frame_to_stop )
{
/* Set the duration to a rough estimate */
- duration = ( job->frame_to_stop / ( job->vrate / job->vrate_base ) ) * 90000;
+ duration = ( job->frame_to_stop / ( title->rate / title->rate_base ) ) * 90000;
}
else
{
duration += 90000;
/* 1 second safety so we're sure we won't miss anything */
}
- pv->count_frames_max = duration * job->vrate / job->vrate_base / 90000;
+ pv->count_frames_max = duration * title->rate / title->rate_base / 90000;
}
hb_log( "sync: expecting %d video frames", pv->count_frames_max );
* as if it started at zero so that our audio timing will
* be in sync.
*/
- hb_log( "sync: first pts is %lld", cur->start );
+ hb_log( "sync: first pts is %"PRId64, cur->start );
cur->start = 0;
}
}
if ( pv->first_drop )
{
hb_log( "sync: video time didn't advance - dropped %d frames "
- "(delta %d ms, current %lld, next %lld, dur %d)",
+ "(delta %d ms, current %"PRId64", next %"PRId64", dur %d)",
pv->drop_count, (int)( cur->start - pv->first_drop ) / 90,
cur->start, next->start, (int)( next->start - cur->start ) );
pv->first_drop = 0;
* Rewrite timestamps on subtitles that need it (on raw queue).
*/
if( subtitle->source == CC608SUB ||
- subtitle->source == CC708SUB )
+ subtitle->source == CC708SUB ||
+ subtitle->source == SRTSUB )
{
/*
* Rewrite timestamps on subtitles that came from Closed Captions
pts_skip = 0;
if ( duration <= 0 )
{
- hb_log( "sync: invalid video duration %lld, start %lld, next %lld",
+ hb_log( "sync: invalid video duration %"PRId64", start %"PRId64", next %"PRId64"",
duration, buf_tmp->start, next->start );
}
pv->count_frames, pv->busy );
return;
}
-
- /* Make sure we won't get more frames then expected */
- if( pv->count_frames >= pv->count_frames_max * 2)
- {
- hb_log( "sync: got too many frames (%d), exiting early",
- pv->count_frames );
-
- // Drop an empty buffer into our output to ensure that things
- // get flushed all the way out.
- hb_fifo_push( job->fifo_sync, hb_buffer_init( 0 ) );
- pv->busy &=~ 1;
- return;
- }
}
}
{
// we were dropping old data but input buf time is now current
hb_log( "sync: audio %d time went backwards %d ms, dropped %d frames "
- "(next %lld, current %lld)", i,
+ "(next %"PRId64", current %"PRId64")", i,
(int)( sync->next_pts - sync->first_drop ) / 90,
sync->drop_count, sync->first_drop, sync->next_pts );
sync->first_drop = 0;
// frame and this. assume we got a corrupted timestamp
// and just drop the next buf.
hb_log( "sync: %d minute time gap in audio %d - dropping buf"
- " start %lld, next %lld",
+ " start %"PRId64", next %"PRId64,
(int)((start - sync->next_pts) / (90000*60)),
i, start, sync->next_pts );
buf = hb_fifo_get( audio->priv.fifo_raw );
if( sync->audio->config.out.codec == HB_ACODEC_DCA )
{
hb_log( "sync: audio gap %d ms. Skipping frames. Audio %d"
- " start %lld, next %lld",
+ " start %"PRId64", next %"PRId64,
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
pv->audio_passthru_slip += (start - sync->next_pts);
return;
}
hb_log( "sync: adding %d ms of silence to audio %d"
- " start %lld, next %lld",
+ " start %"PRId64", next %"PRId64,
(int)((start - sync->next_pts) / 90),
i, start, sync->next_pts );
InsertSilence( w, i, start - sync->next_pts );