X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdvdnav.c;h=0f805f48a8f602ee0406d7810fccd4930cc7847b;hb=d244b78453c155e57d6de2f704c987ea0822cb34;hp=439a4181da549a18796f9b9ecd886a0b4b80a37b;hpb=869331a4c7bf0a10ed69f0392f121d6eab65576a;p=vlc diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c index 439a4181da..0f805f48a8 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-2009 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,16 +18,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 -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include + +#include #ifdef HAVE_UNISTD_H # include @@ -43,7 +53,11 @@ #endif #include "vlc_keys.h" -#include "iso_lang.h" +#include "vlc_iso_lang.h" + +/* FIXME we should find a better way than including that */ +#include "../../src/text/iso-639_def.h" + #include @@ -54,33 +68,39 @@ *****************************************************************************/ #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") static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_description( _("DVDnav Input") ); +vlc_module_begin () + set_shortname( N_("DVD with menus") ) + set_description( N_("DVDnav Input") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACCESS ) add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT, - ANGLE_LONGTEXT, VLC_FALSE ); + ANGLE_LONGTEXT, false ) add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); - add_bool( "dvdnav-menu", VLC_TRUE, NULL, - MENU_TEXT, MENU_LONGTEXT, VLC_FALSE ); - set_capability( "access_demux", 5 ); - add_shortcut( "dvd" ); - add_shortcut( "dvdnav" ); - set_callbacks( Open, Close ); -vlc_module_end(); + CACHING_TEXT, CACHING_LONGTEXT, true ) + add_bool( "dvdnav-menu", true, NULL, + MENU_TEXT, MENU_LONGTEXT, false ) + set_capability( "access_demux", 5 ) + add_shortcut( "dvd" ) + add_shortcut( "dvdnav" ) + add_shortcut( "file" ) + set_callbacks( Open, Close ) +vlc_module_end () /* Shall we use libdvdnav's read ahead cache? */ #define DVD_READ_CACHE 1 @@ -88,28 +108,23 @@ vlc_module_end(); /***************************************************************************** * Local prototypes *****************************************************************************/ -typedef struct -{ - VLC_COMMON_MEMBERS - - demux_t *p_demux; - vlc_mutex_t lock; - - vlc_bool_t b_moved; - vlc_bool_t b_clicked; - vlc_bool_t b_key; - - vlc_bool_t b_still; - int64_t i_still_end; - -} event_thread_t; - -static int EventThread( vlc_object_t * ); - struct demux_sys_t { dvdnav_t *dvdnav; + /* */ + bool b_reset_pcr; + + struct + { + bool b_created; + bool b_enabled; + mtime_t i_end; + vlc_mutex_t lock; + vlc_cond_t wait; + vlc_thread_t thread; + } still; + /* track */ ps_track_t tk[PS_TK_COUNT]; int i_mux_rate; @@ -118,30 +133,47 @@ struct demux_sys_t input_thread_t *p_input; /* event */ - event_thread_t *p_ev; + vlc_object_t *p_vout; - /* FIXME */ - uint8_t alpha[4]; - uint32_t clut[16]; + /* palette for menus */ + uint32_t clut[16]; + uint8_t palette[4][4]; + bool 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 ); 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 * ); static void ESSubtitleUpdate( demux_t * ); -static void ButtonUpdate( demux_t * ); +static void ButtonUpdate( demux_t *, bool ); static void ESNew( demux_t *, int ); static int ProbeDVD( demux_t *, char * ); +static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ); + +static int ControlInternal( demux_t *, int, ... ); + +static void* StillThread( void * ); + +static int EventKey( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int EventMouse( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); +static int EventIntf( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * DemuxOpen: *****************************************************************************/ @@ -152,6 +184,7 @@ static int Open( vlc_object_t *p_this ) dvdnav_t *p_dvdnav; int i_angle; char *psz_name; + char *psz_code; vlc_value_t val; if( !p_demux->psz_path || !*p_demux->psz_path ) @@ -160,13 +193,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 = ToLocaleDup( p_demux->psz_path ); #ifdef WIN32 if( psz_name[0] && psz_name[1] == ':' && @@ -190,15 +223,15 @@ static int Open( vlc_object_t *p_this ) free( psz_name ); /* 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; p_sys->dvdnav = p_dvdnav; + p_sys->b_reset_pcr = false; 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 = false; if( 1 ) { @@ -230,13 +263,45 @@ static int Open( vlc_object_t *p_this ) msg_Warn( p_demux, "cannot set PGC positioning flag" ); } - if( dvdnav_menu_language_select (p_sys->dvdnav,"en") != DVDNAV_STATUS_OK || - dvdnav_audio_language_select(p_sys->dvdnav,"en") != DVDNAV_STATUS_OK || - dvdnav_spu_language_select (p_sys->dvdnav,"en") != DVDNAV_STATUS_OK ) + /* Set menu language + * XXX A menu-language may be better than sub-language */ + psz_code = DemuxGetLanguageCode( p_demux, "sub-language" ); + if( dvdnav_menu_language_select( p_sys->dvdnav, psz_code ) != + DVDNAV_STATUS_OK ) { - msg_Warn( p_demux, "something failed while setting en language (%s)", - dvdnav_err_to_string( p_sys->dvdnav ) ); + msg_Warn( p_demux, "can't set menu 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_menu_language_select( p_sys->dvdnav, (char*)LANGUAGE_DEFAULT ); + } + free( psz_code ); + + /* Set audio language */ + psz_code = DemuxGetLanguageCode( p_demux, "audio-language" ); + 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, (char*)LANGUAGE_DEFAULT ); } + free( psz_code ); + + /* Set spu language */ + 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)", + psz_code, dvdnav_err_to_string( p_sys->dvdnav ) ); + /* We try to fall back to 'en' */ + if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) + dvdnav_spu_language_select(p_sys->dvdnav, (char*)LANGUAGE_DEFAULT ); + } + free( psz_code ); DemuxTitles( p_demux ); @@ -248,13 +313,22 @@ 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?)" ); + dialog_Fatal( p_demux, _("Playback failure"), + _("VLC cannot set the DVD's title. It possibly " + "cannot decrypt the entire disc.") ); + 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" ); } } @@ -273,16 +347,17 @@ 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 ); - /* Now create our event thread catcher */ - p_sys->p_ev = vlc_object_create( p_demux, sizeof( event_thread_t ) ); - p_sys->p_ev->p_demux = p_demux; - vlc_thread_create( p_sys->p_ev, "dvdnav event thread handler", EventThread, - VLC_THREAD_PRIORITY_LOW, VLC_FALSE ); + /* catch all key event */ + var_AddCallback( p_demux->p_libvlc, "key-action", EventKey, p_demux ); + /* catch vout creation event */ + var_AddCallback( p_sys->p_input, "intf-event", EventIntf, p_demux ); + p_sys->still.b_enabled = false; + vlc_mutex_init( &p_sys->still.lock ); return VLC_SUCCESS; } @@ -295,10 +370,26 @@ static void Close( vlc_object_t *p_this ) demux_sys_t *p_sys = p_demux->p_sys; int i; - /* stop the event handler */ - p_sys->p_ev->b_die = VLC_TRUE; - vlc_thread_join( p_sys->p_ev ); - vlc_object_destroy( p_sys->p_ev ); + /* Stop vout event handler */ + var_DelCallback( p_sys->p_input, "intf-event", EventIntf, p_demux ); + if( p_sys->p_vout != NULL ) + { /* Should not happen, but better be safe than sorry. */ + msg_Warn( p_sys->p_vout, "removing dangling mouse DVD callbacks" ); + var_DelCallback( p_sys->p_vout, "mouse-moved", EventMouse, p_demux ); + var_DelCallback( p_sys->p_vout, "mouse-clicked", EventMouse, p_demux ); + } + + /* Stop key event handler (FIXME: should really be per-vout too) */ + var_DelCallback( p_demux->p_libvlc, "key-action", EventKey, p_demux ); + + /* Stop still image handler */ + if( p_sys->still.b_created ) + { + vlc_cancel( p_sys->still.thread ); + vlc_join( p_sys->still.thread, NULL ); + vlc_cond_destroy( &p_sys->still.wait ); + } + vlc_mutex_destroy( &p_sys->still.lock ); var_Destroy( p_sys->p_input, "highlight-mutex" ); var_Destroy( p_sys->p_input, "highlight" ); @@ -307,7 +398,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 ); @@ -332,7 +423,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; @@ -371,20 +462,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; } } @@ -394,10 +483,11 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) /* 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: @@ -486,12 +576,37 @@ 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_Set( p_meta, vlc_meta_Title, title_name ); + return VLC_SUCCESS; + } + return VLC_EGENERIC; + } + /* TODO implement others */ default: return VLC_EGENERIC; } } +static int ControlInternal( demux_t *p_demux, int i_query, ... ) +{ + va_list args; + int i_result; + + va_start( args, i_query ); + i_result = Control( p_demux, i_query, args ); + va_end( args ); + + return i_result; +} /***************************************************************************** * Demux: *****************************************************************************/ @@ -514,12 +629,25 @@ static int Demux( demux_t *p_demux ) { msg_Warn( p_demux, "cannot get next block (%s)", dvdnav_err_to_string( p_sys->dvdnav ) ); + if( p_demux->info.i_title == 0 ) + { + msg_Dbg( p_demux, "jumping to first title" ); + return ControlInternal( p_demux, DEMUX_SET_TITLE, 1 ) == VLC_SUCCESS ? 1 : -1; + } return -1; } switch( i_event ) { case DVDNAV_BLOCK_OK: /* mpeg block */ + vlc_mutex_lock( &p_sys->still.lock ); + p_sys->still.b_enabled = false; + vlc_mutex_unlock( &p_sys->still.lock ); + if( p_sys->b_reset_pcr ) + { + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + p_sys->b_reset_pcr = false; + } DemuxBlock( p_demux, packet, i_len ); break; @@ -530,23 +658,48 @@ static int Demux( demux_t *p_demux ) case DVDNAV_STILL_FRAME: { dvdnav_still_event_t *event = (dvdnav_still_event_t*)packet; - vlc_mutex_lock( &p_sys->p_ev->lock ); - if( !p_sys->p_ev->b_still ) + bool b_still_init = false; + + vlc_mutex_lock( &p_sys->still.lock ); + if( !p_sys->still.b_enabled ) { msg_Dbg( p_demux, "DVDNAV_STILL_FRAME" ); msg_Dbg( p_demux, " - length=0x%x", event->length ); - p_sys->p_ev->b_still = VLC_TRUE; - if( event->length == 0xff ) + /* FIXME: use vlc_timer_create() if it is ever invented */ + p_sys->still.b_enabled = true; + + if( !p_sys->still.b_created ) { - p_sys->p_ev->i_still_end = 0; + vlc_cond_init( &p_sys->still.wait ); + p_sys->still.b_created = + !vlc_clone( &p_sys->still.thread, StillThread, p_sys, + VLC_THREAD_PRIORITY_LOW ); } + + b_still_init = true; + if( event->length == 0xff ) + p_sys->still.i_end = 0; else - { - p_sys->p_ev->i_still_end = (int64_t)event->length * - 1000000 + mdate() + p_sys->p_input->i_pts_delay; - } + p_sys->still.i_end = mdate() + + event->length * INT64_C(1000000); + vlc_cond_signal( &p_sys->still.wait ); + } + vlc_mutex_unlock( &p_sys->still.lock ); + + if( b_still_init ) + { + /* We send a dummy mpeg2 end of sequence to force still frame display */ + static const uint8_t buffer[] = { + 0x00, 0x00, 0x01, 0xe0, 0x00, 0x07, + 0x80, 0x00, 0x00, + 0x00, 0x00, 0x01, 0xB7, + }; + DemuxBlock( p_demux, buffer, sizeof(buffer) ); + + bool b_empty; + es_out_Control( p_demux->out, ES_OUT_GET_EMPTY, &b_empty ); + p_sys->b_reset_pcr = true; } - vlc_mutex_unlock( &p_sys->p_ev->lock ); msleep( 40000 ); break; } @@ -584,6 +737,7 @@ static int Demux( demux_t *p_demux ) event->physical_pan_scan ); ESSubtitleUpdate( p_demux ); + p_sys->b_spu_change = true; /* HACK to get the SPU tracks registered in the right order */ for( i = 0; i < 0x1f; i++ ) @@ -631,7 +785,7 @@ static int Demux( demux_t *p_demux ) 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( dvdnav_current_title_info( p_sys->dvdnav, &i_title, @@ -657,11 +811,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=%"PRId64, event->cell_length ); + msg_Dbg( p_demux, " - pg_length=%"PRId64, event->pg_length ); + msg_Dbg( p_demux, " - pgc_length=%"PRId64, event->pgc_length ); + msg_Dbg( p_demux, " - cell_start=%"PRId64, event->cell_start ); + msg_Dbg( p_demux, " - pg_start=%"PRId64, 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, @@ -689,11 +846,20 @@ static int Demux( demux_t *p_demux ) * - ... */ DemuxBlock( p_demux, packet, i_len ); + if( p_sys->b_spu_change ) + { + ButtonUpdate( p_demux, false ); + p_sys->b_spu_change = 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: @@ -702,19 +868,29 @@ 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, false ); break; } case DVDNAV_HOP_CHANNEL: msg_Dbg( p_demux, "DVDNAV_HOP_CHANNEL" ); - /* We should try to flush all our internal buffer */ + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); break; case DVDNAV_WAIT: msg_Dbg( p_demux, "DVDNAV_WAIT" ); - dvdnav_wait_skip( p_sys->dvdnav ); + bool b_empty; + es_out_Control( p_demux->out, ES_OUT_GET_EMPTY, &b_empty ); + if( !b_empty ) + { + msleep( 40*1000 ); + } + else + { + dvdnav_wait_skip( p_sys->dvdnav ); + p_sys->b_reset_pcr = true; + } break; default: @@ -729,6 +905,44 @@ static int Demux( demux_t *p_demux ) return 1; } +/* Get a 2 char code + * FIXME: partiallyy duplicated from src/input/es_out.c + */ +static char *DemuxGetLanguageCode( demux_t *p_demux, const char *psz_var ) +{ + const iso639_lang_t *pl; + char *psz_lang; + char *p; + + psz_lang = var_CreateGetString( p_demux, psz_var ); + if( !psz_lang ) + return strdup(LANGUAGE_DEFAULT); + + /* XXX: we will use only the first value + * (and ignore other ones in case of a list) */ + if( ( p = strchr( psz_lang, ',' ) ) ) + *p = '\0'; + + for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ ) + { + if( *psz_lang == '\0' ) + continue; + if( !strcasecmp( pl->psz_eng_name, psz_lang ) || + !strcasecmp( pl->psz_native_name, psz_lang ) || + !strcasecmp( pl->psz_iso639_1, psz_lang ) || + !strcasecmp( pl->psz_iso639_2T, psz_lang ) || + !strcasecmp( pl->psz_iso639_2B, psz_lang ) ) + break; + } + + free( psz_lang ); + + if( pl->psz_iso639_1 != NULL ) + return strdup( pl->psz_iso639_1 ); + + return strdup(LANGUAGE_DEFAULT); +} + static void DemuxTitles( demux_t *p_demux ) { demux_sys_t *p_sys = p_demux->p_sys; @@ -739,7 +953,7 @@ static void DemuxTitles( demux_t *p_demux ) /* Menu */ t = vlc_input_title_New(); - t->b_menu = VLC_TRUE; + t->b_menu = true; t->psz_name = strdup( "DVD Menu" ); s = vlc_seekpoint_New(); @@ -795,7 +1009,7 @@ static void DemuxTitles( demux_t *p_demux ) /***************************************************************************** * Update functions: *****************************************************************************/ -static void ButtonUpdate( demux_t *p_demux ) +static void ButtonUpdate( demux_t *p_demux, bool b_mode ) { demux_sys_t *p_sys = p_demux->p_sys; vlc_value_t val; @@ -808,6 +1022,7 @@ static void ButtonUpdate( demux_t *p_demux ) vlc_mutex_t *p_mutex = val.p_address; dvdnav_highlight_area_t hl; int32_t i_button; + bool b_button_ok; if( dvdnav_get_current_highlight( p_sys->dvdnav, &i_button ) != DVDNAV_STATUS_OK ) @@ -816,17 +1031,26 @@ static void ButtonUpdate( demux_t *p_demux ) return; } + b_button_ok = false; if( i_button > 0 && i_title == 0 ) { pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - dvdnav_get_highlight_area( pci, i_button, 1, &hl ); + b_button_ok = dvdnav_get_highlight_area( pci, i_button, b_mode, &hl ) == DVDNAV_STATUS_OK; + } + if( b_button_ok ) + { + int i; + 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 ) * 0xff / 0xf; - /* 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; + 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 ); @@ -834,10 +1058,10 @@ 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 ); + val.b_bool = true; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); msg_Dbg( p_demux, "buttonUpdate %d", i_button ); @@ -849,7 +1073,7 @@ static void ButtonUpdate( demux_t *p_demux ) /* Show all */ vlc_mutex_lock( p_mutex ); - val.b_bool = VLC_FALSE; + val.b_bool = false; var_Set( p_sys->p_input, "highlight", val ); vlc_mutex_unlock( p_mutex ); } @@ -862,7 +1086,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, false ); dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part ); if( i_title > 0 ) return; @@ -875,7 +1099,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) /* be sure to unselect it (reset) */ es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->es, - (vlc_bool_t)VLC_FALSE ); + (bool)false ); /* now select it */ es_out_Control( p_demux->out, ES_OUT_SET_ES, tk->es ); @@ -888,7 +1112,7 @@ static void ESSubtitleUpdate( demux_t *p_demux ) if( tk->b_seen ) { es_out_Control( p_demux->out, ES_OUT_SET_ES_STATE, tk->es, - (vlc_bool_t)VLC_FALSE ); + (bool)false ); } } } @@ -897,10 +1121,10 @@ static void ESSubtitleUpdate( 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 *pkt, int i_pkt ) { demux_sys_t *p_sys = p_demux->p_sys; - uint8_t *p = pkt; + const uint8_t *p = pkt; while( p < &pkt[i_pkt] ) { @@ -940,7 +1164,7 @@ static int DemuxBlock( demux_t *p_demux, uint8_t *pkt, int i_pkt ) int i_mux_rate; if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) ) { - es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr + 1 ); if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate; } block_Release( p_pkt ); @@ -988,7 +1212,7 @@ static void ESNew( demux_t *p_demux, int i_id ) { demux_sys_t *p_sys = p_demux->p_sys; ps_track_t *tk = &p_sys->tk[PS_ID_TO_TK(i_id)]; - vlc_bool_t b_select = VLC_FALSE; + bool b_select = false; if( tk->b_seen ) return; @@ -1001,11 +1225,17 @@ static void ESNew( demux_t *p_demux, int i_id ) /* Add a new ES */ if( tk->fmt.i_cat == VIDEO_ES ) { - if( p_sys->i_aspect >= 0 ) + switch( p_sys->i_aspect ) { - tk->fmt.video.i_aspect = p_sys->i_aspect; + case 1: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR; break; + case 2: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 4 / 3; break; + case 3: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 16 / 9; break; + case 4: tk->fmt.video.i_aspect = VOUT_ASPECT_FACTOR * 221 / 10; break; + default: + tk->fmt.video.i_aspect = 0; + break; } - b_select = VLC_TRUE; + b_select = true; } else if( tk->fmt.i_cat == AUDIO_ES ) { @@ -1039,7 +1269,7 @@ static void ESNew( demux_t *p_demux, int i_id ) } if( dvdnav_get_active_audio_stream( p_sys->dvdnav ) == i_audio ) { - b_select = VLC_TRUE; + b_select = true; } } } @@ -1065,7 +1295,7 @@ static void ESNew( demux_t *p_demux, int i_id ) if( i_title > 0 && dvdnav_get_active_spu_stream( p_sys->dvdnav ) == (i_id&0x1f) ) { - b_select = VLC_TRUE; + b_select = true; } } @@ -1074,180 +1304,126 @@ static void ESNew( demux_t *p_demux, int i_id ) { es_out_Control( p_demux->out, ES_OUT_SET_ES, tk->es ); } - tk->b_seen = VLC_TRUE; + tk->b_seen = true; - if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux ); + if( tk->fmt.i_cat == VIDEO_ES ) ButtonUpdate( p_demux, false ); } /***************************************************************************** * Event handler code *****************************************************************************/ -static int EventMouse( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); -static int EventKey ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); - -static int EventThread( vlc_object_t *p_this ) +static void* StillThread( void *p_data ) { - event_thread_t *p_ev = (event_thread_t*)p_this; - demux_sys_t *p_sys = p_ev->p_demux->p_sys; - vlc_object_t *p_vout = NULL; - - vlc_mutex_init( p_ev, &p_ev->lock ); - p_ev->b_moved = VLC_FALSE; - p_ev->b_clicked = VLC_FALSE; - p_ev->b_key = VLC_FALSE; - p_ev->b_still = VLC_FALSE; + demux_sys_t *p_sys = p_data; - /* catch all key event */ - var_AddCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); - - /* main loop */ - while( !p_ev->b_die ) + vlc_mutex_lock( &p_sys->still.lock ); + mutex_cleanup_push( &p_sys->still.lock ); + for( ;; ) { - vlc_bool_t b_activated = VLC_FALSE; - - /* KEY part */ - if( p_ev->b_key ) + if( p_sys->still.b_enabled && p_sys->still.i_end ) { - pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - - vlc_value_t valk; - struct hotkey *p_hotkeys = p_ev->p_vlc->p_hotkeys; - int i, i_action = -1; - - vlc_mutex_lock( &p_ev->lock ); - var_Get( p_ev->p_vlc, "key-pressed", &valk ); - for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) - { - if( p_hotkeys[i].i_key == valk.i_int ) - { - i_action = p_hotkeys[i].i_action; - } - } - - switch( i_action ) - { - case ACTIONID_NAV_LEFT: - dvdnav_left_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_RIGHT: - dvdnav_right_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_UP: - dvdnav_upper_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_DOWN: - dvdnav_lower_button_select( p_sys->dvdnav, pci ); - break; - case ACTIONID_NAV_ACTIVATE: - b_activated = VLC_TRUE; - dvdnav_button_activate( p_sys->dvdnav, pci ); - break; - default: - break; + if( vlc_cond_timedwait( &p_sys->still.wait, &p_sys->still.lock, + p_sys->still.i_end ) ) + { /* Still image time out */ + int canc = vlc_savecancel(); + p_sys->still.b_enabled = false; + dvdnav_still_skip( p_sys->dvdnav ); + vlc_restorecancel( canc ); } - p_ev->b_key = VLC_FALSE; - vlc_mutex_unlock( &p_ev->lock ); } + else + vlc_cond_wait( &p_sys->still.wait, &p_sys->still.lock ); + } + vlc_cleanup_pop( ); - /* VOUT part */ - if( p_vout && ( p_ev->b_moved || p_ev->b_clicked ) ) - { - pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); - vlc_value_t valx, valy; - - vlc_mutex_lock( &p_ev->lock ); - var_Get( p_vout, "mouse-x", &valx ); - var_Get( p_vout, "mouse-y", &valy ); - - if( p_ev->b_moved ) - { - dvdnav_mouse_select( p_sys->dvdnav, pci, valx.i_int, - valy.i_int ); - } - if( p_ev->b_clicked ) - { - b_activated = VLC_TRUE; - dvdnav_mouse_activate( p_sys->dvdnav, pci, valx.i_int, - valy.i_int ); - } - - p_ev->b_moved = VLC_FALSE; - p_ev->b_clicked = VLC_FALSE; - vlc_mutex_unlock( &p_ev->lock ); - } - if( p_vout && p_vout->b_die ) - { - var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); - var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); - vlc_object_release( p_vout ); - p_vout = NULL; - } - if( p_vout == NULL ) - { - p_vout = vlc_object_find( p_sys->p_input, VLC_OBJECT_VOUT, - FIND_CHILD ); - if( p_vout) - { - var_AddCallback( p_vout, "mouse-moved", EventMouse, p_ev ); - var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); - } - } + assert( 0 ); +} - /* Still part */ - vlc_mutex_lock( &p_ev->lock ); - if( p_ev->b_still ) - { - if( /* b_activated || // This breaks menus */ - ( p_ev->i_still_end > 0 && p_ev->i_still_end < mdate() )) - { - p_ev->b_still = VLC_FALSE; - dvdnav_still_skip( p_sys->dvdnav ); - } - } - vlc_mutex_unlock( &p_ev->lock ); +static int EventMouse( vlc_object_t *p_vout, char const *psz_var, + vlc_value_t oldval, vlc_value_t val, void *p_data ) +{ + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; - /* Wait a bit */ - msleep( 10000 ); - } + /* FIXME? PCI usage thread safe? */ + pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); + int x = var_GetInteger( p_vout, "mouse-x" ); + int y = var_GetInteger( p_vout, "mouse-y" ); - /* Release callback */ - if( p_vout ) + if( psz_var[6] == 'm' ) /* mouse-moved */ + dvdnav_mouse_select( p_sys->dvdnav, pci, x, y ); + else { - var_DelCallback( p_vout, "mouse-moved", EventMouse, p_ev ); - var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_ev ); - vlc_object_release( p_vout ); - } - var_DelCallback( p_ev->p_vlc, "key-pressed", EventKey, p_ev ); + assert( psz_var[6] == 'c' ); /* mouse-clicked */ - vlc_mutex_destroy( &p_ev->lock ); + ButtonUpdate( p_demux, true ); + dvdnav_mouse_activate( p_sys->dvdnav, pci, x, y ); + } + (void)oldval; (void)val; return VLC_SUCCESS; } -static int EventMouse( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int EventKey( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - event_thread_t *p_ev = p_data; - vlc_mutex_lock( &p_ev->lock ); - if( psz_var[6] == 'c' ) - p_ev->b_clicked = VLC_TRUE; - else if( psz_var[6] == 'm' ) - p_ev->b_moved = VLC_TRUE; - vlc_mutex_unlock( &p_ev->lock ); + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; + /* FIXME: thread-safe ? */ + pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav ); + + switch( newval.i_int ) + { + case ACTIONID_NAV_LEFT: + dvdnav_left_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_RIGHT: + dvdnav_right_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_UP: + dvdnav_upper_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_DOWN: + dvdnav_lower_button_select( p_sys->dvdnav, pci ); + break; + case ACTIONID_NAV_ACTIVATE: + ButtonUpdate( p_demux, true ); + dvdnav_button_activate( p_sys->dvdnav, pci ); + break; + } + + (void)p_this; (void)psz_var; (void)oldval; return VLC_SUCCESS; } -static int EventKey( vlc_object_t *p_this, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) +static int EventIntf( vlc_object_t *p_input, char const *psz_var, + vlc_value_t oldval, vlc_value_t val, void *p_data ) { - event_thread_t *p_ev = p_data; - vlc_mutex_lock( &p_ev->lock ); - p_ev->b_key = VLC_TRUE; - vlc_mutex_unlock( &p_ev->lock ); + demux_t *p_demux = p_data; + demux_sys_t *p_sys = p_demux->p_sys; + + if (val.i_int == INPUT_EVENT_VOUT) + { + vlc_object_t *p_vout; + p_vout = p_sys->p_vout; + if( p_vout != NULL ) + { + var_DelCallback( p_vout, "mouse-moved", EventMouse, p_demux ); + var_DelCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); + vlc_object_release( p_vout ); + } + + p_vout = (vlc_object_t *)input_GetVout( (input_thread_t *)p_input ); + p_sys->p_vout = p_vout; + if( p_vout != NULL ) + { + var_AddCallback( p_vout, "mouse-moved", EventMouse, p_demux ); + var_AddCallback( p_vout, "mouse-clicked", EventMouse, p_demux ); + } + } + (void) psz_var; (void) oldval; return VLC_SUCCESS; } @@ -1256,41 +1432,42 @@ static int EventKey( vlc_object_t *p_this, char const *psz_var, *****************************************************************************/ static int ProbeDVD( demux_t *p_demux, char *psz_name ) { + (void)p_demux; #ifdef HAVE_SYS_STAT_H struct stat stat_info; uint8_t pi_anchor[2]; - uint16_t i_tag_id = 0; int i_fd, i_ret; - if( stat( psz_name, &stat_info ) || !S_ISREG( stat_info.st_mode ) ) + if( !*psz_name ) { - /* Let dvdnav_open() do the probing */ + /* Triggers libdvdcss autodetection */ return VLC_SUCCESS; } - if( (i_fd = open( psz_name, O_RDONLY )) == -1 ) - { - /* Let dvdnav_open() do the probing */ - return VLC_SUCCESS; - } + if( !strcmp( psz_name, "-" ) ) /* stdin -> file access */ + return VLC_EGENERIC; - /* Try to find the anchor (2 bytes at LBA 256) */ - i_ret = VLC_SUCCESS; - if( lseek( i_fd, 256 * DVD_VIDEO_LB_LEN, SEEK_SET ) == -1 ) + if( (i_fd = utf8_open( psz_name, O_RDONLY |O_NONBLOCK, 0666 )) == -1 ) { - i_ret = VLC_EGENERIC; + return VLC_SUCCESS; /* Let dvdnav_open() do the probing */ } - if( read( i_fd, pi_anchor, 2 ) == 2 ) + if( fstat( i_fd, &stat_info ) || !S_ISREG( stat_info.st_mode ) ) { - i_tag_id = GetWLE(pi_anchor); - if( i_tag_id != 2 ) i_ret = VLC_EGENERIC; /* Not an anchor */ - } - else - { - i_ret = VLC_EGENERIC; + close( i_fd ); + + if( S_ISFIFO( stat_info.st_mode ) ) + return VLC_EGENERIC; + return VLC_SUCCESS; /* Let dvdnav_open() do the probing */ } + /* Try to find the anchor (2 bytes at LBA 256) */ + i_ret = VLC_EGENERIC; + if( lseek( i_fd, 256 * DVD_VIDEO_LB_LEN, SEEK_SET ) != -1 + && read( i_fd, pi_anchor, 2 ) == 2 + && GetWLE( pi_anchor ) == 2 ) + i_ret = VLC_SUCCESS; /* Found a potential anchor */ + close( i_fd ); return i_ret;