/*****************************************************************************
* dvdnav.c: DVD module using the dvdnav library.
*****************************************************************************
- * Copyright (C) 2004-2009 the VideoLAN team
+ * Copyright (C) 2004-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+
/*****************************************************************************
* Preamble
*****************************************************************************/
#endif
#include <assert.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_fs.h>
#include <vlc_url.h>
#include <vlc_vout.h>
-
#include <vlc_dialog.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#include <sys/types.h>
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef HAVE_FCNTL_H
-# include <fcntl.h>
-#endif
-
#include <vlc_keys.h>
#include <vlc_iso_lang.h>
#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 )
vlc_module_end ()
/* Shall we use libdvdnav's read ahead cache? */
+#ifdef __OS2__
+#define DVD_READ_CACHE 0
+#else
#define DVD_READ_CACHE 1
+#endif
/*****************************************************************************
* Local prototypes
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:
if( dvdnav_current_title_info( p_sys->dvdnav, &i_title,
&i_part ) == DVDNAV_STATUS_OK )
{
- if( i_title >= 0 && i_title < p_sys->i_title &&
- i_part >= 1 && i_part <= p_sys->title[i_title]->i_seekpoint &&
- p_demux->info.i_seekpoint != i_part - 1 )
+ if( i_title >= 0 && i_title < p_sys->i_title )
{
- p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
- p_demux->info.i_seekpoint = i_part - 1;
+ p_demux->info.i_update |= INPUT_UPDATE_TITLE;
+ p_demux->info.i_title = i_title;
+
+ if( i_part >= 1 && i_part <= p_sys->title[i_title]->i_seekpoint &&
+ p_demux->info.i_seekpoint != i_part - 1 )
+ {
+ p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
+ p_demux->info.i_seekpoint = i_part - 1;
+ }
}
}
break;
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 ) )
{
int32_t i_chapters;
uint64_t i_title_length;
+ uint64_t *p_chapters_time;
#if defined(HAVE_DVDNAV_DESCRIBE_TITLE_CHAPTERS)
- uint64_t *p_chapters_time;
i_chapters = dvdnav_describe_title_chapters( p_sys->dvdnav, i,
&p_chapters_time,
&i_title_length );
- if( i_chapters > 0 )
- free( p_chapters_time );
- else
+ if( i_chapters < 1 )
+ {
i_title_length = 0;
+ p_chapters_time = NULL;
+ }
#else
if( dvdnav_get_number_of_parts( p_sys->dvdnav, i, &i_chapters ) != DVDNAV_STATUS_OK )
i_chapters = 0;
i_title_length = 0;
+ p_chapters_time = NULL;
#endif
t = vlc_input_title_New();
t->i_length = i_title_length * 1000 / 90;
for( int j = 0; j < __MAX( i_chapters, 1 ); j++ )
{
s = vlc_seekpoint_New();
+ if( p_chapters_time )
+ s->i_time_offset = p_chapters_time[j] * 1000 / 90;
TAB_APPEND( t->i_seekpoint, t->seekpoint, s );
}
-
+ free( p_chapters_time );
TAB_APPEND( p_sys->i_title, p_sys->title, t );
}
}
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;
-
- 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;
- }
+ uint32_t i_yuv = p_sys->clut[(hl.palette>>(16+i*4))&0x0f];
+ uint8_t i_alpha = ( (hl.palette>>(i*4))&0x0f ) * 0xff / 0xf;
- 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 )
#endif
int ret = VLC_EGENERIC;
-
-#ifdef HAVE_SYS_STAT_H
struct stat stat_info;
if( fstat( fd, &stat_info ) == -1 )
goto bailout;
-
if( !S_ISREG( stat_info.st_mode ) )
{
if( S_ISDIR( stat_info.st_mode ) || S_ISBLK( stat_info.st_mode ) )
ret = VLC_SUCCESS; /* Let dvdnav_open() do the probing */
goto bailout;
}
-#endif
+
+ /* ISO 9660 volume descriptor */
+ char iso_dsc[6];
+ if( lseek( fd, 0x8000 + 1, SEEK_SET ) == -1
+ || read( fd, iso_dsc, sizeof (iso_dsc) ) < sizeof (iso_dsc)
+ || memcmp( iso_dsc, "CD001\x01", 6 ) )
+ goto bailout;
+
/* Try to find the anchor (2 bytes at LBA 256) */
uint16_t anchor;
&& read( fd, &anchor, 2 ) == 2
&& GetWLE( &anchor ) == 2 )
ret = VLC_SUCCESS; /* Found a potential anchor */
-
bailout:
close( fd );
return ret;