hb_log( "scan: scanning title %d", t );
title = hb_title_init( d->path, t );
+ title->type = HB_DVD_TYPE;
if (dvdnav_get_title_string(d->dvdnav, &name) == DVDNAV_STATUS_OK)
{
strncpy( title->name, name, sizeof( title->name ) );
hb_list_add( title->list_audio, audio );
}
- if( !hb_list_count( title->list_audio ) )
- {
- hb_log( "scan: ignoring title (no audio track)" );
- goto fail;
- }
-
memcpy( title->palette,
ifo->vts_pgcit->pgci_srp[title_pgcn-1].pgc->palette,
16 * sizeof( uint32_t ) );
// XXX the current version of libdvdnav can't seek outside the current
// PGC. Check if the place we're seeking to is in a different
// PGC. Position there & adjust the offset if so.
+ uint64_t pgc_offset = 0;
+ uint64_t chap_offset = 0;
hb_chapter_t *pgc_change = hb_list_item(d->list_chapter, 0 );
for ( ii = 0; ii < hb_list_count( d->list_chapter ); ++ii )
{
hb_chapter_t *chapter = hb_list_item( d->list_chapter, ii );
+ uint64_t chap_len = chapter->block_end - chapter->block_start + 1;
if ( chapter->pgcn != pgc_change->pgcn )
{
// this chapter's in a different pgc from the previous - note the
// change so we can make sector offset's be pgc relative.
+ pgc_offset = chap_offset;
pgc_change = chapter;
}
- if ( chapter->block_start <= sector && sector <= chapter->block_end )
+ if ( chap_offset <= sector && sector < chap_offset + chap_len )
{
// this chapter contains the sector we want - see if it's in a
// different pgc than the one we're currently in.
hb_log("dvdnav prog play err: %s", dvdnav_err_to_string(d->dvdnav));
}
// seek sectors are pgc-relative so remove the pgc start sector.
- sector -= pgc_change->block_start;
+ sector -= pgc_offset;
break;
}
+ chap_offset += chap_len;
}
// dvdnav will not let you seek or poll current position
result = dvdnav_get_next_block( d->dvdnav, buf, &event, &len );
if ( result == DVDNAV_STATUS_ERR )
{
- hb_log("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
+ hb_error("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
return 0;
}
switch ( event )
result = dvdnav_get_next_block( d->dvdnav, b->data, &event, &len );
if ( result == DVDNAV_STATUS_ERR )
{
- hb_log("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
+ hb_error("dvdnav: Read Error, %s", dvdnav_err_to_string(d->dvdnav));
if (dvdnav_sector_search(d->dvdnav, 1, SEEK_CUR) != DVDNAV_STATUS_OK)
{
hb_error( "dvd: dvdnav_sector_search failed - %s",
error_count++;
if (error_count > 10)
{
- hb_log("dvdnav: Error, too many consecutive read errors");
+ hb_error("dvdnav: Error, too many consecutive read errors");
return 0;
}
continue;
}
- error_count = 0;
switch ( event )
{
case DVDNAV_BLOCK_OK:
if (chapter > 1)
b->new_chap = chapter;
chapter = 0;
+ error_count = 0;
return 1;
case DVDNAV_NOP: