#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." )
#define MENU_TEXT N_("Start directly in menu")
#define MENU_LONGTEXT N_( \
"Start the DVD directly in the main menu. This "\
set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "dvdnav-angle", 1, ANGLE_TEXT,
ANGLE_LONGTEXT, false )
- add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000,
- CACHING_TEXT, CACHING_LONGTEXT, true )
add_bool( "dvdnav-menu", true,
MENU_TEXT, MENU_LONGTEXT, false )
set_capability( "access_demux", 5 )
int i_angle;
char *psz_file;
char *psz_code;
+ bool forced = false;
+
+ if( p_demux->psz_access != NULL
+ && !strncmp(p_demux->psz_access, "dvd", 3) )
+ forced = true;
if( !p_demux->psz_file || !*p_demux->psz_file )
{
/* Only when selected */
- if( !p_demux->psz_access || !*p_demux->psz_access )
+ if( !forced )
return VLC_EGENERIC;
psz_file = var_InheritString( p_this, "dvd" );
return VLC_EGENERIC;
/* Try some simple probing to avoid going through dvdnav_open too often */
- if( ProbeDVD( psz_file ) != VLC_SUCCESS )
+ if( !forced && ProbeDVD( psz_file ) != VLC_SUCCESS )
{
free( psz_file );
return VLC_EGENERIC;
i_angle = var_CreateGetInteger( p_demux, "dvdnav-angle" );
if( i_angle <= 0 ) i_angle = 1;
- /* Update default_pts to a suitable value for dvdnav access */
- var_Create( p_demux, "dvdnav-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
/* FIXME hack hack hack hack FIXME */
/* Get p_input and create variable */
p_sys->p_input = demux_GetParentInput( p_demux );
var_Create( p_sys->p_input, "color", 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 );
/* catch all key event */
var_AddCallback( p_demux->p_libvlc, "key-action", EventKey, p_demux );
vlc_timer_destroy( p_sys->still.timer );
vlc_mutex_destroy( &p_sys->still.lock );
- var_Destroy( p_sys->p_input, "highlight-mutex" );
var_Destroy( p_sys->p_input, "highlight" );
var_Destroy( p_sys->p_input, "x-start" );
var_Destroy( p_sys->p_input, "x-end" );
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
- *va_arg( args, int64_t * )
- = (int64_t)var_GetInteger( p_demux, "dvdnav-caching" ) *1000;
+ *va_arg( args, int64_t * ) =
+ INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
return VLC_SUCCESS;
case DEMUX_GET_META:
static void ButtonUpdate( demux_t *p_demux, bool b_mode )
{
demux_sys_t *p_sys = p_demux->p_sys;
- vlc_value_t val;
int32_t i_title, i_part;
dvdnav_current_title_info( p_sys->dvdnav, &i_title, &i_part );
- if( var_Get( p_sys->p_input, "highlight-mutex", &val ) == VLC_SUCCESS )
- {
- vlc_mutex_t *p_mutex = val.p_address;
- dvdnav_highlight_area_t hl;
- int32_t i_button;
- bool b_button_ok;
+ 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 )
- {
- msg_Err( p_demux, "dvdnav_get_current_highlight failed" );
- return;
- }
+ if( dvdnav_get_current_highlight( p_sys->dvdnav, &i_button )
+ != DVDNAV_STATUS_OK )
+ {
+ msg_Err( p_demux, "dvdnav_get_current_highlight failed" );
+ return;
+ }
- b_button_ok = false;
- if( i_button > 0 && i_title == 0 )
- {
- pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+ b_button_ok = false;
+ if( i_button > 0 && i_title == 0 )
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
- b_button_ok = DVDNAV_STATUS_OK ==
- dvdnav_get_highlight_area( pci, i_button, b_mode, &hl );
- }
+ b_button_ok = DVDNAV_STATUS_OK ==
+ dvdnav_get_highlight_area( pci, i_button, b_mode, &hl );
+ }
- if( b_button_ok )
+ if( b_button_ok )
+ {
+ for( unsigned i = 0; i < 4; i++ )
{
- 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;
+ uint32_t i_yuv = p_sys->clut[(hl.palette>>(16+i*4))&0x0f];
+ uint8_t i_alpha = ( (hl.palette>>(i*4))&0x0f ) * 0xff / 0xf;
- 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 );
- var_SetInteger( p_sys->p_input, "x-start", hl.sx );
- var_SetInteger( p_sys->p_input, "x-end", hl.ex );
- var_SetInteger( p_sys->p_input, "y-start", hl.sy );
- var_SetInteger( p_sys->p_input, "y-end", hl.ey );
+ 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;
+ }
- var_SetAddress( p_sys->p_input, "menu-palette", p_sys->palette );
+ vlc_global_lock( VLC_HIGHLIGHT_MUTEX );
+ var_SetInteger( p_sys->p_input, "x-start", hl.sx );
+ var_SetInteger( p_sys->p_input, "x-end", hl.ex );
+ var_SetInteger( p_sys->p_input, "y-start", hl.sy );
+ var_SetInteger( p_sys->p_input, "y-end", hl.ey );
- var_SetBool( p_sys->p_input, "highlight", true );
- vlc_mutex_unlock( p_mutex );
+ var_SetAddress( p_sys->p_input, "menu-palette", p_sys->palette );
+ var_SetBool( p_sys->p_input, "highlight", true );
- msg_Dbg( p_demux, "buttonUpdate %d", i_button );
- }
- else
- {
- msg_Dbg( p_demux, "buttonUpdate not done b=%d t=%d",
- i_button, i_title );
+ msg_Dbg( p_demux, "buttonUpdate %d", i_button );
+ }
+ else
+ {
+ msg_Dbg( p_demux, "buttonUpdate not done b=%d t=%d",
+ i_button, i_title );
- /* Show all */
- vlc_mutex_lock( p_mutex );
- var_SetBool( p_sys->p_input, "highlight", false );
- vlc_mutex_unlock( p_mutex );
- }
+ /* Show all */
+ vlc_global_lock( VLC_HIGHLIGHT_MUTEX );
+ var_SetBool( p_sys->p_input, "highlight", false );
}
+ vlc_global_unlock( VLC_HIGHLIGHT_MUTEX );
}
static void ESSubtitleUpdate( demux_t *p_demux )
goto bailout;
}
#endif
+ /* Match extension as the anchor exhibits too many false positives */
+ const char *ext = strrchr( psz_name, '.' );
+ if( ext == NULL )
+ goto bailout;
+ ext++;
+ if( strcasecmp( ext, "iso" ) && strcasecmp( ext, "img" ) )
+ goto bailout;
+
/* Try to find the anchor (2 bytes at LBA 256) */
uint16_t anchor;
projects / vlc / blobdiff