break;
}
}
-
+
+ if( r->job->indepth_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 ) ) )
if( id == 0xE0 )
{
- 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
+ {
+ return job->fifo_mpeg2;
}
}
- 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
return subtitle->fifo_in;
}
}
- 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 )
+ for( i = 0; i < hb_list_count( title->list_audio ); i++ )
{
- return audio->fifo_in;
+ audio = hb_list_item( title->list_audio, i );
+ if( id == audio->id )
+ {
+ return audio->fifo_in;
+ }
}
}