X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fsync.c;h=c391945b0483176230f6db565de9a1d7ad1a172c;hb=f9341345b37e0738a140423297c222a7e40eddab;hp=f51e0e130ae40a05fadfa91094f52e9f6aff1ce4;hpb=108ac124c68aeaaa641a973042bb0c8ddcc2828f;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/sync.c b/libhb/sync.c index f51e0e13..c391945b 100644 --- a/libhb/sync.c +++ b/libhb/sync.c @@ -5,10 +5,9 @@ It may be used under the terms of the GNU General Public License. */ #include "hb.h" +#include "hbffmpeg.h" #include - #include "samplerate.h" -#include "libavcodec/avcodec.h" #ifdef INT64_MIN #undef INT64_MIN /* Because it isn't defined correctly in Zeta */ @@ -23,7 +22,6 @@ typedef struct int64_t next_start; /* start time of next output frame */ int64_t next_pts; /* start time of next input frame */ - int64_t start_silence; /* if we're inserting silence, the time we started */ int64_t first_drop; /* PTS of first 'went backwards' frame dropped */ int drop_count; /* count of 'time went backwards' drops */ @@ -40,8 +38,11 @@ typedef struct struct hb_work_private_s { hb_job_t * job; - int done; - + int busy; // bitmask with one bit for each active input + // (bit 0 = video; 1 = audio 0, 2 = audio 1, ... + // appropriate bit is cleared when input gets + // an eof buf. syncWork returns done when all + // bits are clear. /* Video */ hb_subtitle_t * subtitle; int64_t pts_offset; @@ -70,9 +71,8 @@ struct hb_work_private_s * Local prototypes **********************************************************************/ static void InitAudio( hb_work_object_t * w, int i ); -static int SyncVideo( hb_work_object_t * w ); +static void SyncVideo( hb_work_object_t * w ); static void SyncAudio( hb_work_object_t * w, int i ); -static int NeedSilence( hb_work_object_t * w, hb_audio_t *, int i ); static void InsertSilence( hb_work_object_t * w, int i, int64_t d ); static void UpdateState( hb_work_object_t * w ); @@ -94,32 +94,41 @@ int syncInit( hb_work_object_t * w, hb_job_t * job ) pv->job = job; pv->pts_offset = INT64_MIN; - pv->count_frames = 0; /* Calculate how many video frames we are expecting */ - duration = 0; - for( i = job->chapter_start; i <= job->chapter_end; i++ ) + if (job->pts_to_stop) { - chapter = hb_list_item( title->list_chapter, i - 1 ); - duration += chapter->duration; + duration = job->pts_to_stop + 90000; } - duration += 90000; + 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 * job->vrate / job->vrate_base / 90000; hb_log( "sync: expecting %d video frames", pv->count_frames_max ); + pv->busy |= 1; /* Initialize libsamplerate for every audio track we have */ - for( i = 0; i < hb_list_count( title->list_audio ); i++ ) + if ( ! job->indepth_scan ) { - InitAudio( w, i ); + for( i = 0; i < hb_list_count( title->list_audio ); i++ ) + { + pv->busy |= ( 1 << (i + 1) ); + InitAudio( w, i ); + } } /* Get subtitle info, if any */ pv->subtitle = hb_list_item( title->list_subtitle, 0 ); - pv->video_sequence = 0; - return 0; } @@ -151,13 +160,6 @@ void syncClose( hb_work_object_t * w ) for( i = 0; i < hb_list_count( title->list_audio ); i++ ) { - if ( pv->sync_audio[i].start_silence ) - { - hb_log( "sync: added %d ms of silence to audio %d", - (int)((pv->sync_audio[i].next_pts - - pv->sync_audio[i].start_silence) / 90), i ); - } - audio = hb_list_item( title->list_audio, i ); if( audio->config.out.codec == HB_ACODEC_AC3 ) { @@ -189,17 +191,16 @@ int syncWork( hb_work_object_t * w, hb_buffer_t ** unused1, hb_work_private_t * pv = w->private_data; int i; - /* If we ever got a video frame, handle audio now */ - if( pv->pts_offset != INT64_MIN ) + if ( pv->busy & 1 ) + SyncVideo( w ); + + for( i = 0; i < hb_list_count( pv->job->title->list_audio ); i++ ) { - for( i = 0; i < hb_list_count( pv->job->title->list_audio ); i++ ) - { + if ( pv->busy & ( 1 << (i + 1) ) ) SyncAudio( w, i ); - } } - /* Handle video */ - return SyncVideo( w ); + return ( pv->busy? HB_WORK_OK : HB_WORK_DONE ); } hb_work_object_t hb_sync = @@ -236,7 +237,7 @@ static void InitAudio( hb_work_object_t * w, int i ) c->sample_rate = sync->audio->config.in.samplerate; c->channels = HB_INPUT_CH_LAYOUT_GET_DISCRETE_COUNT( sync->audio->config.in.channel_layout ); - if( avcodec_open( c, codec ) < 0 ) + if( hb_avcodec_open( c, codec ) < 0 ) { hb_log( "sync: avcodec_open failed" ); return; @@ -255,7 +256,7 @@ static void InitAudio( hb_work_object_t * w, int i ) } free( zeros ); - avcodec_close( c ); + hb_avcodec_close( c ); av_free( c ); } else @@ -272,29 +273,24 @@ static void InitAudio( hb_work_object_t * w, int i ) *********************************************************************** * **********************************************************************/ -static int SyncVideo( hb_work_object_t * w ) +static void SyncVideo( hb_work_object_t * w ) { hb_work_private_t * pv = w->private_data; hb_buffer_t * cur, * next, * sub = NULL; hb_job_t * job = pv->job; - if( pv->done ) - { - return HB_WORK_DONE; - } - if( !pv->cur && !( pv->cur = hb_fifo_get( job->fifo_raw ) ) ) { /* We haven't even got a frame yet */ - return HB_WORK_OK; + return; } cur = pv->cur; if( cur->size == 0 ) { /* we got an end-of-stream. Feed it downstream & signal that we're done. */ hb_fifo_push( job->fifo_sync, hb_buffer_init( 0 ) ); - pv->done = 1; - return HB_WORK_DONE; + pv->busy &=~ 1; + return; } /* At this point we have a frame to process. Let's check @@ -313,8 +309,8 @@ static int SyncVideo( hb_work_object_t * w ) * video (we don't know its duration). On DVDs the final frame * is often strange and dropping it seems to be a good idea. */ hb_fifo_push( job->fifo_sync, hb_buffer_init( 0 ) ); - pv->done = 1; - return HB_WORK_DONE; + pv->busy &=~ 1; + return; } if( pv->pts_offset == INT64_MIN ) { @@ -335,6 +331,10 @@ static int SyncVideo( hb_work_object_t * w ) } } + if( cur->new_chap ) { + hb_log("sync got new chapter %d", cur->new_chap ); + } + /* * since the first frame is always 0 and the upstream reader code * is taking care of adjusting for pts discontinuities, we just have @@ -627,15 +627,14 @@ static int SyncVideo( hb_work_object_t * w ) { hb_log( "sync: got too many frames (%d), exiting early", pv->count_frames ); - pv->done = 1; // 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 ) ); - return HB_WORK_DONE; + pv->busy &=~ 1; + return; } } - return HB_WORK_OK; } static void OutputAudioFrame( hb_job_t *job, hb_audio_t *audio, hb_buffer_t *buf, @@ -727,6 +726,14 @@ static void SyncAudio( hb_work_object_t * w, int i ) while( !hb_fifo_is_full( fifo ) && ( buf = hb_fifo_see( audio->priv.fifo_raw ) ) ) { + /* if the next buffer is an eof send it downstream */ + if ( buf->size <= 0 ) + { + buf = hb_fifo_get( audio->priv.fifo_raw ); + hb_fifo_push( fifo, buf ); + pv->busy &=~ (1 << (i + 1) ); + return; + } if ( (int64_t)( buf->start - sync->next_pts ) < 0 ) { // audio time went backwards. @@ -760,6 +767,19 @@ static void SyncAudio( hb_work_object_t * w, int i ) } if ( buf->start - sync->next_pts >= (90 * 70) ) { + if ( buf->start - sync->next_pts > (90000LL * 60) ) + { + // there's a gap of more than a minute between the last + // 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", + (int)((buf->start - sync->next_pts) / (90000*60)), + i, buf->start, sync->next_pts ); + buf = hb_fifo_get( audio->priv.fifo_raw ); + hb_buffer_close( &buf ); + continue; + } /* * there's a gap of at least 70ms between the last * frame we processed & the next. Fill it with silence. @@ -780,43 +800,6 @@ static void SyncAudio( hb_work_object_t * w, int i ) buf = hb_fifo_get( audio->priv.fifo_raw ); OutputAudioFrame( job, audio, buf, sync, fifo, i ); } - - if( NeedSilence( w, audio, i ) ) - { - InsertSilence( w, i, (90000 * AC3_SAMPLES_PER_FRAME) / - sync->audio->config.in.samplerate ); - } -} - -static int NeedSilence( hb_work_object_t * w, hb_audio_t * audio, int i ) -{ - hb_work_private_t * pv = w->private_data; - hb_job_t * job = pv->job; - hb_sync_audio_t * sync = &pv->sync_audio[i]; - - if( hb_fifo_size( audio->priv.fifo_in ) || - hb_fifo_size( audio->priv.fifo_raw ) || - hb_fifo_size( audio->priv.fifo_sync ) || - hb_fifo_size( audio->priv.fifo_out ) ) - { - /* We have some audio, we are fine */ - return 0; - } - - /* No audio left in fifos */ - - if( hb_thread_has_exited( job->reader ) ) - { - /* We might miss some audio to complete encoding and muxing - the video track */ - if ( sync->start_silence == 0 ) - { - hb_log("sync: reader has exited, adding silence to audio %d", i); - sync->start_silence = sync->next_pts; - } - return 1; - } - return 0; } static void InsertSilence( hb_work_object_t * w, int i, int64_t duration )