X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdread.c;h=a918dc95589b5c0486705457ff7ae8fe59ba9793;hb=5ad6561ceab66b046b648e7651ed63c071d6012d;hp=562d5db9fc56135b520f2cb2b77c5ab79d048902;hpb=185dff3d91a9c3ad09db7ac82b5f0e0cd8febb74;p=vlc diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 562d5db9fc..a918dc9558 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -1,10 +1,10 @@ /***************************************************************************** * dvdread.c : DvdRead input module for vlc ***************************************************************************** - * Copyright (C) 2001-2004 VideoLAN + * Copyright (C) 2001-2006 the VideoLAN team * $Id$ * - * Authors: Stéphane Borel + * Authors: Stéphane Borel * Gildas Bazin * * This program is free software; you can redistribute it and/or modify @@ -19,20 +19,26 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include /* malloc(), free() */ -#include /* strdup() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include -#include "iso_lang.h" +#include + +#include #include "../demux/ps.h" @@ -43,21 +49,34 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#ifdef HAVE_DVDREAD_DVD_READER_H + #include + #include + #include + #include + #include +#else + #include + #include + #include + #include + #include +#endif + +#include /***************************************************************************** * Module descriptor *****************************************************************************/ -#define CACHING_TEXT N_("caching value in ms") +#define ANGLE_TEXT N_("DVD angle") +#define ANGLE_LONGTEXT N_( \ + "Default DVD angle." ) + +#define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for DVDread streams. " \ - "This value should be set in millisecond units." ) + "Caching value for DVDs. " \ + "This value should be set in milliseconds." ) #define CSSMETHOD_TEXT N_("Method used by libdvdcss for decryption") #define CSSMETHOD_LONGTEXT N_( \ @@ -76,21 +95,26 @@ "libcss.\n" \ "The default method is: key.") -static char *psz_css_list[] = { "title", "disc", "key" }; -static char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") }; +static const char *const psz_css_list[] = { "title", "disc", "key" }; +static const char *const psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") }; static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("DVDRead Input") ); + set_shortname( N_("DVD without menus") ); + set_description( N_("DVDRead Input (DVD without menu support)") ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT, + ANGLE_LONGTEXT, false ); add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT, - CSSMETHOD_LONGTEXT, VLC_TRUE ); + CSSMETHOD_LONGTEXT, true ); change_string_list( psz_css_list, psz_css_list_text, 0 ); set_capability( "access_demux", 0 ); - //add_shortcut( "dvd" ); + add_shortcut( "dvd" ); add_shortcut( "dvdread" ); add_shortcut( "dvdsimple" ); set_callbacks( Open, Close ); @@ -118,58 +142,47 @@ struct demux_sys_t tt_srpt_t *p_tt_srpt; pgc_t *p_cur_pgc; - dsi_t dsi_pack; - int i_ttn; int i_pack_len; int i_cur_block; int i_next_vobu; + int i_mux_rate; + /* Current title start/end blocks */ int i_title_start_block; int i_title_end_block; int i_title_blocks; int i_title_offset; + mtime_t i_title_cur_time; int i_title_start_cell; int i_title_end_cell; int i_cur_cell; int i_next_cell; + mtime_t i_cell_cur_time; + mtime_t i_cell_duration; - /* track */ - ps_track_t tk[PS_TK_COUNT]; + /* Track */ + ps_track_t tk[PS_TK_COUNT]; - /* for spu variables */ - input_thread_t *p_input; - - /* FIXME */ - uint8_t alpha[4]; - uint32_t clut[16]; + int i_titles; + input_title_t **titles; - /* */ + /* Video */ int i_aspect; - int i_titles; - input_title_t **titles; + /* SPU */ + uint32_t clut[16]; }; -static char *ParseCL( vlc_object_t *, char *, vlc_bool_t, int *, int *, int *); - static int Control ( demux_t *, int, va_list ); static int Demux ( demux_t * ); static int DemuxBlock( demux_t *, uint8_t *, int ); -enum -{ - AR_SQUARE_PICTURE = 1, /* square pixels */ - AR_3_4_PICTURE = 2, /* 3:4 picture (TV) */ - AR_16_9_PICTURE = 3, /* 16:9 picture (wide screen) */ - AR_221_1_PICTURE = 4, /* 2.21:1 picture (movie) */ -}; - -static void DemuxTitles( demux_t *, int *, int *, int * ); +static void DemuxTitles( demux_t *, int * ); static void ESNew( demux_t *, int, int ); static int DvdReadSetArea ( demux_t *, int, int, int ); @@ -184,45 +197,59 @@ static int Open( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - int i_title, i_chapter, i_angle; char *psz_name; char *psz_dvdcss_env; dvd_reader_t *p_dvdread; ifo_handle_t *p_vmg_file; + vlc_value_t val; - psz_name = ParseCL( VLC_OBJECT(p_demux), p_demux->psz_path, VLC_TRUE, - &i_title, &i_chapter, &i_angle ); - if( !psz_name ) + if( !p_demux->psz_path || !*p_demux->psz_path ) { - return VLC_EGENERIC; + /* Only when selected */ + if( !p_this->b_force ) return VLC_EGENERIC; + + psz_name = var_CreateGetString( p_this, "dvd" ); + if( !psz_name ) + { + psz_name = strdup(""); + } } + else + psz_name = ToLocaleDup( p_demux->psz_path ); + +#ifdef WIN32 + if( psz_name[0] && psz_name[1] == ':' && + psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0'; +#endif - /* Override environment variable DVDCSS_METHOD with config option - * (FIXME: this creates a small memory leak) */ + /* Override environment variable DVDCSS_METHOD with config option */ psz_dvdcss_env = config_GetPsz( p_demux, "dvdread-css-method" ); if( psz_dvdcss_env && *psz_dvdcss_env ) +#ifdef HAVE_SETENV + setenv( "DVDCSS_METHOD", psz_dvdcss_env, 1 ); +#else { + /* FIXME: this create a small memory leak */ char *psz_env; - psz_env = malloc( strlen("DVDCSS_METHOD=") + strlen( psz_dvdcss_env ) + 1 ); - if( !psz_env ) { free( psz_dvdcss_env ); return VLC_ENOMEM; } - sprintf( psz_env, "%s%s", "DVDCSS_METHOD=", psz_dvdcss_env ); - putenv( psz_env ); } - if( psz_dvdcss_env ) free( psz_dvdcss_env ); +#endif + free( psz_dvdcss_env ); /* Open dvdread */ if( !(p_dvdread = DVDOpen( psz_name )) ) { msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name ); + intf_UserFatal( p_demux, false, _("Playback failure"), + _("DVDRead could not open the disk \"%s\"."), psz_name ); free( psz_name ); return VLC_EGENERIC; } @@ -237,13 +264,13 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_demux, "VMG opened" ); /* Fill p_demux field */ - p_demux->pf_demux = Demux; - p_demux->pf_control = Control; - p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) ); - memset( p_sys, 0, sizeof( demux_sys_t ) ); + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; ps_track_init( p_sys->tk ); p_sys->i_aspect = -1; + p_sys->i_title_cur_time = (mtime_t) 0; + p_sys->i_cell_cur_time = (mtime_t) 0; + p_sys->i_cell_duration = (mtime_t) 0; p_sys->p_dvdread = p_dvdread; p_sys->p_vmg_file = p_vmg_file; @@ -251,11 +278,20 @@ static int Open( vlc_object_t *p_this ) p_sys->p_vts_file = NULL; p_sys->i_title = p_sys->i_chapter = -1; - p_sys->i_angle = i_angle; + p_sys->i_mux_rate = 0; - DemuxTitles( p_demux, &i_title, &i_chapter, &i_angle ); + var_Create( p_demux, "dvdread-angle", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); + var_Get( p_demux, "dvdread-angle", &val ); + p_sys->i_angle = val.i_int > 0 ? val.i_int : 1; - DvdReadSetArea( p_demux, i_title, i_chapter, i_angle ); + DemuxTitles( p_demux, &p_sys->i_angle ); + if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS ) + { + Close( p_this ); + msg_Err( p_demux, "DvdReadSetArea(0,0,%i) failed (can't decrypt DVD?)", + p_sys->i_angle ); + return VLC_EGENERIC; + } /* Update default_pts to a suitable value for dvdread access */ var_Create( p_demux, "dvdread-caching", @@ -292,6 +328,44 @@ static void Close( vlc_object_t *p_this ) free( p_sys ); } +static int64_t dvdtime_to_time( dvd_time_t *dtime, uint8_t still_time ) +{ +/* Macro to convert Binary Coded Decimal to Decimal */ +#define BCD2D(__x__) (((__x__ & 0xf0) >> 4) * 10 + (__x__ & 0x0f)) + + double f_fps, f_ms; + int64_t i_micro_second = 0; + + if (still_time == 0 || still_time == 0xFF) + { + i_micro_second += (int64_t)(BCD2D(dtime->hour)) * 60 * 60 * 1000000; + i_micro_second += (int64_t)(BCD2D(dtime->minute)) * 60 * 1000000; + i_micro_second += (int64_t)(BCD2D(dtime->second)) * 1000000; + + switch((dtime->frame_u & 0xc0) >> 6) + { + case 1: + f_fps = 25.0; + break; + case 3: + f_fps = 29.97; + break; + default: + f_fps = 2500.0; + break; + } + f_ms = BCD2D(dtime->frame_u&0x3f) * 1000.0 / f_fps; + i_micro_second += (int64_t)(f_ms * 1000.0); + } + else + { + i_micro_second = still_time; + i_micro_second = (int64_t)((double)i_micro_second * 1000000.0); + } + + return i_micro_second; +} + /***************************************************************************** * Control: *****************************************************************************/ @@ -299,7 +373,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) { demux_sys_t *p_sys = p_demux->p_sys; double f, *pf; - vlc_bool_t *pb; + bool *pb; int64_t *pi64; input_title_t ***ppp_title; int *pi_int; @@ -326,13 +400,34 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) return VLC_SUCCESS; } + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles ) + { + *pi64 = (int64_t) dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ) / + p_sys->i_title_blocks * p_sys->i_title_offset; + return VLC_SUCCESS; + } + *pi64 = 0; + return VLC_EGENERIC; + + case DEMUX_GET_LENGTH: + pi64 = (int64_t*)va_arg( args, int64_t * ); + if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles ) + { + *pi64 = (int64_t)dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ); + return VLC_SUCCESS; + } + *pi64 = 0; + return VLC_EGENERIC; /* Special for access_demux */ case DEMUX_CAN_PAUSE: + case DEMUX_CAN_SEEK: case DEMUX_CAN_CONTROL_PACE: /* TODO */ - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - *pb = VLC_TRUE; + pb = (bool*)va_arg( args, bool * ); + *pb = true; return VLC_SUCCESS; case DEMUX_SET_PAUSE_STATE: @@ -341,6 +436,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_TITLE_INFO: ppp_title = (input_title_t***)va_arg( args, input_title_t*** ); pi_int = (int*)va_arg( args, int* ); + *((int*)va_arg( args, int* )) = 1; /* Title offset */ + *((int*)va_arg( args, int* )) = 1; /* Chapter offset */ /* Duplicate title infos */ *pi_int = p_sys->i_titles; @@ -411,6 +508,9 @@ static int Demux( demux_t *p_demux ) 1, p_buffer ) != 1 ) { msg_Err( p_demux, "read failed for block %d", p_sys->i_next_vobu ); + intf_UserWarn( p_demux, _("Playback failure"), + _("DVDRead could not read block %d."), + p_sys->i_next_vobu ); return -1; } @@ -422,16 +522,20 @@ static int Demux( demux_t *p_demux ) DvdReadHandleDSI( p_demux, p_buffer ); /* End of title */ - if( p_sys->i_next_vobu > p_sys->i_title_end_block ) + if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells ) { - if( p_sys->i_title + 1 >= p_sys->i_titles ) return 0; /* EOF */ + if( p_sys->i_title + 1 >= p_sys->i_titles ) + { + return 0; /* EOF */ + } DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 ); } if( p_sys->i_pack_len >= 1024 ) { - msg_Err( p_demux, "i_pack_len >= 1024. This shouldn't happen!" ); + msg_Err( p_demux, "i_pack_len >= 1024 (%i). " + "This shouldn't happen!", p_sys->i_pack_len ); return 0; /* EOF */ } @@ -443,9 +547,12 @@ static int Demux( demux_t *p_demux ) DemuxBlock( p_demux, p_buffer, DVD_VIDEO_LB_LEN ); } - if( p_sys->i_cur_block > p_sys->i_title_end_block ) + if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells ) { - if( p_sys->i_title + 1 >= p_sys->i_titles ) return 0; /* EOF */ + if( p_sys->i_title + 1 >= p_sys->i_titles ) + { + return 0; /* EOF */ + } DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 ); } @@ -463,6 +570,9 @@ static int Demux( demux_t *p_demux ) { msg_Err( p_demux, "read failed for %d/%d blocks at 0x%02x", i_read, i_blocks_once, p_sys->i_cur_block ); + intf_UserFatal( p_demux, false, _("Playback failure"), + _("DVDRead could not read %d/%d blocks at 0x%02x."), + i_read, i_blocks_once, p_sys->i_cur_block ); return -1; } @@ -533,6 +643,7 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt ) if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) ) { es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr ); + if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate; } block_Release( p_pkt ); break; @@ -583,7 +694,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) if( tk->b_seen ) return; - if( ps_track_fill( tk, i_id ) ) + if( ps_track_fill( tk, 0, i_id ) ) { msg_Warn( p_demux, "unknown codec for id=0x%x", i_id ); return; @@ -638,7 +749,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) } tk->es = es_out_Add( p_demux->out, &tk->fmt ); - tk->b_seen = VLC_TRUE; + tk->b_seen = true; } /***************************************************************************** @@ -769,7 +880,7 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter, es_format_Clean( &tk->fmt ); if( tk->es ) es_out_Del( p_demux->out, tk->es ); } - tk->b_seen = VLC_FALSE; + tk->b_seen = false; } if( p_demux->info.i_title != i_title ) @@ -830,6 +941,11 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter, } #undef audio_control +#define spu_palette \ + p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette + + memcpy( p_sys->clut, spu_palette, 16 * sizeof( uint32_t ) ); + #define spu_control \ p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->subp_control[i-1] @@ -886,7 +1002,7 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter, * Chapter selection */ - if( i_chapter >= 0 && i_chapter <= p_sys->i_chapters ) + if( i_chapter >= 0 && i_chapter < p_sys->i_chapters ) { pgc_id = p_vts->vts_ptt_srpt->title[ p_sys->i_ttn - 1].ptt[i_chapter].pgcn; @@ -1037,6 +1153,13 @@ static void DvdReadHandleDSI( demux_t *p_demux, uint8_t *p_data ) * care about. */ p_sys->i_cur_block = p_sys->dsi_pack.dsi_gi.nv_pck_lbn; + p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea; + + /* + * Store the timecodes so we can get the current time + */ + p_sys->i_title_cur_time = (mtime_t) (p_sys->dsi_pack.dsi_gi.nv_pck_scr / 90 * 1000); + p_sys->i_cell_cur_time = (mtime_t) dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ); /* * If we're not at the end of this cell, we can determine the next @@ -1045,7 +1168,12 @@ static void DvdReadHandleDSI( demux_t *p_demux, uint8_t *p_data ) * avoiding the doubled scenes in The Matrix, and makes our life * really happy. */ - if( p_sys->dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL ) + + p_sys->i_next_vobu = p_sys->i_cur_block + + ( p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff ); + + if( p_sys->dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL + && p_sys->i_angle > 1 ) { switch( ( p_sys->dsi_pack.sml_pbi.category & 0xf000 ) >> 12 ) { @@ -1061,7 +1189,6 @@ static void DvdReadHandleDSI( demux_t *p_demux, uint8_t *p_data ) { p_sys->i_next_vobu = p_sys->i_cur_block + p_sys->dsi_pack.dsi_gi.vobu_ea + 1; - p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea; } break; case 0x5: @@ -1085,35 +1212,44 @@ static void DvdReadHandleDSI( demux_t *p_demux, uint8_t *p_data ) default: p_sys->i_next_vobu = p_sys->i_cur_block + ( p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff ); - p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea; break; } } - else + else if( p_sys->dsi_pack.vobu_sri.next_vobu == SRI_END_OF_CELL ) { p_sys->i_cur_cell = p_sys->i_next_cell; + + /* End of title */ + if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells ) return; + DvdReadFindCell( p_demux ); - p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea; p_sys->i_next_vobu = p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].first_sector; + + p_sys->i_cell_duration = (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ); } + #if 0 - msg_Dbg( p_input, 12, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d", + msg_Dbg( p_demux, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d c_time %lld", p_sys->dsi_pack.dsi_gi.nv_pck_scr, p_sys->dsi_pack.dsi_gi.nv_pck_lbn, p_sys->dsi_pack.dsi_gi.vobu_ea, p_sys->dsi_pack.dsi_gi.vobu_vob_idn, - p_sys->dsi_pack.dsi_gi.vobu_c_idn ); + p_sys->dsi_pack.dsi_gi.vobu_c_idn, + dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ) ); + + msg_Dbg( p_demux, "cell duration: %lld", + (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ) ); - msg_Dbg( p_input, 12, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d", + msg_Dbg( p_demux, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d", p_sys->dsi_pack.sml_pbi.category, p_sys->dsi_pack.sml_pbi.ilvu_ea, p_sys->dsi_pack.sml_pbi.ilvu_sa, p_sys->dsi_pack.sml_pbi.size ); - msg_Dbg( p_input, 12, "next_vobu %d next_ilvu1 %d next_ilvu2 %d", + msg_Dbg( p_demux, "next_vobu %d next_ilvu1 %d next_ilvu2 %d", p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff, p_sys->dsi_pack.sml_agli.data[ p_sys->i_angle - 1 ].address, p_sys->dsi_pack.sml_agli.data[ p_sys->i_angle ].address); @@ -1135,10 +1271,6 @@ static void DvdReadFindCell( demux_t *p_demux ) if( cell[p_sys->i_cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK ) { -#if 0 - p_sys->i_next_cell = p_sys->i_cur_cell + p_sys->i_angle_nb; - p_sys->i_cur_cell += p_sys->i_angle - 1; -#else p_sys->i_cur_cell += p_sys->i_angle - 1; while( cell[p_sys->i_cur_cell+i].block_mode != BLOCK_MODE_LAST_CELL ) @@ -1146,7 +1278,6 @@ static void DvdReadFindCell( demux_t *p_demux ) i++; } p_sys->i_next_cell = p_sys->i_cur_cell + i + 1; -#endif } else { @@ -1155,13 +1286,15 @@ static void DvdReadFindCell( demux_t *p_demux ) #undef cell + if( p_sys->i_chapter + 1 >= p_sys->i_chapters ) return; + pgc_id = p_sys->p_vts_file->vts_ptt_srpt->title[ - p_sys->i_ttn - 1].ptt[p_sys->i_chapter].pgcn; + p_sys->i_ttn - 1].ptt[p_sys->i_chapter + 1].pgcn; pgn = p_sys->p_vts_file->vts_ptt_srpt->title[ - p_sys->i_ttn - 1].ptt[p_sys->i_chapter].pgn; + p_sys->i_ttn - 1].ptt[p_sys->i_chapter + 1].pgn; p_pgc = p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id - 1].pgc; - if( p_pgc->program_map[pgn - 1] <= p_sys->i_cur_cell ) + if( p_sys->i_cur_cell >= p_pgc->program_map[pgn - 1] - 1 ) { p_sys->i_chapter++; @@ -1177,8 +1310,7 @@ static void DvdReadFindCell( demux_t *p_demux ) /***************************************************************************** * DemuxTitles: get the titles/chapters structure *****************************************************************************/ -static void DemuxTitles( demux_t *p_demux, - int *pi_title, int *pi_chapter, int *pi_angle ) +static void DemuxTitles( demux_t *p_demux, int *pi_angle ) { demux_sys_t *p_sys = p_demux->p_sys; input_title_t *t; @@ -1201,97 +1333,15 @@ static void DemuxTitles( demux_t *p_demux, msg_Dbg( p_demux, "title %d has %d chapters", i, i_chapters ); t = vlc_input_title_New(); - t->psz_name = malloc( strlen( _("Title %i") ) + 20 ); - sprintf( t->psz_name, _("Title %i"), i + 1 ); for( j = 0; j < __MAX( i_chapters, 1 ); j++ ) { s = vlc_seekpoint_New(); - s->psz_name = malloc( strlen( _("Chapter %i") ) + 20 ); - sprintf( s->psz_name, _("Chapter %i"), j + 1 ); TAB_APPEND( t->i_seekpoint, t->seekpoint, s ); } TAB_APPEND( p_sys->i_titles, p_sys->titles, t ); } - /* Set forced title/chapter/angle */ - *pi_title = (*pi_title >= 0 && *pi_title < i_titles) ? *pi_title : 0; - *pi_chapter = (*pi_chapter >= 0 && *pi_chapter < - tt_srpt->title[*pi_title].nr_of_ptts) ? *pi_chapter : 0; - #undef tt_srpt } - -/***************************************************************************** - * ParseCL: parse command line. Titles, chapters and angles start from 1. - *****************************************************************************/ -static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force, - int *i_title, int *i_chapter, int *i_angle ) -{ - char *psz_parser, *psz_source, *psz_next; - - psz_source = strdup( psz_name ); - if( psz_source == NULL ) return NULL; - - *i_title = 1; - *i_chapter = 1; - *i_angle = 1; - - /* Start with the end, because you could have : - * dvdnav:/Volumes/my@toto/VIDEO_TS@1,1 - * (yes, this is kludgy). */ - for( psz_parser = psz_source + strlen(psz_source) - 1; - psz_parser >= psz_source && *psz_parser != '@'; - psz_parser-- ); - - if( psz_parser >= psz_source && *psz_parser == '@' ) - { - /* Found options */ - *psz_parser = '\0'; - ++psz_parser; - - *i_title = (int)strtol( psz_parser, &psz_next, 10 ); - if( *psz_next ) - { - psz_parser = psz_next + 1; - *i_chapter = (int)strtol( psz_parser, &psz_next, 10 ); - if( *psz_next ) - { - *i_angle = (int)strtol( psz_next + 1, NULL, 10 ); - } - } - } - - *i_title = *i_title > 0 ? *i_title : 1; - *i_chapter = *i_chapter > 0 ? *i_chapter : 1; - *i_angle = *i_angle > 0 ? *i_angle : 1; - - if( !*psz_source ) - { - free( psz_source ); - if( !b_force ) - { - return NULL; - } - psz_source = config_GetPsz( p_this, "dvd" ); - if( !psz_source ) return NULL; - } - -#ifdef WIN32 - if( psz_source[0] && psz_source[1] == ':' && - psz_source[2] == '\\' && psz_source[3] == '\0' ) - { - psz_source[2] = '\0'; - } -#endif - - msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d", - psz_source, *i_title, *i_chapter, *i_angle ); - - /* Get back to a 0-based offset */ - (*i_title)--; - (*i_chapter)--; - - return psz_source; -}