summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvan <[email protected]>2008-01-22 21:55:38 +0000
committervan <[email protected]>2008-01-22 21:55:38 +0000
commit89e0d809e58704a8ab32bcef897489ca6473d8cb (patch)
tree8d5e7f0972061f14ad0c598dba3ccbbbe8f38151
parentccf89f961bf9e120da1bbcd02c67e95c15165ec7 (diff)
- rather than completely giving up on a dvd because we got a read error on next_vobu, just skip to the start of the next cell & keep going.
- get rid of some unused variables so this compiles with no warnings. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1230 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--libhb/dvd.c18
1 files changed, 13 insertions, 5 deletions
diff --git a/libhb/dvd.c b/libhb/dvd.c
index b181402ec..65dc34230 100644
--- a/libhb/dvd.c
+++ b/libhb/dvd.c
@@ -122,7 +122,7 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t )
hb_title_t * title;
ifo_handle_t * vts = NULL;
int pgc_id, pgn, i;
- hb_chapter_t * chapter, * chapter_old;
+ hb_chapter_t * chapter;
int c;
uint64_t duration;
float duration_correction;
@@ -715,8 +715,16 @@ int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b )
if( read_retry == 3 )
{
- hb_log( "dvd: Unrecoverable Read Error from DVD (blk: %d)", d->next_vobu );
- return 0;
+ hb_log( "dvd: vobu read error blk %d - skipping to cell %d",
+ d->next_vobu, d->cell_next );
+ d->cell_cur = d->cell_next;
+ if ( d->cell_cur > d->cell_end )
+ return 0;
+ d->in_cell = 0;
+ d->next_vobu = d->pgc->cell_playback[d->cell_cur].first_sector;
+ FindNextCell( d );
+ d->cell_overlap = 1;
+ continue;
}
if ( !is_nav_pack( b->data ) ) {
@@ -951,11 +959,11 @@ int hb_dvd_chapter( hb_dvd_t * d )
**********************************************************************/
int hb_dvd_is_break( hb_dvd_t * d )
{
- int i, j;
+ int i;
int pgc_id, pgn;
int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts;
pgc_t * pgc;
- int cell, chapter_length, cell_end;
+ int cell;
for( i = nr_of_ptts - 1;
i > 0;