X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdread.c;h=d56527937f96c36a5019c173b0299b1979cb5f8f;hb=1a459c1ccb0d617580ec97bae992f01a799a5e9b;hp=4eef5d82ed913b2695b34d740cebcaf75c3fabdc;hpb=7e5403d0e7b51043a008ad6d8c6a8f37adfe33e2;p=vlc diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 4eef5d82ed..d56527937f 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -48,19 +48,11 @@ #include -#ifdef HAVE_DVDREAD_DVD_READER_H - #include - #include - #include - #include - #include -#else - #include - #include - #include - #include - #include -#endif +#include +#include +#include +#include +#include #include @@ -71,11 +63,6 @@ #define ANGLE_LONGTEXT N_( \ "Default DVD angle." ) -#define CACHING_TEXT N_("Caching value in ms") -#define CACHING_LONGTEXT N_( \ - "Caching value for DVDs. " \ - "This value should be set in milliseconds." ) - static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); @@ -84,15 +71,11 @@ vlc_module_begin () set_description( N_("DVDRead Input (no menu support)") ) set_category( CAT_INPUT ) set_subcategory( SUBCAT_INPUT_ACCESS ) - add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT, + add_integer( "dvdread-angle", 1, ANGLE_TEXT, ANGLE_LONGTEXT, false ) - add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ) add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */ set_capability( "access_demux", 0 ) - add_shortcut( "dvd" ) - add_shortcut( "dvdread" ) - add_shortcut( "dvdsimple" ) + add_shortcut( "dvd", "dvdread", "dvdsimple" ) set_callbacks( Open, Close ) vlc_module_end () @@ -157,7 +140,7 @@ struct demux_sys_t static int Control ( demux_t *, int, va_list ); static int Demux ( demux_t * ); -static int DemuxBlock( demux_t *, uint8_t *, int ); +static int DemuxBlock( demux_t *, const uint8_t *, int ); static void DemuxTitles( demux_t *, int * ); static void ESNew( demux_t *, int, int ); @@ -174,40 +157,47 @@ static int Open( vlc_object_t *p_this ) { demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; - char *psz_name; - dvd_reader_t *p_dvdread; + char *psz_file; ifo_handle_t *p_vmg_file; - if( !p_demux->psz_path || !*p_demux->psz_path ) + if( !p_demux->psz_file || !*p_demux->psz_file ) { /* Only when selected */ if( !p_demux->psz_access || !*p_demux->psz_access ) return VLC_EGENERIC; - psz_name = var_CreateGetString( p_this, "dvd" ); - if( !psz_name ) - { - psz_name = strdup(""); - } + psz_file = var_InheritString( p_this, "dvd" ); } else - psz_name = ToLocaleDup( p_demux->psz_path ); + psz_file = strdup( p_demux->psz_file ); -#ifdef WIN32 - if( psz_name[0] && psz_name[1] == ':' && - psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0'; +#if defined( WIN32 ) || defined( __OS2__ ) + if( psz_file != NULL ) + { + size_t flen = strlen( psz_file ); + if( flen > 0 && psz_file[flen - 1] == '\\' ) + psz_file[flen - 1] = '\0'; + } + else + psz_file = strdup(""); #endif + if( unlikely(psz_file == NULL) ) + return VLC_EGENERIC; /* Open dvdread */ - if( !(p_dvdread = DVDOpen( psz_name )) ) + const char *psz_path = ToLocale( psz_file ); + dvd_reader_t *p_dvdread = DVDOpen( psz_path ); + + LocaleFree( psz_path ); + if( p_dvdread == NULL ) { - msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name ); + msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file ); dialog_Fatal( p_demux, _("Playback failure"), - _("DVDRead could not open the disc \"%s\"."), psz_name ); - free( psz_name ); + _("DVDRead could not open the disc \"%s\"."), psz_file ); + free( psz_file ); return VLC_EGENERIC; } - free( psz_name ); + free( psz_file ); /* Ifo allocation & initialisation */ if( !( p_vmg_file = ifoOpen( p_dvdread, 0 ) ) ) @@ -247,10 +237,6 @@ static int Open( vlc_object_t *p_this ) return VLC_EGENERIC; } - /* Update default_pts to a suitable value for dvdread access */ - var_Create( p_demux, "dvdread-caching", - VLC_VAR_INTEGER|VLC_VAR_DOINHERIT ); - return VLC_SUCCESS; } @@ -273,6 +259,11 @@ static void Close( vlc_object_t *p_this ) } } + /* Free the array of titles */ + for( int i = 0; i < p_sys->i_titles; i++ ) + vlc_input_title_Delete( p_sys->titles[i] ); + TAB_CLEAN( p_sys->i_titles, p_sys->titles ); + /* Close libdvdread */ if( p_sys->p_title ) DVDCloseFile( p_sys->p_title ); if( p_sys->p_vts_file ) ifoClose( p_sys->p_vts_file ); @@ -428,7 +419,8 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) case DEMUX_GET_PTS_DELAY: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = (int64_t)var_GetInteger( p_demux, "dvdread-caching" )*1000; + *pi64 = + INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" ); return VLC_SUCCESS; /* TODO implement others */ @@ -552,27 +544,20 @@ static int Demux( demux_t *p_demux ) /***************************************************************************** * DemuxBlock: demux a given block *****************************************************************************/ -static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt ) +static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len ) { demux_sys_t *p_sys = p_demux->p_sys; - uint8_t *p = pkt; - while( p && p < &pkt[i_pkt] ) + while( len > 0 ) { - block_t *p_pkt; - int i_size = &pkt[i_pkt] - p; - - if( i_size < 6 ) - break; - - i_size = ps_pkt_size( p, i_size ); - if( i_size <= 0 ) + int i_size = ps_pkt_size( p, len ); + if( i_size <= 0 || i_size > len ) { break; } /* Create a block */ - p_pkt = block_New( p_demux, i_size ); + block_t *p_pkt = block_New( p_demux, i_size ); memcpy( p_pkt->p_buffer, p, i_size); /* Parse it and send it */ @@ -637,6 +622,7 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt ) } p += i_size; + len -= i_size; } return VLC_SUCCESS; @@ -674,6 +660,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) } else if( tk->fmt.i_cat == AUDIO_ES ) { +#if 0 int i_audio = -1; /* find the audio number PLEASE find another way */ if( (i_id&0xbdf8) == 0xbd88 ) /* dts */ @@ -692,6 +679,7 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) { i_audio = i_id&0x1f; } +#endif if( psz_language[0] ) tk->fmt.psz_language = strdup( psz_language ); }