int title_block_count;
int cell_cur;
int cell_next;
+ int cell_overlap;
int block;
int pack_len;
int next_vobu;
int c;
uint64_t duration;
float duration_correction;
-
- title = hb_title_init( d->path, t );
+ unsigned char unused[1024];
hb_log( "scan: scanning title %d", t );
+ title = hb_title_init( d->path, t );
+ if( DVDUDFVolumeInfo( d->reader, title->name, sizeof( title->name ),
+ unused, sizeof( unused ) ) )
+ {
+ char * p_cur, * p_last = d->path;
+ for( p_cur = d->path; *p_cur; p_cur++ )
+ {
+ if( p_cur[0] == '/' && p_cur[1] )
+ {
+ p_last = &p_cur[1];
+ }
+ }
+ snprintf( title->name, sizeof( title->name ), "%s", p_last );
+ }
+
/* VTS which our title is in */
title->vts = d->vmg->tt_srpt->title[t-1].title_set_nr;
title->cell_end, title->block_start, title->block_end,
title->block_count );
- if( title->block_count < 2048 )
+ if( title->block_count < 2048 )
{
hb_log( "scan: title too short (%d blocks), ignoring",
title->block_count );
hb_audio_t * audio, * audio_tmp;
int audio_format, lang_code, audio_control,
position, j;
+ iso639_lang_t * lang;
hb_log( "scan: checking audio %d", i + 1 );
audio->codec = HB_ACODEC_LPCM;
break;
+ case 0x06:
+ audio->id = ( ( 0x88 + position ) << 8 ) | 0xbd;
+ audio->codec = HB_ACODEC_DCA;
+ break;
+
default:
audio->id = 0;
audio->codec = 0;
continue;
}
+ lang = lang_for_code( vts->vtsi_mat->vts_audio_attr[i].lang_code );
+
snprintf( audio->lang, sizeof( audio->lang ), "%s (%s)",
- lang_for_code( vts->vtsi_mat->vts_audio_attr[i].lang_code ),
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name,
audio->codec == HB_ACODEC_AC3 ? "AC3" : ( audio->codec ==
- HB_ACODEC_MPGA ? "MPEG" : "LPCM" ) );
+ HB_ACODEC_DCA ? "DTS" : ( audio->codec ==
+ HB_ACODEC_MPGA ? "MPEG" : "LPCM" ) ) );
snprintf( audio->lang_simple, sizeof( audio->lang_simple ), "%s",
- lang_for_code( vts->vtsi_mat->vts_audio_attr[i].lang_code ) );
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name );
+ snprintf( audio->iso639_2, sizeof( audio->iso639_2 ), "%s",
+ lang->iso639_2);
- hb_log( "scan: id=%x, lang=%s", audio->id,
- audio->lang );
+ hb_log( "scan: id=%x, lang=%s, 3cc=%s", audio->id,
+ audio->lang, audio->iso639_2 );
hb_list_add( title->list_audio, audio );
}
hb_subtitle_t * subtitle;
int spu_control;
int position;
+ iso639_lang_t * lang;
hb_log( "scan: checking subtitle %d", i + 1 );
position = ( spu_control >> 24 ) & 0x7F;
}
+ lang = lang_for_code( vts->vtsi_mat->vts_subp_attr[i].lang_code );
+
subtitle = calloc( sizeof( hb_subtitle_t ), 1 );
subtitle->id = ( ( 0x20 + position ) << 8 ) | 0xbd;
snprintf( subtitle->lang, sizeof( subtitle->lang ), "%s",
- lang_for_code( vts->vtsi_mat->vts_subp_attr[i].lang_code ) );
+ strlen(lang->native_name) ? lang->native_name : lang->eng_name);
+ snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s",
+ lang->iso639_2);
- hb_log( "scan: id=%x, lang=%s", subtitle->id,
- subtitle->lang );
+ hb_log( "scan: id=%x, lang=%s, 3cc=%s", subtitle->id,
+ subtitle->lang, subtitle->iso639_2 );
hb_list_add( title->list_subtitle, subtitle );
}
d->block = d->pgc->cell_playback[d->cell_cur].first_sector;
d->next_vobu = d->block;
d->pack_len = 0;
-
+ d->cell_overlap = 0;
+
return 1;
}
return 1;
}
+
+/***********************************************************************
+ * is_nav_pack
+ ***********************************************************************
+ * Pretty much directly lifted from libdvdread's play_title function.
+ **********************************************************************/
+int is_nav_pack( unsigned char *buf )
+{
+ return ( buf[41] == 0xbf && buf[1027] == 0xbf );
+}
+
+
/***********************************************************************
* hb_dvd_read
***********************************************************************
if( DVDReadBlocks( d->file, d->next_vobu, 1, b->data ) != 1 )
{
- hb_log( "dvd: DVDReadBlocks failed (%d)", d->next_vobu );
+ hb_log( "dvd: Unrecoverable Read Error from DVD, probable HD or DVD Failure (blk: %d)", d->next_vobu );
return 0;
}
+ if ( !is_nav_pack( b->data ) ) {
+ (d->next_vobu)++;
+ continue;
+ }
+
navRead_DSI( &dsi_pack, &b->data[DSI_START_BYTE] );
block = dsi_pack.dsi_gi.nv_pck_lbn;
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");
+ if( d->cell_overlap )
+ {
+ b->new_chap = hb_dvd_is_break( d );
+ d->cell_overlap = 0;
+ }
}
}
else
{
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;
- for( i = 0;
- i < d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts;
- i++ )
+ for( i = nr_of_ptts - 1;
+ i >= 0;
+ i-- )
{
/* Get pgc for chapter (i+1) */
pgc_id = d->ifo->vts_ptt_srpt->title[d->ttn-1].ptt[i].pgcn;
pgn = d->ifo->vts_ptt_srpt->title[d->ttn-1].ptt[i].pgn;
pgc = d->ifo->vts_pgcit->pgci_srp[pgc_id-1].pgc;
- if( d->cell_cur >= pgc->program_map[pgn-1] - 1 &&
- d->cell_cur <= pgc->nr_of_cells - 1 )
+ if( d->cell_cur - d->cell_overlap >= pgc->program_map[pgn-1] - 1 &&
+ d->cell_cur - d->cell_overlap <= pgc->nr_of_cells - 1 )
{
/* We are in this chapter */
return i + 1;
}
/***********************************************************************
+ * hb_dvd_is_break
+ ***********************************************************************
+ * Returns 1 if the current block is a new chapter start
+ **********************************************************************/
+int hb_dvd_is_break( hb_dvd_t * d )
+{
+ int i, j;
+ 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;
+
+ for( i = nr_of_ptts - 1;
+ i > 0;
+ i-- )
+ {
+ /* Get pgc for chapter (i+1) */
+ pgc_id = d->ifo->vts_ptt_srpt->title[d->ttn-1].ptt[i].pgcn;
+ pgn = d->ifo->vts_ptt_srpt->title[d->ttn-1].ptt[i].pgn;
+ pgc = d->ifo->vts_pgcit->pgci_srp[pgc_id-1].pgc;
+ cell = pgc->program_map[pgn-1] - 1;
+
+ if( cell <= d->cell_start )
+ break;
+
+ // This must not match against the start cell.
+ if( pgc->cell_playback[cell].first_sector == d->block && cell != d->cell_start )
+ {
+ /* Check to see if we merged this chapter into the previous one... */
+ /* As a note, merging chapters is probably bad practice for this very reason */
+ chapter_length = 0;
+
+ if( i == nr_of_ptts - 1 )
+ {
+ cell_end = d->pgc->nr_of_cells;
+ }
+ else
+ {
+ cell_end = pgc->program_map[pgn] - 1;
+ }
+
+ for( j = cell; j < cell_end; j++ )
+ {
+ chapter_length += pgc->cell_playback[j].last_sector + 1 -
+ pgc->cell_playback[j].first_sector;
+ }
+
+ if( chapter_length >= 2048 )
+ {
+ printf("DVD: Chapter Break Cell Found\n");
+ /* We have a chapter break */
+ return 1;
+ }
+ else
+ {
+ printf("DVD: Cell Found (%d)\n", chapter_length);
+ }
+ }
+ }
+
+ return 0;
+}
+
+/***********************************************************************
* hb_dvd_close
***********************************************************************
* Closes and frees everything
OSDN Git Service
