/* Audio */
hb_sync_audio_t sync_audio[8];
int64_t audio_passthru_slip;
+ int64_t video_pts_slip;
/* Statistics */
uint64_t st_counts[4];
pv->job = job;
pv->pts_offset = INT64_MIN;
- /* Calculate how many video frames we are expecting */
- if (job->pts_to_stop)
+ if( job->pass == 2 )
{
- duration = job->pts_to_stop + 90000;
- }
- else if( job->frame_to_stop )
- {
- /* Set the duration to a rough estimate */
- duration = ( job->frame_to_stop / ( job->vrate / job->vrate_base ) ) * 90000;
+ /* We already have an accurate frame count from pass 1 */
+ hb_interjob_t * interjob = hb_interjob_get( job->h );
+ pv->count_frames_max = interjob->frame_count;
}
else
{
- duration = 0;
- for( i = job->chapter_start; i <= job->chapter_end; i++ )
+ /* Calculate how many video frames we are expecting */
+ if ( job->pts_to_stop )
+ {
+ duration = job->pts_to_stop + 90000;
+ }
+ else if( job->frame_to_stop )
{
- chapter = hb_list_item( title->list_chapter, i - 1 );
- duration += chapter->duration;
+ /* Set the duration to a rough estimate */
+ duration = ( job->frame_to_stop / ( title->rate / title->rate_base ) ) * 90000;
}
- duration += 90000;
- /* 1 second safety so we're sure we won't miss anything */
+ else
+ {
+ duration = 0;
+ for( i = job->chapter_start; i <= job->chapter_end; i++ )
+ {
+ chapter = hb_list_item( title->list_chapter, i - 1 );
+ duration += chapter->duration;
+ }
+ duration += 90000;
+ /* 1 second safety so we're sure we won't miss anything */
+ }
+ pv->count_frames_max = duration * title->rate / title->rate_base / 90000;
}
- pv->count_frames_max = duration * job->vrate / job->vrate_base / 90000;
hb_log( "sync: expecting %d video frames", pv->count_frames_max );
pv->busy |= 1;
hb_log( "sync: got %d frames, %d expected",
pv->count_frames, pv->count_frames_max );
+ /* save data for second pass */
+ if( job->pass == 1 )
+ {
+ /* Preserve frame count for better accuracy in pass 2 */
+ hb_interjob_t * interjob = hb_interjob_get( job->h );
+ interjob->frame_count = pv->count_frames;
+ interjob->last_job = job->sequence_id;
+ interjob->total_time = pv->next_start;
+ }
+
if (pv->drops || pv->dups )
{
hb_log( "sync: %d frames dropped, %d duplicated", pv->drops, pv->dups );
hb_job_t * job = pv->job;
hb_subtitle_t *subtitle;
int i;
+ int64_t pts_skip;
if( !pv->cur && !( pv->cur = hb_fifo_get( job->fifo_raw ) ) )
{
return;
}
cur = pv->cur;
+ pts_skip = 0;
if( cur->size == 0 )
{
/* we got an end-of-stream. Feed it downstream & signal that we're done. */
for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
{
subtitle = hb_list_item( job->list_subtitle, i );
- if( subtitle->dest == PASSTHRUSUB )
+ if( subtitle->config.dest == PASSTHRUSUB )
{
hb_fifo_push( subtitle->fifo_out, hb_buffer_init( 0 ) );
}
for( i = 0; i < hb_list_count( job->list_subtitle ); i++)
{
subtitle = hb_list_item( job->list_subtitle, i );
- if( subtitle->dest == PASSTHRUSUB )
+ if( subtitle->config.dest == PASSTHRUSUB )
{
hb_fifo_push( subtitle->fifo_out, hb_buffer_init( 0 ) );
}
* 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;
}
}
* can deal with overlaps of up to a frame time but anything larger
* we handle by dropping frames here.
*/
- if ( (int64_t)( next->start - cur->start ) <= 0 ||
- (int64_t)( (cur->start - pv->audio_passthru_slip ) - pv->next_pts ) < 0 )
+ if ( (int64_t)( next->start - pv->video_pts_slip - cur->start ) <= 0 )
{
if ( pv->first_drop == 0 )
{
pv->first_drop = next->start;
}
++pv->drop_count;
+ if (next->start - cur->start > 0)
+ {
+ pts_skip += next->start - cur->start;
+ pv->video_pts_slip -= next->start - cur->start;
+ }
buf_tmp = hb_fifo_get( job->fifo_raw );
if ( buf_tmp->new_chap )
{
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
when the second one starts */
sub2 = hb_fifo_see2( subtitle->fifo_raw );
if( sub2 && sub->stop > sub2->start )
+ {
sub->stop = sub2->start;
+ }
// hb_log("0x%x: video seq: %lld subtitle sequence: %lld",
// sub, cur->sequence, sub->sequence);
* and we'll deal with it in the next block of
* code.
*/
- break;
- }
-
- /*
- * The subtitle is older than this picture, trash it
- */
- sub = hb_fifo_get( subtitle->fifo_raw );
- hb_buffer_close( &sub );
- }
-
- if( sub && sub->size == 0 )
- {
- /*
- * Continue immediately on subtitle EOF
- */
- break;
- }
- /*
- * There is a valid subtitle, is it time to display it?
- */
- if( sub )
- {
- if( sub->stop > sub->start)
- {
/*
- * Normal subtitle which ends after it starts, check to
- * see that the current video is between the start and end.
+ * There is a valid subtitle, is it time to display it?
*/
- if( cur->start > sub->start &&
- cur->start < sub->stop )
+ if( sub->stop > sub->start)
{
/*
- * We should be playing this, so leave the
- * subtitle in place.
- *
- * fall through to display
+ * Normal subtitle which ends after it starts,
+ * check to see that the current video is between
+ * the start and end.
*/
- if( ( sub->stop - sub->start ) < ( 3 * 90000 ) )
+ if( cur->start > sub->start &&
+ cur->start < sub->stop )
{
/*
- * Subtitle is on for less than three seconds, extend
- * the time that it is displayed to make it easier
- * to read. Make it 3 seconds or until the next
- * subtitle is displayed.
- *
- * This is in response to Indochine which only
- * displays subs for 1 second - too fast to read.
- */
- sub->stop = sub->start + ( 3 * 90000 );
+ * We should be playing this, so leave the
+ * subtitle in place.
+ *
+ * fall through to display
+ */
+ if( ( sub->stop - sub->start ) < ( 2 * 90000 ) )
+ {
+ /*
+ * Subtitle is on for less than three
+ * seconds, extend the time that it is
+ * displayed to make it easier to read.
+ * Make it 3 seconds or until the next
+ * subtitle is displayed.
+ *
+ * This is in response to Indochine which
+ * only displays subs for 1 second -
+ * too fast to read.
+ */
+ sub->stop = sub->start + ( 2 * 90000 );
- sub2 = hb_fifo_see2( subtitle->fifo_raw );
+ sub2 = hb_fifo_see2( subtitle->fifo_raw );
- if( sub2 && sub->stop > sub2->start )
- {
- sub->stop = sub2->start;
+ if( sub2 && sub->stop > sub2->start )
+ {
+ sub->stop = sub2->start;
+ }
}
}
+ else
+ {
+ /*
+ * Defer until the play point is within
+ * the subtitle
+ */
+ sub = NULL;
+ }
}
else
{
/*
- * Defer until the play point is within the subtitle
+ * The end of the subtitle is less than the start,
+ * this is a sign of a PTS discontinuity.
*/
- sub = NULL;
+ if( sub->start > cur->start )
+ {
+ /*
+ * we haven't reached the start time yet, or
+ * we have jumped backwards after having
+ * already started this subtitle.
+ */
+ if( cur->start < sub->stop )
+ {
+ /*
+ * We have jumped backwards and so should
+ * continue displaying this subtitle.
+ *
+ * fall through to display.
+ */
+ }
+ else
+ {
+ /*
+ * Defer until the play point is
+ * within the subtitle
+ */
+ sub = NULL;
+ }
+ } else {
+ /*
+ * Play this subtitle as the start is
+ * greater than our video point.
+ *
+ * fall through to display/
+ */
+ }
}
+ break;
}
else
{
+
/*
- * The end of the subtitle is less than the start, this is a
- * sign of a PTS discontinuity.
+ * The subtitle is older than this picture, trash it
*/
- if( sub->start > cur->start )
+ sub = hb_fifo_get( subtitle->fifo_raw );
+ hb_buffer_close( &sub );
+ }
+ }
+
+ /* If we have a subtitle for this picture, copy it */
+ /* FIXME: we should avoid this memcpy */
+ if( sub )
+ {
+ if( sub->size > 0 )
+ {
+ if( subtitle->config.dest == RENDERSUB )
{
- /*
- * we haven't reached the start time yet, or
- * we have jumped backwards after having
- * already started this subtitle.
- */
- if( cur->start < sub->stop )
- {
- /*
- * We have jumped backwards and so should
- * continue displaying this subtitle.
- *
- * fall through to display.
- */
- }
- else
+ if ( cur->sub == NULL )
{
/*
- * Defer until the play point is within the subtitle
+ * Tack onto the video buffer for rendering
*/
- sub = NULL;
+ cur->sub = hb_buffer_init( sub->size );
+ cur->sub->x = sub->x;
+ cur->sub->y = sub->y;
+ cur->sub->width = sub->width;
+ cur->sub->height = sub->height;
+ memcpy( cur->sub->data, sub->data, sub->size );
}
} else {
/*
- * Play this subtitle as the start is greater than our
- * video point.
- *
- * fall through to display/
+ * Pass-Through, pop it off of the raw queue,
+ * rewrite times and make it available to be
+ * reencoded.
*/
+ uint64_t sub_duration;
+ sub = hb_fifo_get( subtitle->fifo_raw );
+ sub_duration = sub->stop - sub->start;
+ sub->start = cur->start;
+ buf_tmp = hb_fifo_see( job->fifo_raw );
+ int64_t duration = buf_tmp->start - cur->start;
+ sub->stop = sub->start + duration;
+ hb_fifo_push( subtitle->fifo_sync, sub );
+ }
+ } else {
+ /*
+ * EOF - consume for rendered, else pass through
+ */
+ if( subtitle->config.dest == RENDERSUB )
+ {
+ sub = hb_fifo_get( subtitle->fifo_raw );
+ hb_buffer_close( &sub );
+ } else {
+ sub = hb_fifo_get( subtitle->fifo_raw );
+ hb_fifo_push( subtitle->fifo_out, sub );
}
}
}
}
- if( sub )
- {
- /*
- * Got a sub to display...
- */
- break;
- }
} // end subtitles
/*
*/
buf_tmp = cur;
pv->cur = cur = hb_fifo_get( job->fifo_raw );
+ cur->sub = NULL;
pv->next_pts = cur->start;
- int64_t duration = cur->start - buf_tmp->start;
+ int64_t duration = cur->start - pts_skip - buf_tmp->start;
+ 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->chap_mark = 0;
}
- /* If we have a subtitle for this picture, copy it */
- /* FIXME: we should avoid this memcpy */
- if( sub && subtitle &&
- subtitle->format == PICTURESUB )
- {
- if( sub->size > 0 )
- {
- if( subtitle->dest == RENDERSUB )
- {
- /*
- * Tack onto the video buffer for rendering
- */
- buf_tmp->sub = hb_buffer_init( sub->size );
- buf_tmp->sub->x = sub->x;
- buf_tmp->sub->y = sub->y;
- buf_tmp->sub->width = sub->width;
- buf_tmp->sub->height = sub->height;
- memcpy( buf_tmp->sub->data, sub->data, sub->size );
- } else {
- /*
- * Pass-Through, pop it off of the raw queue, rewrite times and
- * make it available to be reencoded.
- */
- uint64_t sub_duration;
- sub = hb_fifo_get( subtitle->fifo_raw );
- sub_duration = sub->stop - sub->start;
- sub->start = buf_tmp->start;
- sub->stop = sub->start + duration;
- hb_fifo_push( subtitle->fifo_sync, sub );
- }
- } else {
- /*
- * EOF - consume for rendered, else pass through
- */
- if( subtitle->dest == RENDERSUB )
- {
- sub = hb_fifo_get( subtitle->fifo_raw );
- hb_buffer_close( &sub );
- } else {
- sub = hb_fifo_get( subtitle->fifo_raw );
- hb_fifo_push( subtitle->fifo_out, sub );
- }
- }
- }
-
/* Push the frame to the renderer */
hb_fifo_push( job->fifo_sync, buf_tmp );
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);
+ pv->video_pts_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 );
OSDN Git Service
