X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Freader.c;h=f6c334172b6063379740b794dcf74eeabae6c754;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=75fd1b4faa5c467312528a0232c060add583d14b;hpb=4fae808911f8c7806bd007b84157e1ad586746ff;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/reader.c b/libhb/reader.c index 75fd1b4f..f6c33417 100644 --- a/libhb/reader.c +++ b/libhb/reader.c @@ -8,9 +8,11 @@ typedef struct { - int64_t last; // last timestamp seen on this stream double average; // average time between packets + int64_t last; // last timestamp seen on this stream int id; // stream id + int is_audio; // != 0 if this is an audio stream + int valid; // Stream timing is not valid until next scr. } stream_timing_t; typedef struct @@ -19,6 +21,7 @@ typedef struct hb_title_t * title; volatile int * die; + hb_bd_t * bd; hb_dvd_t * dvd; hb_stream_t * stream; @@ -26,9 +29,13 @@ typedef struct int64_t scr_offset; hb_psdemux_t demux; int scr_changes; - uint sequence; - int saw_video; - int st_slots; // size (in slots) of stream_timing array + uint32_t sequence; + uint8_t st_slots; // size (in slots) of stream_timing array + uint8_t saw_video; // != 0 if we've seen video + uint8_t saw_audio; // != 0 if we've seen audio + + int start_found; // found pts_to_start point + uint64_t st_first; } hb_reader_t; /*********************************************************************** @@ -36,6 +43,7 @@ typedef struct **********************************************************************/ static void ReaderFunc( void * ); static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id ); +static void UpdateState( hb_reader_t * r, int64_t start); /*********************************************************************** * hb_reader_init @@ -59,23 +67,41 @@ hb_thread_t * hb_reader_init( hb_job_t * job ) r->stream_timing[0].average = 90000. * (double)job->vrate_base / (double)job->vrate; r->stream_timing[0].last = -r->stream_timing[0].average; + r->stream_timing[0].valid = 1; r->stream_timing[1].id = -1; + if ( !job->pts_to_start ) + r->start_found = 1; + return hb_thread_init( "reader", ReaderFunc, r, HB_NORMAL_PRIORITY ); } static void push_buf( const hb_reader_t *r, hb_fifo_t *fifo, hb_buffer_t *buf ) { - while( !*r->die && !r->job->done && hb_fifo_is_full( fifo ) ) + while ( !*r->die && !r->job->done ) { - /* - * Loop until the incoming fifo is ready to receive - * this buffer. - */ - hb_snooze( 50 ); + if ( hb_fifo_full_wait( fifo ) ) + { + hb_fifo_push( fifo, buf ); + break; + } + } +} + +static int is_audio( hb_reader_t *r, int id ) +{ + int i; + hb_audio_t *audio; + + for( i = 0; ( audio = hb_list_item( r->title->list_audio, i ) ); ++i ) + { + if ( audio->id == id ) + { + return 1; + } } - hb_fifo_push( fifo, buf ); + return 0; } // The MPEG STD (Standard Target Decoder) essentially requires that we keep @@ -101,7 +127,7 @@ static stream_timing_t *find_st( hb_reader_t *r, const hb_buffer_t *buf ) // find or create the per-stream timing state for 'buf' -static stream_timing_t *id_to_st( hb_reader_t *r, const hb_buffer_t *buf ) +static stream_timing_t *id_to_st( hb_reader_t *r, const hb_buffer_t *buf, int valid ) { stream_timing_t *st = r->stream_timing; while ( st->id != buf->id && st->id != -1) @@ -124,9 +150,13 @@ static stream_timing_t *id_to_st( hb_reader_t *r, const hb_buffer_t *buf ) } st->id = buf->id; st->average = 30.*90.; - st->last = buf->renderOffset - st->average; - + st->last = -st->average; + if ( ( st->is_audio = is_audio( r, buf->id ) ) != 0 ) + { + r->saw_audio = 1; + } st[1].id = -1; + st->valid = valid; } return st; } @@ -136,10 +166,15 @@ static stream_timing_t *id_to_st( hb_reader_t *r, const hb_buffer_t *buf ) static void update_ipt( hb_reader_t *r, const hb_buffer_t *buf ) { - stream_timing_t *st = id_to_st( r, buf ); + stream_timing_t *st = id_to_st( r, buf, 1 ); double dt = buf->renderOffset - st->last; - st->average += ( dt - st->average ) * (1./16.); - st->last = buf->renderOffset; + // Protect against spurious bad timestamps + if ( dt > -5 * 90000LL && dt < 5 * 90000LL ) + { + st->average += ( dt - st->average ) * (1./32.); + st->last = buf->renderOffset; + } + st->valid = 1; } // use the per-stream state associated with 'buf' to compute a new scr_offset @@ -148,12 +183,27 @@ static void update_ipt( hb_reader_t *r, const hb_buffer_t *buf ) static void new_scr_offset( hb_reader_t *r, hb_buffer_t *buf ) { - stream_timing_t *st = id_to_st( r, buf ); - int64_t nxt = st->last + st->average; + stream_timing_t *st = id_to_st( r, buf, 1 ); + int64_t last; + if ( !st->valid ) + { + // !valid means we've not received any previous data + // for this stream. There is no 'last' packet time. + // So approximate it with video's last time. + last = r->stream_timing[0].last; + st->valid = 1; + } + else + { + last = st->last; + } + int64_t nxt = last + st->average; r->scr_offset = buf->renderOffset - nxt; - buf->renderOffset = nxt; + // This log is handy when you need to debug timing problems... + //hb_log("id %x last %ld avg %g nxt %ld renderOffset %ld scr_offset %ld", + // buf->id, last, st->average, nxt, buf->renderOffset, r->scr_offset); r->scr_changes = r->demux.scr_changes; - st->last = buf->renderOffset; + st->last = nxt; } /*********************************************************************** @@ -171,51 +221,156 @@ static void ReaderFunc( void * _r ) int chapter = -1; int chapter_end = r->job->chapter_end; - if( !( r->dvd = hb_dvd_init( r->title->dvd ) ) ) + if ( r->title->type == HB_BD_TYPE ) { - if ( !( r->stream = hb_stream_open( r->title->dvd, r->title ) ) ) + if ( !( r->bd = hb_bd_init( r->title->path ) ) ) + return; + } + else if ( r->title->type == HB_DVD_TYPE ) + { + if ( !( r->dvd = hb_dvd_init( r->title->path ) ) ) + return; + } + else if ( r->title->type == HB_STREAM_TYPE ) + { + if ( !( r->stream = hb_stream_open( r->title->path, r->title ) ) ) + return; + } + else + { + // Unknown type, should never happen + return; + } + + hb_buffer_t *ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE ); + if (r->bd) + { + if( !hb_bd_start( r->bd, r->title ) ) + { + hb_bd_close( &r->bd ); + hb_buffer_close( &ps ); + return; + } + if ( r->job->start_at_preview ) { - return; + // XXX code from DecodePreviews - should go into its own routine + hb_bd_seek( r->bd, (float)r->job->start_at_preview / + ( r->job->seek_points ? ( r->job->seek_points + 1.0 ) : 11.0 ) ); + } + else if ( r->job->pts_to_start ) + { + hb_bd_seek_pts( r->bd, r->job->pts_to_start ); + } + else + { + hb_bd_seek_chapter( r->bd, r->job->chapter_start ); + } + if (r->job->angle > 1) + { + hb_bd_set_angle( r->bd, r->job->angle - 1 ); + } + } + else if (r->dvd) + { + /* + * XXX this code is a temporary hack that should go away if/when + * chapter merging goes away in libhb/dvd.c + * map the start and end chapter numbers to on-media chapter + * numbers since chapter merging could cause the handbrake numbers + * to diverge from the media numbers and, if our chapter_end is after + * a media chapter that got merged, we'll stop ripping too early. + */ + int start = r->job->chapter_start; + hb_chapter_t *chap = hb_list_item( r->title->list_chapter, chapter_end - 1 ); + + chapter_end = chap->index; + if (start > 1) + { + chap = hb_list_item( r->title->list_chapter, start - 1 ); + start = chap->index; + } + /* end chapter mapping XXX */ + + if( !hb_dvd_start( r->dvd, r->title, start ) ) + { + hb_dvd_close( &r->dvd ); + hb_buffer_close( &ps ); + return; + } + if (r->job->angle) + { + hb_dvd_set_angle( r->dvd, r->job->angle ); + } + + if ( r->job->start_at_preview ) + { + // XXX code from DecodePreviews - should go into its own routine + hb_dvd_seek( r->dvd, (float)r->job->start_at_preview / + ( r->job->seek_points ? ( r->job->seek_points + 1.0 ) : 11.0 ) ); } } + else if ( r->stream && r->job->start_at_preview ) + { + + // XXX code from DecodePreviews - should go into its own routine + hb_stream_seek( r->stream, (float)( r->job->start_at_preview - 1 ) / + ( r->job->seek_points ? ( r->job->seek_points + 1.0 ) : 11.0 ) ); - if (r->dvd) + } + else if ( r->stream && r->job->pts_to_start ) + { + int64_t pts_to_start = r->job->pts_to_start; + + // Find out what the first timestamp of the stream is + // and then seek to the appropriate offset from it + if ( hb_stream_read( r->stream, ps ) ) + { + if ( ps->start > 0 ) + pts_to_start += ps->start; + } + + if ( hb_stream_seek_ts( r->stream, pts_to_start ) >= 0 ) + { + // Seek takes us to the nearest I-frame before the timestamp + // that we want. So we will retrieve the start time of the + // first packet we get, subtract that from pts_to_start, and + // inspect the reset of the frames in sync. + r->start_found = 2; + r->job->pts_to_start = pts_to_start; + } + } + else if( r->stream ) { - /* - * XXX this code is a temporary hack that should go away if/when - * chapter merging goes away in libhb/dvd.c - * map the start and end chapter numbers to on-media chapter - * numbers since chapter merging could cause the handbrake numbers - * to diverge from the media numbers and, if our chapter_end is after - * a media chapter that got merged, we'll stop ripping too early. - */ - int start = r->job->chapter_start; - hb_chapter_t * chap = hb_list_item( r->title->list_chapter, chapter_end - 1 ); - - chapter_end = chap->index; - if (start > 1) - { - chap = hb_list_item( r->title->list_chapter, start - 1 ); - start = chap->index; - } - /* end chapter mapping XXX */ - - if( !hb_dvd_start( r->dvd, r->title->index, start ) ) - { - hb_dvd_close( &r->dvd ); - return; - } + /* + * Standard stream, seek to the starting chapter, if set, and track the + * end chapter so that we end at the right time. + */ + int start = r->job->chapter_start; + hb_chapter_t *chap = hb_list_item( r->title->list_chapter, chapter_end - 1 ); + + chapter_end = chap->index; + if (start > 1) + { + chap = hb_list_item( r->title->list_chapter, start - 1 ); + start = chap->index; + } + + /* + * Seek to the start chapter. + */ + hb_stream_seek_chapter( r->stream, start ); } list = hb_list_init(); - hb_buffer_t *ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE ); while( !*r->die && !r->job->done ) { - if (r->dvd) - chapter = hb_dvd_chapter( r->dvd ); + if (r->bd) + chapter = hb_bd_chapter( r->bd ); + else if (r->dvd) + chapter = hb_dvd_chapter( r->dvd ); else if (r->stream) - chapter = 1; + chapter = hb_stream_chapter( r->stream ); if( chapter < 0 ) { @@ -229,7 +384,14 @@ static void ReaderFunc( void * _r ) break; } - if (r->dvd) + if (r->bd) + { + if( !hb_bd_read( r->bd, ps ) ) + { + break; + } + } + else if (r->dvd) { if( !hb_dvd_read( r->dvd, ps ) ) { @@ -242,6 +404,17 @@ static void ReaderFunc( void * _r ) { break; } + if ( r->start_found == 2 ) + { + // We will inspect the timestamps of each frame in sync + // to skip from this seek point to the timestamp we + // want to start at. + if ( ps->start > 0 && ps->start < r->job->pts_to_start ) + r->job->pts_to_start -= ps->start; + else if ( ps->start >= r->job->pts_to_start ) + r->job->pts_to_start = 0; + r->start_found = 1; + } } if( r->job->indepth_scan ) @@ -266,29 +439,29 @@ static void ReaderFunc( void * _r ) hb_set_state( r->job->h, &state ); } - if ( r->title->demuxer == HB_NULL_DEMUXER ) - { - hb_demux_null( ps, list, &r->demux ); - } - else - { - hb_demux_ps( ps, list, &r->demux ); - } + (hb_demux[r->title->demuxer])( ps, list, &r->demux ); while( ( buf = hb_list_item( list, 0 ) ) ) { hb_list_rem( list, buf ); fifos = GetFifoForId( r->job, buf->id ); - if ( ! r->saw_video ) + if ( fifos && ! r->saw_video && !r->job->indepth_scan ) { - /* The first video packet defines 'time zero' so discard - data until we get a video packet with a PTS & DTS */ - if ( buf->id == r->title->video_id && buf->start != -1 && - buf->renderOffset != -1 ) + // The first data packet with a PTS from an audio or video stream + // that we're decoding defines 'time zero'. Discard packets until + // we get one. + if ( buf->start != -1 && buf->renderOffset != -1 && + ( buf->id == r->title->video_id || is_audio( r, buf->id ) ) ) { + // force a new scr offset computation + r->scr_changes = r->demux.scr_changes - 1; + // create a stream state if we don't have one so the + // offset will get computed correctly. + id_to_st( r, buf, 1 ); r->saw_video = 1; - hb_log( "reader: first SCR %lld", r->demux.last_scr ); + hb_log( "reader: first SCR %"PRId64" id %d DTS %"PRId64, + r->demux.last_scr, buf->id, buf->renderOffset ); } else { @@ -299,38 +472,92 @@ static void ReaderFunc( void * _r ) { if ( buf->renderOffset != -1 ) { - if ( r->scr_changes == r->demux.scr_changes ) - { - // This packet is referenced to the same SCR as the last. - // Adjust timestamp to remove the System Clock Reference - // offset then update the average inter-packet time - // for this stream. - buf->renderOffset -= r->scr_offset; - update_ipt( r, buf ); - } - else + if ( r->scr_changes != r->demux.scr_changes ) { // This is the first audio or video packet after an SCR // change. Compute a new scr offset that would make this - // packet follow the last of this stream with the correct - // average spacing. - if ( find_st( r, buf ) ) + // packet follow the last of this stream with the + // correct average spacing. + stream_timing_t *st = id_to_st( r, buf, 0 ); + + // if this is the video stream and we don't have + // audio yet or this is an audio stream + // generate a new scr + if ( st->is_audio || + ( st == r->stream_timing && !r->saw_audio ) ) { new_scr_offset( r, buf ); } else { - // we got a new scr at the same time as the first - // packet of a stream we've never seen before. We - // have no idea what the timing should be so toss - // this buffer & wait for a stream we've already seen. - hb_buffer_close( &buf ); - continue; + // defer the scr change until we get some + // audio since audio has a timestamp per + // frame but video & subtitles don't. Clear + // the timestamps so the decoder will generate + // them from the frame durations. + if ( st != r->stream_timing ) + { + // not a video stream so it's probably + // subtitles - the best we can do is to + // line it up with the last video packet. + buf->start = r->stream_timing->last; + } + else + { + buf->start = -1; + buf->renderOffset = -1; + } } } } if ( buf->start != -1 ) + { + int64_t start = buf->start - r->scr_offset; + if ( !r->start_found ) + UpdateState( r, start ); + + if ( !r->start_found && + r->job->pts_to_start && + buf->renderOffset != -1 && + start >= r->job->pts_to_start ) + { + // pts_to_start point found + // force a new scr offset computation + stream_timing_t *st = find_st( r, buf ); + if ( st && + (st->is_audio || + ( st == r->stream_timing && !r->saw_audio ) ) ) + { + // Re-zero our timestamps + st->last = -st->average; + new_scr_offset( r, buf ); + r->start_found = 1; + r->job->pts_to_start = 0; + } + } + // This log is handy when you need to debug timing problems + //hb_log("id %x scr_offset %ld start %ld --> %ld", + // buf->id, r->scr_offset, buf->start, + // buf->start - r->scr_offset); buf->start -= r->scr_offset; + } + if ( buf->renderOffset != -1 ) + { + if ( r->scr_changes == r->demux.scr_changes ) + { + // This packet is referenced to the same SCR as the last. + // Adjust timestamp to remove the System Clock Reference + // offset then update the average inter-packet time + // for this stream. + buf->renderOffset -= r->scr_offset; + update_ipt( r, buf ); + } + } + if ( !r->start_found ) + { + hb_buffer_close( &buf ); + continue; + } buf->sequence = r->sequence++; /* if there are mutiple output fifos, send a copy of the @@ -354,18 +581,33 @@ static void ReaderFunc( void * _r ) } // send empty buffers downstream to video & audio decoders to signal we're done. - push_buf( r, r->job->fifo_mpeg2, hb_buffer_init(0) ); - - hb_audio_t *audio; - for( n = 0; ( audio = hb_list_item( r->job->title->list_audio, n ) ); ++n ) + if( !*r->die && !r->job->done ) { - if ( audio->priv.fifo_in ) - push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) ); + push_buf( r, r->job->fifo_mpeg2, hb_buffer_init(0) ); + + hb_audio_t *audio; + for( n = 0; (audio = hb_list_item( r->job->title->list_audio, n)); ++n ) + { + if ( audio->priv.fifo_in ) + push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) ); + } + + hb_subtitle_t *subtitle; + for( n = 0; (subtitle = hb_list_item( r->job->title->list_subtitle, n)); ++n ) + { + if ( subtitle->fifo_in && subtitle->source == VOBSUB) + push_buf( r, subtitle->fifo_in, hb_buffer_init(0) ); + } } hb_list_empty( &list ); hb_buffer_close( &ps ); - if (r->dvd) + if (r->bd) + { + hb_bd_stop( r->bd ); + hb_bd_close( &r->bd ); + } + else if (r->dvd) { hb_dvd_stop( r->dvd ); hb_dvd_close( &r->dvd ); @@ -381,11 +623,55 @@ static void ReaderFunc( void * _r ) } hb_log( "reader: done. %d scr changes", r->demux.scr_changes ); + if ( r->demux.dts_drops ) + { + hb_log( "reader: %d drops because DTS out of range", r->demux.dts_drops ); + } free( r ); _r = NULL; } +static void UpdateState( hb_reader_t * r, int64_t start) +{ + hb_state_t state; + uint64_t now; + double avg; + + now = hb_get_date(); + if( !r->st_first ) + { + r->st_first = now; + } + +#define p state.param.working + state.state = HB_STATE_SEARCHING; + p.progress = (float) start / (float) r->job->pts_to_start; + if( p.progress > 1.0 ) + { + p.progress = 1.0; + } + if (now > r->st_first) + { + int eta; + + avg = 1000.0 * (double)start / (now - r->st_first); + eta = ( r->job->pts_to_start - start ) / avg; + p.hours = eta / 3600; + p.minutes = ( eta % 3600 ) / 60; + p.seconds = eta % 60; + } + else + { + p.rate_avg = 0.0; + p.hours = -1; + p.minutes = -1; + p.seconds = -1; + } +#undef p + + hb_set_state( r->job->h, &state ); +} /*********************************************************************** * GetFifoForId *********************************************************************** @@ -396,8 +682,8 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id ) hb_title_t * title = job->title; hb_audio_t * audio; hb_subtitle_t * subtitle; - int i, n; - static hb_fifo_t * fifos[8]; + int i, n, count; + static hb_fifo_t * fifos[100]; memset(fifos, 0, sizeof(fifos)); @@ -418,37 +704,29 @@ static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id ) } } - if( job->indepth_scan ) { - /* - * Count the occurances of the subtitles, don't actually - * return any to encode unless we are looking fro forced - * subtitles in which case we need to look in the sub picture - * to see if it has the forced flag enabled. - */ - for (i=0; i < hb_list_count(title->list_subtitle); i++) { - subtitle = hb_list_item( title->list_subtitle, i); - if (id == subtitle->id) { + n = 0; + count = hb_list_count( title->list_subtitle ); + count = count > 99 ? 99 : count; + for( i=0; i < count; i++ ) { + subtitle = hb_list_item( title->list_subtitle, i ); + if (id == subtitle->id) { + subtitle->hits++; + if( !job->indepth_scan || job->select_subtitle_config.force ) + { /* - * A hit, count it. + * Pass the subtitles to be processed if we are not scanning, or if + * we are scanning and looking for forced subs, then pass them up + * to decode whether the sub is a forced one. */ - subtitle->hits++; - if( job->subtitle_force ) - { - - fifos[0] = subtitle->fifo_in; - return fifos; - } - break; + fifos[n++] = subtitle->fifo_in; } } - } else { - if( ( subtitle = hb_list_item( title->list_subtitle, 0 ) ) && - id == subtitle->id ) - { - fifos[0] = subtitle->fifo_in; - return fifos; - } } + if ( n != 0 ) + { + return fifos; + } + if( !job->indepth_scan ) { n = 0;