hb_dvd_t * dvd;
hb_buffer_t * ps;
+ hb_stream_t * stream;
} hb_reader_t;
hb_fifo_t * fifo;
hb_buffer_t * buf;
hb_list_t * list;
- int chapter;
+ int chapter = -1;
if( !( r->dvd = hb_dvd_init( r->title->dvd ) ) )
{
- return;
+ if ( !(r->stream = hb_stream_open(r->title->dvd) ) )
+ {
+ return;
+ }
}
- if( !hb_dvd_start( r->dvd, r->title->index, r->job->chapter_start ) )
+ if (r->dvd)
{
- hb_dvd_close( &r->dvd );
- return;
+ 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]);
+ }
+
list = hb_list_init();
- r->ps = hb_buffer_init( 2048 );
+ r->ps = hb_buffer_init( HB_DVD_READ_BUFFER_SIZE );
while( !*r->die && !r->job->done )
{
- chapter = hb_dvd_chapter( r->dvd );
+ if (r->dvd)
+ 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( !hb_dvd_read( r->dvd, r->ps ) )
+ if (r->dvd)
{
+ if( !hb_dvd_read( r->dvd, r->ps ) )
+ {
+ break;
+ }
+ }
+ else if (r->stream)
+ {
+ if ( !hb_stream_read( r->stream, r->ps ) )
+ {
break;
+ }
}
+ if( r->job->subtitle_scan )
+ {
+ /*
+ * Need to update the progress during a subtitle scan
+ */
+ hb_state_t state;
+
+#define p state.param.working
+
+ state.state = HB_STATE_WORKING;
+ p.progress = (float)chapter / (float)r->job->chapter_end;
+ 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 );
while( ( buf = hb_list_item( list, 0 ) ) )
hb_list_empty( &list );
hb_buffer_close( &r->ps );
- hb_dvd_stop( r->dvd );
- hb_dvd_close( &r->dvd );
+ if (r->dvd)
+ {
+ hb_dvd_stop( r->dvd );
+ hb_dvd_close( &r->dvd );
+ }
+ else if (r->stream)
+ {
+ hb_stream_close(&r->stream);
+ }
+
+ free( r );
+ _r = NULL;
hb_log( "reader: done" );
}
if( id == 0xE0 )
{
- return job->fifo_mpeg2;
+ if( !job->subtitle_scan )
+ {
+ return job->fifo_mpeg2;
+ } else {
+ /*
+ * Ditch the mpeg2 video when doing a subtitle scan.
+ */
+ return NULL;
+ }
}
- if( ( subtitle = hb_list_item( title->list_subtitle, 0 ) ) &&
- id == subtitle->id )
- {
- return subtitle->fifo_in;
+ if (job->subtitle_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) {
+ /*
+ * A hit, count it.
+ */
+ subtitle->hits++;
+ if( job->subtitle_force )
+ {
+ return subtitle->fifo_in;
+ }
+ break;
+ }
+ }
+ } else {
+ if( ( subtitle = hb_list_item( title->list_subtitle, 0 ) ) &&
+ id == subtitle->id )
+ {
+ return subtitle->fifo_in;
+ }
}
-
for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
audio = hb_list_item( title->list_audio, i );