X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdnav.c;h=f362e3eecf0b7760494ea717edc0a31fb4149f39;hb=640fe7328c3efafc924a03d11710a3378ba5ed7c;hp=d5a7569fc17b21a2bff01d99ddd94bcc87a39a3f;hpb=b089955150613b8fc638928790d2a60fc1a45b6f;p=vlc diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index d5a7569fc1..f362e3eecf 100644 --- a/modules/access/dvdnav.c +++ b/modules/access/dvdnav.c @@ -1,7 +1,7 @@ /***************************************************************************** * dvdnav.c: DVD module using the dvdnav library. ***************************************************************************** - * Copyright (C) 2004 VideoLAN + * Copyright (C) 2004 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,7 +18,7 @@ * * 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. *****************************************************************************/ /***************************************************************************** @@ -58,16 +58,16 @@ *****************************************************************************/ #define ANGLE_TEXT N_("DVD angle") #define ANGLE_LONGTEXT N_( \ - "Allows you to select the default DVD angle." ) + "Default DVD angle." ) #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for DVDnav streams. This "\ - "value should be set in millisecond units." ) + "Caching value for DVDs. This "\ + "value should be set in milliseconds." ) #define MENU_TEXT N_("Start directly in menu") #define MENU_LONGTEXT N_( \ - "Allows you to start the DVD directly in the main menu. This "\ - "will try to skip all the useless warnings introductions." ) + "Start the DVD directly in the main menu. This "\ + "will try to skip all the useless warning introductions." ) #define LANGUAGE_DEFAULT ("en") @@ -129,15 +129,19 @@ struct demux_sys_t /* event */ event_thread_t *p_ev; - /* FIXME */ - uint8_t alpha[4]; - uint32_t clut[16]; + /* palette for menus */ + uint32_t clut[16]; + uint8_t palette[4][4]; + vlc_bool_t b_spu_change; /* */ int i_aspect; int i_title; input_title_t **title; + + /* lenght of program group chain */ + mtime_t i_pgc_length; }; static int Control( demux_t *, int, va_list ); @@ -146,7 +150,7 @@ static int DemuxBlock( demux_t *, uint8_t *, int ); static void DemuxTitles( demux_t * ); static void ESSubtitleUpdate( demux_t * ); -static void ButtonUpdate( demux_t * ); +static void ButtonUpdate( demux_t *, vlc_bool_t ); static void ESNew( demux_t *, int ); static int ProbeDVD( demux_t *, char * ); @@ -172,13 +176,13 @@ static int Open( vlc_object_t *p_this ) if( !p_this->b_force ) return VLC_EGENERIC; psz_name = var_CreateGetString( p_this, "dvd" ); - if( !psz_name || !*psz_name ) + if( !psz_name ) { - if( psz_name ) free( psz_name ); - return VLC_EGENERIC; + psz_name = strdup(""); } } - else psz_name = strdup( p_demux->psz_path ); + else + psz_name = strdup( p_demux->psz_path ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -211,6 +215,8 @@ static int Open( vlc_object_t *p_this ) ps_track_init( p_sys->tk ); p_sys->i_aspect = -1; p_sys->i_mux_rate = 0; + p_sys->i_pgc_length = 0; + p_sys->b_spu_change = VLC_FALSE; if( 1 ) { @@ -254,20 +260,20 @@ static int Open( vlc_object_t *p_this ) /* Set audio language */ psz_code = DemuxGetLanguageCode( p_demux, "audio-language" ); - if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) != + if( dvdnav_audio_language_select( p_sys->dvdnav, psz_code ) != DVDNAV_STATUS_OK ) { msg_Warn( p_demux, "can't set audio language to '%s' (%s)", psz_code, dvdnav_err_to_string( p_sys->dvdnav ) ); /* We try to fall back to 'en' */ if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) - dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT ); + dvdnav_audio_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT ); } free( psz_code ); /* Set spu language */ - psz_code = DemuxGetLanguageCode( p_demux, "spu-language" ); - if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) != + psz_code = DemuxGetLanguageCode( p_demux, "sub-language" ); + if( dvdnav_spu_language_select( p_sys->dvdnav, psz_code ) != DVDNAV_STATUS_OK ) { msg_Warn( p_demux, "can't set spu language to '%s' (%s)", @@ -288,13 +294,19 @@ static int Open( vlc_object_t *p_this ) if( dvdnav_title_play( p_sys->dvdnav, 1 ) != DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "cannot set title" ); + msg_Err( p_demux, "cannot set title (can't decrypt DVD?)" ); + dvdnav_close( p_sys->dvdnav ); + free( p_sys ); + return VLC_EGENERIC; } if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Title ) != DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "cannot go to dvd menu" ); + /* Try going to menu root */ + if( dvdnav_menu_call( p_sys->dvdnav, DVD_MENU_Root ) != + DVDNAV_STATUS_OK ) + msg_Warn( p_demux, "cannot go to dvd menu" ); } } @@ -313,7 +325,7 @@ static int Open( vlc_object_t *p_this ) var_Create( p_sys->p_input, "x-end", VLC_VAR_INTEGER ); var_Create( p_sys->p_input, "y-end", VLC_VAR_INTEGER ); var_Create( p_sys->p_input, "color", VLC_VAR_ADDRESS ); - var_Create( p_sys->p_input, "contrast", VLC_VAR_ADDRESS ); + var_Create( p_sys->p_input, "menu-palette", VLC_VAR_ADDRESS ); var_Create( p_sys->p_input, "highlight", VLC_VAR_BOOL ); var_Create( p_sys->p_input, "highlight-mutex", VLC_VAR_MUTEX ); @@ -347,7 +359,7 @@ static void Close( vlc_object_t *p_this ) var_Destroy( p_sys->p_input, "y-start" ); var_Destroy( p_sys->p_input, "y-end" ); var_Destroy( p_sys->p_input, "color" ); - var_Destroy( p_sys->p_input, "contrast" ); + var_Destroy( p_sys->p_input, "menu-palette" ); vlc_object_release( p_sys->p_input ); @@ -411,20 +423,18 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) else if( i_query == DEMUX_GET_TIME ) { pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( p_sys->i_pgc_length > 0 ) { - *pi64 = (int64_t)1000000 * 2048 * pos / 50 / - p_sys->i_mux_rate; + *pi64 = p_sys->i_pgc_length * pos / len; return VLC_SUCCESS; } } else if( i_query == DEMUX_GET_LENGTH ) { pi64 = (int64_t*)va_arg( args, int64_t * ); - if( p_sys->i_mux_rate > 0 ) + if( p_sys->i_pgc_length > 0 ) { - *pi64 = (int64_t)1000000 * len * 2048 / 50 / - p_sys->i_mux_rate; + *pi64 = (int64_t)p_sys->i_pgc_length; return VLC_SUCCESS; } } @@ -526,6 +536,20 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) *pi64 = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000; return VLC_SUCCESS; + case DEMUX_GET_META: + { + const char *title_name = NULL; + + dvdnav_get_title_string(p_sys->dvdnav, &title_name); + if( (NULL != title_name) && ('\0' != title_name[0]) ) + { + vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* ); + vlc_meta_SetTitle( p_meta, title_name ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; + } + /* TODO implement others */ default: return VLC_EGENERIC; @@ -624,6 +648,7 @@ static int Demux( demux_t *p_demux ) event->physical_pan_scan ); ESSubtitleUpdate( p_demux ); + p_sys->b_spu_change = VLC_TRUE; /* HACK to get the SPU tracks registered in the right order */ for( i = 0; i < 0x1f; i++ ) @@ -697,11 +722,14 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "DVDNAV_CELL_CHANGE" ); msg_Dbg( p_demux, " - cellN=%d", event->cellN ); msg_Dbg( p_demux, " - pgN=%d", event->pgN ); - msg_Dbg( p_demux, " - cell_length=%lld", event->cell_length ); - msg_Dbg( p_demux, " - pg_length=%lld", event->pg_length ); - msg_Dbg( p_demux, " - pgc_length=%lld", event->pgc_length ); - msg_Dbg( p_demux, " - cell_start=%lld", event->cell_start ); - msg_Dbg( p_demux, " - pg_start=%lld", event->pg_start ); + msg_Dbg( p_demux, " - cell_length="I64Fd, event->cell_length ); + msg_Dbg( p_demux, " - pg_length="I64Fd, event->pg_length ); + msg_Dbg( p_demux, " - pgc_length="I64Fd, event->pgc_length ); + msg_Dbg( p_demux, " - cell_start="I64Fd, event->cell_start ); + msg_Dbg( p_demux, " - pg_start="I64Fd, event->pg_start ); + + /* Store the lenght in time of the current PGC */ + p_sys->i_pgc_length = event->pgc_length / 90 * 1000; /* FIXME is it correct or there is better way to know chapter change */ if( dvdnav_current_title_info( p_sys->dvdnav, &i_title, @@ -729,11 +757,20 @@ static int Demux( demux_t *p_demux ) * - ... */ DemuxBlock( p_demux, packet, i_len ); + if( p_sys->b_spu_change ) + { + ButtonUpdate( p_demux, VLC_FALSE ); + p_sys->b_spu_change = VLC_FALSE; + } break; } case DVDNAV_STOP: /* EOF */ msg_Dbg( p_demux, "DVDNAV_STOP" ); + +#if DVD_READ_CACHE + dvdnav_free_cache_block( p_sys->dvdnav, packet ); +#endif return 0; case DVDNAV_HIGHLIGHT: @@ -742,7 +779,7 @@ static int Demux( demux_t *p_demux ) msg_Dbg( p_demux, "DVDNAV_HIGHLIGHT" ); msg_Dbg( p_demux, " - display=%d", event->display ); msg_Dbg( p_demux, " - buttonN=%d", event->buttonN ); - ButtonUpdate( p_demux ); + ButtonUpdate( p_demux, VLC_FALSE ); break; } @@ -754,6 +791,8 @@ static int Demux( demux_t *p_demux ) case DVDNAV_WAIT: msg_Dbg( p_demux, "DVDNAV_WAIT" ); + /* reset PCR */ + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); dvdnav_wait_skip( p_sys->dvdnav ); break; @@ -867,7 +906,7 @@ static void DemuxTitles( demux_t *p_demux ) /***************************************************************************** * Update functions: *****************************************************************************/ -static void ButtonUpdate( demux_t *p_demux ) +static void ButtonUpdate( demux_t *p_demux, vlc_bool_t b_mode ) { demux_sys_t *p_sys = p_demux->p_sys; vlc_value_t val; @@ -890,15 +929,22 @@ static void ButtonUpdate( demux_t *p_demux ) if( i_button > 0 && i_title == 0 ) { + int i; pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_get_highlight_area( pci, i_button, 1, &hl ); + dvdnav_get_highlight_area( pci, i_button, b_mode, &hl ); - /* I fear it is plain wrong */ - p_sys->alpha[0] = hl.palette&0x0f; - p_sys->alpha[1] = (hl.palette>>4)&0x0f; - p_sys->alpha[2] = (hl.palette>>8)&0x0f; - p_sys->alpha[3] = (hl.palette>>12)&0x0f; + for( i = 0; i < 4; i++ ) + { + uint32_t i_yuv = p_sys->clut[(hl.palette>>(16+i*4))&0x0f]; + uint8_t i_alpha = (hl.palette>>(i*4))&0x0f; + i_alpha = i_alpha == 0xf ? 0xff : i_alpha << 4; + + p_sys->palette[i][0] = (i_yuv >> 16) & 0xff; + p_sys->palette[i][1] = (i_yuv >> 0) & 0xff; + p_sys->palette[i][2] = (i_yuv >> 8) & 0xff; + p_sys->palette[i][3] = i_alpha; + } vlc_mutex_lock( p_mutex ); val.i_int = hl.sx; var_Set( p_sys->p_input, "x-start", val ); @@ -906,8 +952,8 @@ static void ButtonUpdate( demux_t *p_demux ) val.i_int = hl.sy; var_Set( p_sys->p_input, "y-start", val ); val.i_int = hl.ey; var_Set( p_sys->p_input, "y-end", val ); - val.p_address = (void *)p_sys->alpha; - var_Set( p_sys->p_input, "contrast", val ); + val.p_address = (void *)p_sys->palette; + var_Set( p_sys->p_input, "menu-palette", val ); val.b_bool = VLC_TRUE; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); @@ -934,7 +980,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) int i_spu = dvdnav_get_active_spu_stream( p_sys->dvdnav ); int32_t i_title, i_part; - ButtonUpdate( p_demux ); + ButtonUpdate( p_demux, VLC_FALSE ); dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); if( i_title > 0 ) return; @@ -1148,7 +1194,7 @@ static void ESNew( demux_t *p_demux, int i_id ) } tk->b_seen = VLC_TRUE; - if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux ); + if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, VLC_FALSE ); } /***************************************************************************** @@ -1215,6 +1261,7 @@ static int EventThread( vlc_object_t *p_this ) case ACTIONID_NAV_ACTIVATE: b_activated = VLC_TRUE; dvdnav_button_activate( p_sys->dvdnav, pci ); + ButtonUpdate( p_ev->p_demux, VLC_TRUE ); break; default: break; @@ -1243,6 +1290,7 @@ static int EventThread( vlc_object_t *p_this ) b_activated = VLC_TRUE; dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int, valy.i_int ); + ButtonUpdate( p_ev->p_demux, VLC_TRUE ); } p_ev->b_moved = VLC_FALSE; @@ -1334,6 +1382,12 @@ static int ProbeDVD( demux_t *p_demux, char *psz_name ) uint16_t i_tag_id = 0; int i_fd, i_ret; + if( !*psz_name ) + { + /* Triggers libdvdcss autodetection */ + return VLC_SUCCESS; + } + if( stat( psz_name, &stat_info ) || !S_ISREG( stat_info.st_mode ) ) { /* Let dvdnav_open() do the probing */