X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdread.c;h=5edf909fb868641d8822a3eea9bcb826f244c6fb;hb=c9e7c34b0feccc2f3f8a8afa047e6363bfcae6d5;hp=11e2a940b7439ad3fcac11edcdbb75a598a50330;hpb=13ae40b0efc4f1b1ce205d9a057537047fcab3f4;p=vlc diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c index 11e2a940b7..5edf909fb8 100644 --- a/modules/access/dvdread.c +++ b/modules/access/dvdread.c @@ -30,15 +30,15 @@ # include "config.h" #endif -#include +#include #include #include #include #include - #include +#include -#include "iso_lang.h" +#include #include "../demux/ps.h" @@ -46,15 +46,23 @@ # include #endif -#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 @@ -68,47 +76,23 @@ "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_( \ - "Set the method used by libdvdcss for key decryption.\n" \ - "title: decrypted title key is guessed from the encrypted sectors of " \ - "the stream. Thus it should work with a file as well as the " \ - "DVD device. But it sometimes takes much time to decrypt a title " \ - "key and may even fail. With this method, the key is only checked "\ - "at the beginning of each title, so it won't work if the key " \ - "changes in the middle of a title.\n" \ - "disc: the disc key is first cracked, then all title keys can be " \ - "decrypted instantly, which allows us to check them often.\n" \ - "key: the same as \"disc\" if you don't have a file with player keys " \ - "at compilation time. If you do, the decryption of the disc key " \ - "will be faster with this method. It is the one that was used by " \ - "libcss.\n" \ - "The default method is: key.") - -static const char *psz_css_list[] = { "title", "disc", "key" }; -static const char *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_shortname( N_("DVD without menus") ); - set_description( N_("DVDRead Input (DVD without menu support)") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); +vlc_module_begin () + set_shortname( N_("DVD without menus") ) + 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, - ANGLE_LONGTEXT, false ); + ANGLE_LONGTEXT, false ) add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, true ); - add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT, - CSSMETHOD_LONGTEXT, true ); - change_string_list( psz_css_list, psz_css_list_text, 0 ); - set_capability( "access_demux", 0 ); - add_shortcut( "dvd" ); - add_shortcut( "dvdread" ); - add_shortcut( "dvdsimple" ); - set_callbacks( Open, Close ); -vlc_module_end(); + CACHING_TEXT, CACHING_LONGTEXT, true ) + add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */ + set_capability( "access_demux", 0 ) + add_shortcut( "dvd", "dvdread", "dvdsimple" ) + set_callbacks( Open, Close ) +vlc_module_end () /* how many blocks DVDRead will read in each loop */ #define DVD_BLOCK_READ_ONCE 4 @@ -162,7 +146,8 @@ struct demux_sys_t input_title_t **titles; /* Video */ - int i_aspect; + int i_sar_num; + int i_sar_den; /* SPU */ uint32_t clut[16]; @@ -188,15 +173,14 @@ static int Open( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys; char *psz_name; - char *psz_dvdcss_env; dvd_reader_t *p_dvdread; ifo_handle_t *p_vmg_file; - vlc_value_t val; - if( !p_demux->psz_path || !*p_demux->psz_path ) + if( !p_demux->psz_file || !*p_demux->psz_file ) { /* Only when selected */ - if( !p_this->b_force ) return VLC_EGENERIC; + if( !p_demux->psz_access || !*p_demux->psz_access ) + return VLC_EGENERIC; psz_name = var_CreateGetString( p_this, "dvd" ); if( !psz_name ) @@ -205,40 +189,19 @@ static int Open( vlc_object_t *p_this ) } } else - psz_name = ToLocaleDup( p_demux->psz_path ); + psz_name = ToLocaleDup( p_demux->psz_file ); #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) */ - psz_dvdcss_env = config_GetPsz( p_demux, "dvdread-css-method" ); - if( psz_dvdcss_env && *psz_dvdcss_env ) - { - 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 ); - } - 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 ); + dialog_Fatal( p_demux, _("Playback failure"), + _("DVDRead could not open the disc \"%s\"."), psz_name ); free( psz_name ); return VLC_EGENERIC; } @@ -256,7 +219,8 @@ static int Open( vlc_object_t *p_this ) DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; ps_track_init( p_sys->tk ); - p_sys->i_aspect = -1; + p_sys->i_sar_num = 0; + p_sys->i_sar_den = 0; 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; @@ -269,9 +233,8 @@ static int Open( vlc_object_t *p_this ) p_sys->i_title = p_sys->i_chapter = -1; p_sys->i_mux_rate = 0; - 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; + p_sys->i_angle = var_CreateGetInteger( p_demux, "dvdread-angle" ); + if( p_sys->i_angle <= 0 ) p_sys->i_angle = 1; DemuxTitles( p_demux, &p_sys->i_angle ); if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS ) @@ -308,6 +271,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 ); @@ -463,7 +431,7 @@ 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 = var_GetInteger( p_demux, "dvdread-caching" )*1000; return VLC_SUCCESS; /* TODO implement others */ @@ -497,9 +465,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 ); + dialog_Fatal( p_demux, _("Playback failure"), + _("DVDRead could not read block %d."), + p_sys->i_next_vobu ); return -1; } @@ -559,7 +527,7 @@ 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"), + dialog_Fatal( p_demux, _("Playback failure"), _("DVDRead could not read %d/%d blocks at 0x%02x."), i_read, i_blocks_once, p_sys->i_cur_block ); return -1; @@ -592,10 +560,15 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt ) demux_sys_t *p_sys = p_demux->p_sys; uint8_t *p = pkt; - while( p < &pkt[i_pkt] ) + while( p && p < &pkt[i_pkt] ) { - int i_size = ps_pkt_size( p, &pkt[i_pkt] - p ); 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 ) { break; @@ -699,10 +672,8 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) /* Add a new ES */ if( tk->fmt.i_cat == VIDEO_ES ) { - if( p_sys->i_aspect >= 0 ) - { - tk->fmt.video.i_aspect = p_sys->i_aspect; - } + tk->fmt.video.i_sar_num = p_sys->i_sar_num; + tk->fmt.video.i_sar_den = p_sys->i_sar_den; } else if( tk->fmt.i_cat == AUDIO_ES ) { @@ -750,6 +721,8 @@ static void ESNew( demux_t *p_demux, int i_id, int i_lang ) static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter, int i_angle ) { + VLC_UNUSED( i_angle ); + demux_sys_t *p_sys = p_demux->p_sys; int pgc_id = 0, pgn = 0; int i; @@ -884,7 +857,41 @@ static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter, ESNew( p_demux, 0xe0, 0 ); /* Video, FIXME ? */ - p_sys->i_aspect = p_vts->vtsi_mat->vts_video_attr.display_aspect_ratio; + const video_attr_t *p_attr = &p_vts->vtsi_mat->vts_video_attr; + int i_video_height = p_attr->video_format != 0 ? 576 : 480; + int i_video_width; + switch( p_attr->picture_size ) + { + case 0: + i_video_width = 720; + break; + case 1: + i_video_width = 704; + break; + case 2: + i_video_width = 352; + break; + default: + case 3: + i_video_width = 352; + i_video_height /= 2; + break; + } + switch( p_attr->display_aspect_ratio ) + { + case 0: + p_sys->i_sar_num = 4 * i_video_height; + p_sys->i_sar_den = 3 * i_video_width; + break; + case 3: + p_sys->i_sar_num = 16 * i_video_height; + p_sys->i_sar_den = 9 * i_video_width; + break; + default: + p_sys->i_sar_num = 0; + p_sys->i_sar_den = 0; + break; + } #define audio_control \ p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->audio_control[i-1] @@ -1301,19 +1308,19 @@ static void DvdReadFindCell( demux_t *p_demux ) *****************************************************************************/ static void DemuxTitles( demux_t *p_demux, int *pi_angle ) { + VLC_UNUSED( pi_angle ); + demux_sys_t *p_sys = p_demux->p_sys; input_title_t *t; seekpoint_t *s; - int32_t i_titles; - int i; /* Find out number of titles/chapters */ #define tt_srpt p_sys->p_vmg_file->tt_srpt - i_titles = tt_srpt->nr_of_srpts; + int32_t i_titles = tt_srpt->nr_of_srpts; msg_Dbg( p_demux, "number of titles: %d", i_titles ); - for( i = 0; i < i_titles; i++ ) + for( int i = 0; i < i_titles; i++ ) { int32_t i_chapters = 0; int j;