hb_subtitle_t * subtitle;
int64_t pts_offset;
int64_t pts_offset_old;
+ int64_t next_start;
int64_t count_frames;
int64_t count_frames_max;
int64_t video_sequence;
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
- if( job->acodec & HB_ACODEC_AC3 )
+ if( job->acodec & HB_ACODEC_AC3 ||
+ job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
{
free( pv->sync_audio[i].ac3_buf );
}
sync = &pv->sync_audio[i];
sync->audio = hb_list_item( title->list_audio, i );
- if( job->acodec & HB_ACODEC_AC3 )
+ if( job->acodec & HB_ACODEC_AC3 ||
+ job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
{
/* Have a silent AC-3 frame ready in case we have to fill a
gap */
/* Calculate new offset */
pv->pts_offset_old = pv->pts_offset;
- pv->pts_offset = cur->start -
- pv->count_frames * pv->job->vrate_base / 300;
+ if ( job->vfr )
+ {
+ pv->pts_offset = cur->start - pv->next_start;
+ } else {
+ pv->pts_offset = cur->start -
+ pv->count_frames * pv->job->vrate_base / 300;
+ }
if( !pv->discontinuity )
{
}
}
- /* The PTS of the frame we are expecting now */
- pts_expected = pv->pts_offset +
- pv->count_frames * pv->job->vrate_base / 300;
-
- //hb_log("Video expecting PTS %lld, current frame: %lld, next frame: %lld, cf: %lld",
- // pts_expected, cur->start, next->start, pv->count_frames * pv->job->vrate_base / 300 );
-
- if( cur->start < pts_expected - pv->job->vrate_base / 300 / 2 &&
- next->start < pts_expected + pv->job->vrate_base / 300 / 2 )
+ if ( job->vfr )
{
- /* The current frame is too old but the next one matches,
- let's trash */
- /* Also, make sure we don't trash a chapter break */
- chap_break = cur->new_chap;
- hb_buffer_close( &cur );
+ /*
+ * adjust the pts of the current frame so that it's contiguous
+ * with the previous frame. pts_offset tracks the time difference
+ * between the pts values in the input content (which start at some
+ * random time) and our timestamps (which start at zero). We don't
+ * make any adjustments to the source timestamps other than removing
+ * the clock offsets (which also removes pts discontinuities).
+ * This means we automatically encode at the source's frame rate.
+ * MP2 uses an implicit duration (frames end when the next frame
+ * starts) but more advanced containers like MP4 use an explicit
+ * duration. Since we're looking ahead one frame we set the
+ * explicit stop time from the start time of the next frame.
+ */
+ buf_tmp = cur;
pv->cur = cur = hb_fifo_get( job->fifo_raw );
- cur->new_chap |= chap_break; // Make sure we don't stomp the existing one.
-
- continue;
- }
-
- if( next->start > pts_expected + 3 * pv->job->vrate_base / 300 / 2 )
- {
- /* We'll need the current frame more than one time. Make a
- copy of it and keep it */
- buf_tmp = hb_buffer_init( cur->size );
- memcpy( buf_tmp->data, cur->data, cur->size );
- buf_tmp->sequence = cur->sequence;
+ buf_tmp->start = pv->next_start;
+ pv->next_start = next->start - pv->pts_offset;
+ buf_tmp->stop = pv->next_start;
}
else
{
- /* The frame has the expected date and won't have to be
- duplicated, just put it through */
- buf_tmp = cur;
- pv->cur = cur = hb_fifo_get( job->fifo_raw );
+ /* The PTS of the frame we are expecting now */
+ pts_expected = pv->pts_offset +
+ pv->count_frames * pv->job->vrate_base / 300;
+
+ //hb_log("Video expecting PTS %lld, current frame: %lld, next frame: %lld, cf: %lld",
+ // pts_expected, cur->start, next->start, pv->count_frames * pv->job->vrate_base / 300 );
+
+ if( cur->start < pts_expected - pv->job->vrate_base / 300 / 2 &&
+ next->start < pts_expected + pv->job->vrate_base / 300 / 2 )
+ {
+ /* The current frame is too old but the next one matches,
+ let's trash */
+ /* Also, make sure we don't trash a chapter break */
+ chap_break = cur->new_chap;
+ hb_buffer_close( &cur );
+ pv->cur = cur = hb_fifo_get( job->fifo_raw );
+ cur->new_chap |= chap_break; // Make sure we don't stomp the existing one.
+
+ continue;
+ }
+
+ if( next->start > pts_expected + 3 * pv->job->vrate_base / 300 / 2 )
+ {
+ /* We'll need the current frame more than one time. Make a
+ copy of it and keep it */
+ buf_tmp = hb_buffer_init( cur->size );
+ memcpy( buf_tmp->data, cur->data, cur->size );
+ buf_tmp->sequence = cur->sequence;
+ }
+ else
+ {
+ /* The frame has the expected date and won't have to be
+ duplicated, just put it through */
+ buf_tmp = cur;
+ pv->cur = cur = hb_fifo_get( job->fifo_raw );
+ }
+
+ /* Replace those MPEG-2 dates with our dates */
+ buf_tmp->start = (uint64_t) pv->count_frames *
+ pv->job->vrate_base / 300;
+ buf_tmp->stop = (uint64_t) ( pv->count_frames + 1 ) *
+ pv->job->vrate_base / 300;
}
-
- /* Replace those MPEG-2 dates with our dates */
- buf_tmp->start = (uint64_t) pv->count_frames *
- pv->job->vrate_base / 300;
- buf_tmp->stop = (uint64_t) ( pv->count_frames + 1 ) *
- pv->job->vrate_base / 300;
/* If we have a subtitle for this picture, copy it */
/* FIXME: we should avoid this memcpy */
UpdateState( w );
/* Make sure we won't get more frames then expected */
- if( pv->count_frames >= pv->count_frames_max )
+ if( pv->count_frames >= pv->count_frames_max * 2)
{
- hb_log( "sync: got %lld frames", pv->count_frames );
+ hb_log( "sync: got too many frames (%lld), exiting early", pv->count_frames );
pv->done = 1;
// Drop an empty buffer into our output to ensure that things
sync = &pv->sync_audio[i];
audio = sync->audio;
- if( job->acodec & HB_ACODEC_AC3 )
+ if( job->acodec & HB_ACODEC_AC3 ||
+ job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
{
fifo = audio->fifo_out;
rate = audio->rate;
}
}
- if( job->acodec & HB_ACODEC_AC3 )
+ if( job->acodec & HB_ACODEC_AC3 ||
+ job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
{
buf = hb_fifo_get( audio->fifo_raw );
buf->start = start;
/*
* Trash the top audio packet to avoid dead lock as we reconverge.
*/
- buf = hb_fifo_get( audio->fifo_raw );
- hb_buffer_close( &buf );
+ if ( (buf = hb_fifo_get( audio->fifo_raw ) ) != NULL)
+ hb_buffer_close( &buf );
}
if( NeedSilence( w, audio ) )
job = pv->job;
sync = &pv->sync_audio[i];
- if( job->acodec & HB_ACODEC_AC3 )
+ if( job->acodec & HB_ACODEC_AC3 ||
+ job->audio_mixdowns[i] == HB_AMIXDOWN_AC3 )
{
buf = hb_buffer_init( sync->ac3_size );
buf->start = sync->count_frames * 90000 / sync->audio->rate;
OSDN Git Service
