/* Open device */
if( !( d->reader = DVDOpen( path ) ) )
{
- hb_log( "dvd: DVDOpen failed (%s)", path );
+ hb_error( "dvd: DVDOpen failed (%s)", path );
goto fail;
}
/* Open main IFO */
if( !( d->vmg = ifoOpen( d->reader, 0 ) ) )
{
- hb_log( "dvd: ifoOpen failed" );
+ hb_error( "dvd: ifoOpen failed" );
goto fail;
}
hb_log( "scan: opening IFO for VTS %d", title->vts );
if( !( vts = ifoOpen( d->reader, title->vts ) ) )
{
- hb_log( "scan: ifoOpen failed" );
+ hb_error( "scan: ifoOpen failed" );
goto fail;
}
pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn;
d->pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+ hb_log("pgc_id: %d, pgn: %d: pgc: 0x%x", pgc_id, pgn, d->pgc);
+
+ if( !d->pgc )
+ {
+ hb_error( "scan: pgc not valid, skipping" );
+ goto fail;
+ }
+
/* Start cell */
title->cell_start = d->pgc->program_map[pgn-1] - 1;
title->block_start = d->pgc->cell_playback[title->cell_start].first_sector;
d->ttn = d->vmg->tt_srpt->title[title-1].vts_ttn;
if( !( d->ifo = ifoOpen( d->reader, d->vts ) ) )
{
- hb_log( "dvd: ifoOpen failed for VTS %d", d->vts );
+ hb_error( "dvd: ifoOpen failed for VTS %d", d->vts );
return 0;
}
if( !( d->file = DVDOpenFile( d->reader, d->vts,
DVD_READ_TITLE_VOBS ) ) )
{
- hb_log( "dvd: DVDOpenFile failed for VTS %d", d->vts );
+ hb_error( "dvd: DVDOpenFile failed for VTS %d", d->vts );
return 0;
}
for( ;; )
{
- int block, pack_len, next_vobu;
+ int block, pack_len, next_vobu, read_retry;
+
+ for( read_retry = 0; read_retry < 3; read_retry++ )
+ {
+ if( DVDReadBlocks( d->file, d->next_vobu, 1, b->data ) == 1 )
+ {
+ /*
+ * Successful read.
+ */
+ break;
+ } else {
+ hb_log( "dvd: Read Error on blk %d, attempt %d",
+ d->next_vobu, read_retry );
+ }
+ }
- if( DVDReadBlocks( d->file, d->next_vobu, 1, b->data ) != 1 )
+ if( read_retry == 3 )
{
- hb_log( "dvd: DVDReadBlocks failed (%d)", d->next_vobu );
+ hb_log( "dvd: Unrecoverable Read Error from DVD, potential HD or DVD Failure (blk: %d)", d->next_vobu );
return 0;
}
if( dsi_pack.vobu_sri.next_vobu == SRI_END_OF_CELL )
{
+ hb_log( "DVD: End of Cell (%d) at block %d", d->cell_cur,
+ d->block );
d->cell_cur = d->cell_next;
d->next_vobu = d->pgc->cell_playback[d->cell_cur].first_sector;
FindNextCell( d );
d->cell_overlap = 1;
- printf("DVD: End of Cell\n");
}
// Revert the cell overlap, and check for a chapter break
if( dsi_pack.vobu_sri.prev_vobu == SRI_END_OF_CELL )
{
- printf("DVD: Beginning of Cell\n");
+ hb_log( "DVD: Beginning of Cell (%d) at block %d", d->cell_cur,
+ d->block );
if( d->cell_overlap )
{
b->new_chap = hb_dvd_is_break( d );
{
if( DVDReadBlocks( d->file, d->block, 1, b->data ) != 1 )
{
- hb_log( "reader: DVDReadBlocks failed (%d)", d->block );
+ hb_error( "reader: DVDReadBlocks failed (%d)", d->block );
return 0;
}
d->pack_len--;
if( chapter_length >= 2048 )
{
- printf("DVD: Chapter Break Cell Found\n");
+ hb_log("DVD: Chapter Break Cell Found");
/* We have a chapter break */
return 1;
}
else
{
- printf("DVD: Cell Found (%d)\n", chapter_length);
+ hb_log("DVD: Cell Found (%d)", chapter_length);
}
}
}