/* $Id: reader.c,v 1.21 2005/11/25 15:05:25 titer Exp $
This file is part of the HandBrake source code.
- Homepage: <http://handbrake.m0k.org/>.
+ Homepage: <http://handbrake.fr/>.
It may be used under the terms of the GNU General Public License. */
#include "hb.h"
hb_buffer_t * ps;
hb_stream_t * stream;
+ hb_psdemux_t demux;
+ uint sequence;
+ int saw_video;
} 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
r->job = job;
r->title = job->title;
r->die = job->die;
-
+ r->sequence = 0;
+
return hb_thread_init( "reader", ReaderFunc, r,
HB_NORMAL_PRIORITY );
}
+static void push_buf( 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 reaqdy to receive
+ * this buffer.
+ */
+ hb_snooze( 50 );
+ }
+ hb_fifo_push( fifo, buf );
+}
+
/***********************************************************************
* ReaderFunc
***********************************************************************
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;
}
if (r->dvd)
{
- if( !hb_dvd_start( r->dvd, r->title->index, r->job->chapter_start ) )
+ /*
+ * 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->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]);
- }
-
+
list = hb_list_init();
r->ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE );
chapter = hb_dvd_chapter( r->dvd );
else if (r->stream)
chapter = 1;
-
+
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->job->subtitle_scan )
+ if( r->job->indepth_scan )
{
/*
* Need to update the progress during a subtitle scan
if( p.progress > 1.0 )
{
p.progress = 1.0;
- }
+ }
p.rate_avg = 0.0;
p.hours = -1;
p.minutes = -1;
p.seconds = -1;
hb_set_state( r->job->h, &state );
}
-
- hb_demux_ps( r->ps, list );
+
+ if ( r->title->demuxer == HB_NULL_DEMUXER )
+ {
+ hb_demux_null( r->ps, list, &r->demux );
+ }
+ else
+ {
+ hb_demux_ps( r->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 )
{
- while( !*r->die && !r->job->done &&
- hb_fifo_is_full( fifo ) )
+ /* The first video packet defines 'time zero' so discard
+ data until we get a video packet with a PTS */
+ if ( buf->id == r->title->video_id && buf->start != -1 )
{
- hb_snooze( 50 );
+ r->saw_video = 1;
+ r->demux.scr_offset = buf->renderOffset;
+ hb_log( "reader: first SCR %llu scr_offset %llu",
+ r->demux.last_scr, r->demux.scr_offset );
+ }
+ else
+ {
+ fifos = NULL;
}
- hb_fifo_push( fifo, buf );
+ }
+ if( fifos )
+ {
+ if ( buf->start != -1 )
+ {
+ /* this packet has a PTS - correct it for the initial
+ video time offset & any timing discontinuities so that
+ everything after this sees a continuous clock with 0
+ being the time of the first video packet. */
+ buf->start -= r->demux.scr_offset;
+ buf->renderOffset -= r->demux.scr_offset;
+ }
+ 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 );
+ }
+ push_buf( r, fifos[0], buf );
}
else
{
}
}
+ /* send an empty buffer upstream to signal we're done */
+ hb_fifo_push( r->job->fifo_mpeg2, hb_buffer_init(0) );
+
hb_list_empty( &list );
hb_buffer_close( &r->ps );
if (r->dvd)
{
hb_stream_close(&r->stream);
}
-
+
+ hb_log( "reader: done. %d scr changes", r->demux.scr_changes );
+
free( r );
_r = NULL;
-
- hb_log( "reader: done" );
}
/***********************************************************************
***********************************************************************
*
**********************************************************************/
-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];
+
+ memset(fifos, 0, sizeof(fifos));
- if( id == 0xE0 )
+ if( id == title->video_id )
{
- if( !job->subtitle_scan )
+ if( job->indepth_scan )
{
- return job->fifo_mpeg2;
- } else {
/*
- * Ditch the mpeg2 video when doing a subtitle scan.
+ * Ditch the video here during the indepth scan until
+ * we can improve the MPEG2 decode performance.
*/
return NULL;
}
+ else
+ {
+ fifos[0] = job->fifo_mpeg2;
+ return fifos;
+ }
}
- if (job->subtitle_scan) {
+ if( job->indepth_scan ) {
/*
* Count the occurances of the subtitles, don't actually
* return any to encode unless we are looking fro forced
subtitle->hits++;
if( job->subtitle_force )
{
- return subtitle->fifo_in;
+
+ fifos[0] = subtitle->fifo_in;
+ return fifos;
}
break;
}
if( ( subtitle = hb_list_item( title->list_subtitle, 0 ) ) &&
id == subtitle->id )
{
- return subtitle->fifo_in;
+ fifos[0] = subtitle->fifo_in;
+ return fifos;
}
}
- for( i = 0; i < hb_list_count( title->list_audio ); i++ )
+ if( !job->indepth_scan )
{
- audio = hb_list_item( title->list_audio, i );
- if( id == audio->id )
+ 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 )
+ {
+ fifos[n++] = audio->priv.fifo_in;
+ }
+ }
+
+ if( n != 0 )
{
- return audio->fifo_in;
+ return fifos;
}
}
OSDN Git Service
