X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=libhb%2Fdvd.c;h=fa5373e79374171dab5a71187e05e25b0ec910db;hb=033e32de9c380f54c7d1362a3979da205ebc3a29;hp=240d3bc2e361e595da0493a2101aab31467ec312;hpb=91f6c19b323a57699b8ff555e5d1e38d7a7fb46e;p=handbrake-jp%2Fhandbrake-jp-git.git diff --git a/libhb/dvd.c b/libhb/dvd.c index 240d3bc2..fa5373e7 100644 --- a/libhb/dvd.c +++ b/libhb/dvd.c @@ -6,47 +6,56 @@ #include "hb.h" #include "lang.h" +#include "dvd.h" #include "dvdread/ifo_read.h" +#include "dvdread/ifo_print.h" #include "dvdread/nav_read.h" -struct hb_dvd_s +static hb_dvd_t * hb_dvdread_init( char * path ); +static void hb_dvdread_close( hb_dvd_t ** _d ); +static char * hb_dvdread_name( char * path ); +static int hb_dvdread_title_count( hb_dvd_t * d ); +static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * d, int t ); +static int hb_dvdread_start( hb_dvd_t * d, hb_title_t *title, int chapter ); +static void hb_dvdread_stop( hb_dvd_t * d ); +static int hb_dvdread_seek( hb_dvd_t * d, float f ); +static int hb_dvdread_read( hb_dvd_t * d, hb_buffer_t * b ); +static int hb_dvdread_chapter( hb_dvd_t * d ); +static int hb_dvdread_angle_count( hb_dvd_t * d ); +static void hb_dvdread_set_angle( hb_dvd_t * d, int angle ); + +hb_dvd_func_t hb_dvdread_func = { - char * path; - - dvd_reader_t * reader; - ifo_handle_t * vmg; - - int vts; - int ttn; - ifo_handle_t * ifo; - dvd_file_t * file; - - pgc_t * pgc; - int cell_start; - int cell_end; - int title_start; - int title_end; - int title_block_count; - int cell_cur; - int cell_next; - int cell_overlap; - int block; - int pack_len; - int next_vobu; - int in_cell; - int in_sync; - uint16_t cur_vob_id; - uint8_t cur_cell_id; + hb_dvdread_init, + hb_dvdread_close, + hb_dvdread_name, + hb_dvdread_title_count, + hb_dvdread_title_scan, + hb_dvdread_start, + hb_dvdread_stop, + hb_dvdread_seek, + hb_dvdread_read, + hb_dvdread_chapter, + hb_dvdread_angle_count, + hb_dvdread_set_angle }; +static hb_dvd_func_t *dvd_methods = &hb_dvdread_func; + /*********************************************************************** * Local prototypes **********************************************************************/ -static void FindNextCell( hb_dvd_t * ); +static void FindNextCell( hb_dvdread_t * ); static int dvdtime2msec( dvd_time_t * ); +static int hb_dvdread_is_break( hb_dvdread_t * d ); -char * hb_dvd_name( char * path ) +hb_dvd_func_t * hb_dvdread_methods( void ) +{ + return &hb_dvdread_func; +} + +static char * hb_dvdread_name( char * path ) { static char name[1024]; unsigned char unused[1024]; @@ -70,15 +79,28 @@ char * hb_dvd_name( char * path ) } /*********************************************************************** - * hb_dvd_init + * hb_dvdread_init *********************************************************************** * **********************************************************************/ -hb_dvd_t * hb_dvd_init( char * path ) +hb_dvd_t * hb_dvdread_init( char * path ) { - hb_dvd_t * d; + hb_dvd_t * e; + hb_dvdread_t * d; + int region_mask; - d = calloc( sizeof( hb_dvd_t ), 1 ); + e = calloc( sizeof( hb_dvd_t ), 1 ); + d = &(e->dvdread); + + /* Log DVD drive region code */ + if ( hb_dvd_region( path, ®ion_mask ) == 0 ) + { + hb_log( "dvd: Region mask 0x%02x", region_mask ); + if ( region_mask == 0xFF ) + { + hb_log( "dvd: Warning, DVD device has no region set" ); + } + } /* Open device */ if( !( d->reader = DVDOpen( path ) ) ) @@ -99,7 +121,7 @@ hb_dvd_t * hb_dvd_init( char * path ) d->path = strdup( path ); - return d; + return e; fail: if( d->vmg ) ifoClose( d->vmg ); @@ -109,19 +131,21 @@ fail: } /*********************************************************************** - * hb_dvd_title_count + * hb_dvdread_title_count **********************************************************************/ -int hb_dvd_title_count( hb_dvd_t * d ) +static int hb_dvdread_title_count( hb_dvd_t * e ) { + hb_dvdread_t *d = &(e->dvdread); return d->vmg->tt_srpt->nr_of_srpts; } /*********************************************************************** - * hb_dvd_title_scan + * hb_dvdread_title_scan **********************************************************************/ -hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) +static hb_title_t * hb_dvdread_title_scan( hb_dvd_t * e, int t ) { + hb_dvdread_t *d = &(e->dvdread); hb_title_t * title; ifo_handle_t * vts = NULL; int pgc_id, pgn, i; @@ -165,20 +189,61 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) goto fail; } + /* ignore titles with bogus cell addresses so we don't abort later + * in libdvdread. */ + for ( i = 0; i < vts->vts_c_adt->nr_of_vobs; ++i) + { + if( (vts->vts_c_adt->cell_adr_table[i].start_sector & 0xffffff ) == + 0xffffff ) + { + hb_error( "scan: cell_adr_table[%d].start_sector invalid (0x%x) " + "- skipping title", i, + vts->vts_c_adt->cell_adr_table[i].start_sector ); + goto fail; + } + if( (vts->vts_c_adt->cell_adr_table[i].last_sector & 0xffffff ) == + 0xffffff ) + { + hb_error( "scan: cell_adr_table[%d].last_sector invalid (0x%x) " + "- skipping title", i, + vts->vts_c_adt->cell_adr_table[i].last_sector ); + goto fail; + } + if( vts->vts_c_adt->cell_adr_table[i].start_sector >= + vts->vts_c_adt->cell_adr_table[i].last_sector ) + { + hb_error( "scan: cell_adr_table[%d].start_sector (0x%x) " + "is not before last_sector (0x%x) - skipping title", i, + vts->vts_c_adt->cell_adr_table[i].start_sector, + vts->vts_c_adt->cell_adr_table[i].last_sector ); + goto fail; + } + } + if( global_verbosity_level == 3 ) { - ifoPrint( d->reader, title->vts ); + ifo_print( d->reader, title->vts ); } /* Position of the title in the VTS */ title->ttn = d->vmg->tt_srpt->title[t-1].vts_ttn; + if ( title->ttn < 1 || title->ttn > vts->vts_ptt_srpt->nr_of_srpts ) + { + hb_error( "invalid VTS PTT offset %d for title %d, skipping", title->ttn, t ); + goto fail; + } /* Get pgc */ pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgcn; + if ( pgc_id < 1 || pgc_id > vts->vts_pgcit->nr_of_pgci_srp ) + { + hb_error( "invalid PGC ID %d for title %d, skipping", pgc_id, t ); + 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); + hb_log("pgc_id: %d, pgn: %d: pgc: %p", pgc_id, pgn, d->pgc); if( !d->pgc ) { @@ -222,7 +287,7 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) title->hours = title->duration / 90000 / 3600; title->minutes = ( ( title->duration / 90000 ) % 3600 ) / 60; title->seconds = ( title->duration / 90000 ) % 60; - hb_log( "scan: duration is %02d:%02d:%02d (%lld ms)", + hb_log( "scan: duration is %02d:%02d:%02d (%"PRId64" ms)", title->hours, title->minutes, title->seconds, title->duration / 90 ); @@ -235,37 +300,6 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) goto fail; } - /* ignore titles with bogus cell addresses so we don't abort later - * in libdvdread. */ - for ( i = 0; i < vts->vts_c_adt->nr_of_vobs; ++i) - { - if( (vts->vts_c_adt->cell_adr_table[i].start_sector & 0xffffff ) == - 0xffffff ) - { - hb_error( "scan: cell_adr_table[%d].start_sector invalid (0x%x) " - "- skipping title", i, - vts->vts_c_adt->cell_adr_table[i].start_sector ); - goto fail; - } - if( (vts->vts_c_adt->cell_adr_table[i].last_sector & 0xffffff ) == - 0xffffff ) - { - hb_error( "scan: cell_adr_table[%d].last_sector invalid (0x%x) " - "- skipping title", i, - vts->vts_c_adt->cell_adr_table[i].last_sector ); - goto fail; - } - if( vts->vts_c_adt->cell_adr_table[i].start_sector >= - vts->vts_c_adt->cell_adr_table[i].last_sector ) - { - hb_error( "scan: cell_adr_table[%d].start_sector (0x%x) " - "is not before last_sector (0x%x) - skipping title", i, - vts->vts_c_adt->cell_adr_table[i].start_sector, - vts->vts_c_adt->cell_adr_table[i].last_sector ); - goto fail; - } - } - /* Detect languages */ for( i = 0; i < vts->vtsi_mat->nr_of_vts_audio_streams; i++ ) { @@ -387,12 +421,6 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) 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, vts->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette, 16 * sizeof( uint32_t ) ); @@ -441,11 +469,15 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) lang = lang_for_code( vts->vtsi_mat->vts_subp_attr[i].lang_code ); subtitle = calloc( sizeof( hb_subtitle_t ), 1 ); + subtitle->track = i+1; subtitle->id = ( ( 0x20 + position ) << 8 ) | 0xbd; snprintf( subtitle->lang, sizeof( subtitle->lang ), "%s", strlen(lang->native_name) ? lang->native_name : lang->eng_name); snprintf( subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s", lang->iso639_2); + subtitle->format = PICTURESUB; + subtitle->source = VOBSUB; + subtitle->config.dest = RENDERSUB; // By default render (burn-in) the VOBSUB. subtitle->type = lang_extension; @@ -507,9 +539,6 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) for( i = 0, c = 1; i < vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts; i++ ) { - int pgc_id_next, pgn_next; - pgc_t * pgc_next; - chapter = calloc( sizeof( hb_chapter_t ), 1 ); /* remember the on-disc chapter number */ chapter->index = i + 1; @@ -523,34 +552,20 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) chapter->block_start = d->pgc->cell_playback[chapter->cell_start].first_sector; - /* End cell */ - if( i != vts->vts_ptt_srpt->title[title->ttn-1].nr_of_ptts - 1 ) + // if there are no more programs in this pgc, the end cell is the + // last cell. Otherwise it's the cell before the start cell of the + // next program. + if ( pgn == d->pgc->nr_of_programs ) { - /* The cell before the starting cell of the next chapter, - or... */ - pgc_id_next = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i+1].pgcn; - pgn_next = vts->vts_ptt_srpt->title[title->ttn-1].ptt[i+1].pgn; - pgc_next = vts->vts_pgcit->pgci_srp[pgc_id_next-1].pgc; - chapter->cell_end = pgc_next->program_map[pgn_next-1] - 2; - if( chapter->cell_end < 0 ) - { - /* Huh? */ - free( chapter ); - continue; - } + chapter->cell_end = d->pgc->nr_of_cells - 1; } else { - /* ... the last cell of the title */ - chapter->cell_end = title->cell_end; + chapter->cell_end = d->pgc->program_map[pgn] - 2;; } - chapter->block_end = - d->pgc->cell_playback[chapter->cell_end].last_sector; + chapter->block_end = d->pgc->cell_playback[chapter->cell_end].last_sector; /* Block count, duration */ - pgc_id = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgcn; - pgn = vts->vts_ptt_srpt->title[title->ttn-1].ptt[0].pgn; - d->pgc = vts->vts_pgcit->pgci_srp[pgc_id-1].pgc; chapter->block_count = 0; chapter->duration = 0; @@ -587,7 +602,7 @@ hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) chapter->minutes = ( seconds % 3600 ) / 60; chapter->seconds = seconds % 60; - hb_log( "scan: chap %d c=%d->%d, b=%d->%d (%d), %lld ms", + hb_log( "scan: chap %d c=%d->%d, b=%d->%d (%d), %"PRId64" ms", chapter->index, chapter->cell_start, chapter->cell_end, chapter->block_start, chapter->block_end, chapter->block_count, chapter->duration / 90 ); @@ -625,18 +640,20 @@ cleanup: } /*********************************************************************** - * hb_dvd_start + * hb_dvdread_start *********************************************************************** * Title and chapter start at 1 **********************************************************************/ -int hb_dvd_start( hb_dvd_t * d, int title, int chapter ) +static int hb_dvdread_start( hb_dvd_t * e, hb_title_t *title, int chapter ) { + hb_dvdread_t *d = &(e->dvdread); int pgc_id, pgn; int i; + int t = title->index; /* Open the IFO and the VOBs for this title */ - d->vts = d->vmg->tt_srpt->title[title-1].title_set_nr; - d->ttn = d->vmg->tt_srpt->title[title-1].vts_ttn; + d->vts = d->vmg->tt_srpt->title[t-1].title_set_nr; + d->ttn = d->vmg->tt_srpt->title[t-1].vts_ttn; if( !( d->ifo = ifoOpen( d->reader, d->vts ) ) ) { hb_error( "dvd: ifoOpen failed for VTS %d", d->vts ); @@ -686,12 +703,13 @@ int hb_dvd_start( hb_dvd_t * d, int title, int chapter ) } /*********************************************************************** - * hb_dvd_stop + * hb_dvdread_stop *********************************************************************** * **********************************************************************/ -void hb_dvd_stop( hb_dvd_t * d ) +static void hb_dvdread_stop( hb_dvd_t * e ) { + hb_dvdread_t *d = &(e->dvdread); if( d->ifo ) { ifoClose( d->ifo ); @@ -705,12 +723,13 @@ void hb_dvd_stop( hb_dvd_t * d ) } /*********************************************************************** - * hb_dvd_seek + * hb_dvdread_seek *********************************************************************** * **********************************************************************/ -int hb_dvd_seek( hb_dvd_t * d, float f ) +static int hb_dvdread_seek( hb_dvd_t * e, float f ) { + hb_dvdread_t *d = &(e->dvdread); int count, sizeCell; int i; @@ -727,7 +746,7 @@ int hb_dvd_seek( hb_dvd_t * d, float f ) d->cur_cell_id = 0; FindNextCell( d ); - /* Now let hb_dvd_read find the next VOBU */ + /* Now let hb_dvdread_read find the next VOBU */ d->next_vobu = d->pgc->cell_playback[i].first_sector + count; d->pack_len = 0; break; @@ -795,12 +814,13 @@ int is_nav_pack( unsigned char *buf ) /*********************************************************************** - * hb_dvd_read + * hb_dvdread_read *********************************************************************** * **********************************************************************/ -int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b ) +static int hb_dvdread_read( hb_dvd_t * e, hb_buffer_t * b ) { + hb_dvdread_t *d = &(e->dvdread); top: if( !d->pack_len ) { @@ -1002,7 +1022,7 @@ int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b ) if( d->cell_overlap ) { - b->new_chap = hb_dvd_is_break( d ); + b->new_chap = hb_dvdread_is_break( d ); d->cell_overlap = 0; } } @@ -1046,13 +1066,14 @@ int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b ) } /*********************************************************************** - * hb_dvd_chapter + * hb_dvdread_chapter *********************************************************************** * Returns in which chapter the next block to be read is. * Chapter numbers start at 1. **********************************************************************/ -int hb_dvd_chapter( hb_dvd_t * d ) +static int hb_dvdread_chapter( hb_dvd_t * e ) { + hb_dvdread_t *d = &(e->dvdread); int i; int pgc_id, pgn; int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts; @@ -1080,15 +1101,15 @@ int hb_dvd_chapter( hb_dvd_t * d ) } /*********************************************************************** - * hb_dvd_is_break + * hb_dvdread_is_break *********************************************************************** * Returns chapter number if the current block is a new chapter start **********************************************************************/ -int hb_dvd_is_break( hb_dvd_t * d ) +static int hb_dvdread_is_break( hb_dvdread_t * d ) { int i; int pgc_id, pgn; - int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts; + int nr_of_ptts = d->ifo->vts_ptt_srpt->title[d->ttn-1].nr_of_ptts; pgc_t * pgc; int cell; @@ -1116,13 +1137,13 @@ int hb_dvd_is_break( hb_dvd_t * d ) } /*********************************************************************** - * hb_dvd_close + * hb_dvdread_close *********************************************************************** * Closes and frees everything **********************************************************************/ -void hb_dvd_close( hb_dvd_t ** _d ) +static void hb_dvdread_close( hb_dvd_t ** _d ) { - hb_dvd_t * d = *_d; + hb_dvdread_t * d = &((*_d)->dvdread); if( d->vmg ) { @@ -1138,12 +1159,32 @@ void hb_dvd_close( hb_dvd_t ** _d ) } /*********************************************************************** + * hb_dvdread_angle_count + *********************************************************************** + * Returns the number of angles supported. We do not support angles + * with dvdread + **********************************************************************/ +static int hb_dvdread_angle_count( hb_dvd_t * d ) +{ + return 1; +} + +/*********************************************************************** + * hb_dvdread_set_angle + *********************************************************************** + * Sets the angle to read. Not supported with dvdread + **********************************************************************/ +static void hb_dvdread_set_angle( hb_dvd_t * d, int angle ) +{ +} + +/*********************************************************************** * FindNextCell *********************************************************************** * Assumes pgc and cell_cur are correctly set, and sets cell_next to the * cell to be read when we will be done with cell_cur. **********************************************************************/ -static void FindNextCell( hb_dvd_t * d ) +static void FindNextCell( hb_dvdread_t * d ) { int i = 0; @@ -1189,3 +1230,74 @@ static int dvdtime2msec(dvd_time_t * dt) return ms; } + +char * hb_dvd_name( char * path ) +{ + return dvd_methods->name(path); +} + +hb_dvd_t * hb_dvd_init( char * path ) +{ + return dvd_methods->init(path); +} + +int hb_dvd_title_count( hb_dvd_t * d ) +{ + return dvd_methods->title_count(d); +} + +hb_title_t * hb_dvd_title_scan( hb_dvd_t * d, int t ) +{ + return dvd_methods->title_scan(d, t); +} + +int hb_dvd_start( hb_dvd_t * d, hb_title_t *title, int chapter ) +{ + return dvd_methods->start(d, title, chapter); +} + +void hb_dvd_stop( hb_dvd_t * d ) +{ + dvd_methods->stop(d); +} + +int hb_dvd_seek( hb_dvd_t * d, float f ) +{ + return dvd_methods->seek(d, f); +} + +int hb_dvd_read( hb_dvd_t * d, hb_buffer_t * b ) +{ + return dvd_methods->read(d, b); +} + +int hb_dvd_chapter( hb_dvd_t * d ) +{ + return dvd_methods->chapter(d); +} + +void hb_dvd_close( hb_dvd_t ** _d ) +{ + dvd_methods->close(_d); +} + +int hb_dvd_angle_count( hb_dvd_t * d ) +{ + return dvd_methods->angle_count(d); +} + +void hb_dvd_set_angle( hb_dvd_t * d, int angle ) +{ + dvd_methods->set_angle(d, angle); +} + +// hb_dvd_set_dvdnav must only be called when no dvd source is open +// it rips the rug out from under things so be careful +void hb_dvd_set_dvdnav( int enable ) +{ + if (enable) + dvd_methods = hb_dvdnav_methods(); + else + dvd_methods = hb_dvdread_methods(); +} +