X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Freader.c;h=be7a9aecc2fb891405d9532fee3615b3ba2f4231;hb=0f25cfb3cfac4feff657bb79bcc0b689baa99860;hp=2fd39eb630473fd0596208a70ab8d8b6d1dec2a3;hpb=8a9568248fab1543f7b6fa3644e6e69a954a44bb;p=handbrake-jp%2Fhandbrake-jp-git.git
diff --git a/libhb/reader.c b/libhb/reader.c
index 2fd39eb6..be7a9aec 100644
--- a/libhb/reader.c
+++ b/libhb/reader.c
@@ -1,28 +1,41 @@
/* $Id: reader.c,v 1.21 2005/11/25 15:05:25 titer Exp $
This file is part of the HandBrake source code.
- Homepage: .
+ Homepage: .
It may be used under the terms of the GNU General Public License. */
#include "hb.h"
typedef struct
{
+ double average; // average time between packets
+ int64_t last; // last timestamp seen on this stream
+ int id; // stream id
+} stream_timing_t;
+
+typedef struct
+{
hb_job_t * job;
hb_title_t * title;
volatile int * die;
hb_dvd_t * dvd;
- hb_buffer_t * ps;
hb_stream_t * stream;
+ stream_timing_t *stream_timing;
+ 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
} hb_reader_t;
/***********************************************************************
* Local prototypes
**********************************************************************/
static void ReaderFunc( void * );
-static hb_fifo_t * GetFifoForId( hb_job_t * job, int id );
+static hb_fifo_t ** GetFifoForId( hb_job_t * job, int id );
/***********************************************************************
* hb_reader_init
@@ -38,11 +51,111 @@ hb_thread_t * hb_reader_init( hb_job_t * job )
r->job = job;
r->title = job->title;
r->die = job->die;
-
+ r->sequence = 0;
+
+ r->st_slots = 4;
+ r->stream_timing = calloc( sizeof(stream_timing_t), r->st_slots );
+ r->stream_timing[0].id = r->title->video_id;
+ 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[1].id = -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 ) )
+ {
+ /*
+ * Loop until the incoming fifo is ready to receive
+ * this buffer.
+ */
+ hb_snooze( 50 );
+ }
+ hb_fifo_push( fifo, buf );
+}
+
+// The MPEG STD (Standard Target Decoder) essentially requires that we keep
+// per-stream timing so that when there's a timing discontinuity we can
+// seemlessly join packets on either side of the discontinuity. This join
+// requires that we know the timestamp of the previous packet and the
+// average inter-packet time (since we position the new packet at the end
+// of the previous packet). The next four routines keep track of this
+// per-stream timing.
+
+// find the per-stream timing state for 'buf'
+
+static stream_timing_t *find_st( hb_reader_t *r, const hb_buffer_t *buf )
+{
+ stream_timing_t *st = r->stream_timing;
+ for ( ; st->id != -1; ++st )
+ {
+ if ( st->id == buf->id )
+ return st;
+ }
+ return NULL;
+}
+
+// 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 )
+{
+ stream_timing_t *st = r->stream_timing;
+ while ( st->id != buf->id && st->id != -1)
+ {
+ ++st;
+ }
+ // if we haven't seen this stream add it.
+ if ( st->id == -1 )
+ {
+ // we keep the steam timing info in an array with some power-of-two
+ // number of slots. If we don't have two slots left (one for our new
+ // entry plus one for the "-1" eol) we need to expand the array.
+ int slot = st - r->stream_timing;
+ if ( slot + 1 >= r->st_slots )
+ {
+ r->st_slots *= 2;
+ r->stream_timing = realloc( r->stream_timing, r->st_slots *
+ sizeof(*r->stream_timing) );
+ st = r->stream_timing + slot;
+ }
+ st->id = buf->id;
+ st->average = 30.*90.;
+ st->last = buf->renderOffset - st->average;
+
+ st[1].id = -1;
+ }
+ return st;
+}
+
+// update the average inter-packet time of the stream associated with 'buf'
+// using a recursive low-pass filter with a 16 packet time constant.
+
+static void update_ipt( hb_reader_t *r, const hb_buffer_t *buf )
+{
+ stream_timing_t *st = id_to_st( r, buf );
+ double dt = buf->renderOffset - st->last;
+ st->average += ( dt - st->average ) * (1./32.);
+ st->last = buf->renderOffset;
+}
+
+// use the per-stream state associated with 'buf' to compute a new scr_offset
+// such that 'buf' will follow the previous packet of this stream separated
+// by the average packet time of the stream.
+
+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;
+ r->scr_offset = buf->renderOffset - nxt;
+ buf->renderOffset = nxt;
+ r->scr_changes = r->demux.scr_changes;
+ st->last = buf->renderOffset;
+}
+
/***********************************************************************
* ReaderFunc
***********************************************************************
@@ -51,14 +164,16 @@ hb_thread_t * hb_reader_init( hb_job_t * job )
static void ReaderFunc( void * _r )
{
hb_reader_t * r = _r;
- hb_fifo_t * fifo;
+ hb_fifo_t ** fifos;
hb_buffer_t * buf;
hb_list_t * list;
+ int n;
int chapter = -1;
+ int chapter_end = r->job->chapter_end;
if( !( r->dvd = hb_dvd_init( r->title->dvd ) ) )
{
- if ( !(r->stream = hb_stream_open(r->title->dvd) ) )
+ if ( !( r->stream = hb_stream_open( r->title->dvd, r->title ) ) )
{
return;
}
@@ -66,53 +181,101 @@ static void ReaderFunc( void * _r )
if (r->dvd)
{
- if( !hb_dvd_start( r->dvd, r->title->index, r->job->chapter_start ) )
- {
- hb_dvd_close( &r->dvd );
- return;
- }
- }
-
- if (r->stream)
- {
- // At this point r->audios[0] gives us the index of the selected audio track for output track 0
- // we cannot effectively demux multiple PID's into the seperate output tracks unfortunately
- // so we'll just specifiy things here for a single track.
- hb_stream_set_selected_audio_pid_index(r->stream, r->job->audios[0]);
- }
-
+ /*
+ * 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;
+ }
+
+ 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 ) );
+
+ }
+ else if( r->stream )
+ {
+ /*
+ * 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();
- r->ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE );
+ hb_buffer_t *ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE );
+ r->demux.flaky_clock = r->title->flaky_clock;
while( !*r->die && !r->job->done )
{
if (r->dvd)
- chapter = hb_dvd_chapter( r->dvd );
+ chapter = hb_dvd_chapter( r->dvd );
else if (r->stream)
- chapter = 1;
-
+ chapter = hb_stream_chapter( r->stream );
+
if( chapter < 0 )
{
hb_log( "reader: end of the title reached" );
break;
}
- if( chapter > r->job->chapter_end )
+ if( chapter > chapter_end )
{
- hb_log( "reader: end of chapter %d reached (%d)",
- r->job->chapter_end, chapter );
+ hb_log( "reader: end of chapter %d (media %d) reached at media chapter %d",
+ r->job->chapter_end, chapter_end, chapter );
break;
}
if (r->dvd)
{
- if( !hb_dvd_read( r->dvd, r->ps ) )
+ if( !hb_dvd_read( r->dvd, ps ) )
{
break;
}
}
else if (r->stream)
{
- if ( !hb_stream_read( r->stream, r->ps ) )
+ if ( !hb_stream_read( r->stream, ps ) )
{
break;
}
@@ -128,11 +291,11 @@ static void ReaderFunc( void * _r )
#define p state.param.working
state.state = HB_STATE_WORKING;
- p.progress = (float)chapter / (float)r->job->chapter_end;
+ p.progress = (double)chapter / (double)r->job->chapter_end;
if( p.progress > 1.0 )
{
p.progress = 1.0;
- }
+ }
p.rate_avg = 0.0;
p.hours = -1;
p.minutes = -1;
@@ -140,20 +303,107 @@ static void ReaderFunc( void * _r )
hb_set_state( r->job->h, &state );
}
- hb_demux_ps( r->ps, list );
+ (hb_demux[r->title->demuxer])( ps, list, &r->demux );
while( ( buf = hb_list_item( list, 0 ) ) )
{
hb_list_rem( list, buf );
- fifo = GetFifoForId( r->job, buf->id );
- if( fifo )
+ fifos = GetFifoForId( r->job, buf->id );
+
+ if ( ! r->saw_video )
+ {
+ /* 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 )
+ {
+ // force a new scr offset computation
+ r->scr_changes = r->demux.scr_changes - 1;
+ r->saw_video = 1;
+ hb_log( "reader: first SCR %lld", r->demux.last_scr );
+ }
+ else
+ {
+ fifos = NULL;
+ }
+ }
+ if( fifos )
{
- while( !*r->die && !r->job->done &&
- hb_fifo_is_full( fifo ) )
+ if ( buf->renderOffset != -1 )
{
- hb_snooze( 50 );
+ 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
+ {
+ // 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.
+ stream_timing_t *st = find_st( r, buf );
+
+ if ( st )
+ {
+ // if this isn't the video stream or we don't
+ // have audio yet then generate a new scr
+ if ( st != r->stream_timing ||
+ r->stream_timing[1].id == -1 )
+ {
+ new_scr_offset( r, buf );
+ }
+ else
+ {
+ // defer the scr change until we get some
+ // audio since audio has a timestamp per
+ // frame but video doesn't. Clear the timestamps
+ // so the decoder will regenerate them from
+ // the frame durations.
+ buf->start = -1;
+ buf->renderOffset = -1;
+ }
+ }
+ 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;
+ }
+ }
+ }
+ if ( buf->start != -1 )
+ {
+ buf->start -= r->scr_offset;
+ if ( r->job->pts_to_stop && buf->start > r->job->pts_to_stop )
+ {
+ // we're doing a subset of the input and we've hit the
+ // stopping point.
+ hb_buffer_close( &buf );
+ goto done;
+ }
+ }
+
+ buf->sequence = r->sequence++;
+ /* if there are mutiple output fifos, send a copy of the
+ * buffer down all but the first (we have to not ship the
+ * original buffer or we'll race with the thread that's
+ * consuming the buffer & inject garbage into the data stream). */
+ for( n = 1; fifos[n] != NULL; n++)
+ {
+ hb_buffer_t *buf_copy = hb_buffer_init( buf->size );
+ hb_buffer_copy_settings( buf_copy, buf );
+ memcpy( buf_copy->data, buf->data, buf->size );
+ push_buf( r, fifos[n], buf_copy );
}
- hb_fifo_push( fifo, buf );
+ push_buf( r, fifos[0], buf );
}
else
{
@@ -162,22 +412,42 @@ static void ReaderFunc( void * _r )
}
}
+ done:
+ // 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 ( audio->priv.fifo_in )
+ push_buf( r, audio->priv.fifo_in, hb_buffer_init(0) );
+ }
+
hb_list_empty( &list );
- hb_buffer_close( &r->ps );
+ hb_buffer_close( &ps );
if (r->dvd)
{
- hb_dvd_stop( r->dvd );
- hb_dvd_close( &r->dvd );
+ hb_dvd_stop( r->dvd );
+ hb_dvd_close( &r->dvd );
}
else if (r->stream)
{
- hb_stream_close(&r->stream);
+ hb_stream_close(&r->stream);
+ }
+
+ if ( r->stream_timing )
+ {
+ free( r->stream_timing );
+ }
+
+ 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;
-
- hb_log( "reader: done" );
}
/***********************************************************************
@@ -185,26 +455,30 @@ static void ReaderFunc( void * _r )
***********************************************************************
*
**********************************************************************/
-static hb_fifo_t * GetFifoForId( hb_job_t * job, int id )
+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;
+ int i, n;
+ static hb_fifo_t * fifos[8];
- if( id == 0xE0 )
+ memset(fifos, 0, sizeof(fifos));
+
+ if( id == title->video_id )
{
- if( job->indepth_scan )
+ if( job->indepth_scan )
{
/*
* Ditch the video here during the indepth scan until
* we can improve the MPEG2 decode performance.
*/
return NULL;
- }
- else
+ }
+ else
{
- return job->fifo_mpeg2;
+ fifos[0] = job->fifo_mpeg2;
+ return fifos;
}
}
@@ -224,7 +498,9 @@ static hb_fifo_t * GetFifoForId( hb_job_t * job, int id )
subtitle->hits++;
if( job->subtitle_force )
{
- return subtitle->fifo_in;
+
+ fifos[0] = subtitle->fifo_in;
+ return fifos;
}
break;
}
@@ -233,19 +509,26 @@ static hb_fifo_t * GetFifoForId( hb_job_t * job, int id )
if( ( subtitle = hb_list_item( title->list_subtitle, 0 ) ) &&
id == subtitle->id )
{
- return subtitle->fifo_in;
+ fifos[0] = subtitle->fifo_in;
+ return fifos;
}
}
- if( !job->indepth_scan )
+ if( !job->indepth_scan )
{
+ n = 0;
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
audio = hb_list_item( title->list_audio, i );
if( id == audio->id )
{
- return audio->fifo_in;
+ fifos[n++] = audio->priv.fifo_in;
}
}
+
+ if( n != 0 )
+ {
+ return fifos;
+ }
}
return NULL;