/*****************************************************************************
* 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>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h> /* close() */
+
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_demux.h>
#include <vlc_charset.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 <errno.h>
-
-#include <vlc_keys.h>
#include <vlc_iso_lang.h>
/* FIXME we should find a better way than including that */
#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 "\
#define LANGUAGE_DEFAULT ("en")
-static int Open ( vlc_object_t * );
+static int AccessDemuxOpen ( vlc_object_t * );
static void Close( vlc_object_t * );
+#if DVDREAD_VERSION >= 50300
+#define HAVE_DVDNAV_DEMUX
+static int DemuxOpen ( vlc_object_t * );
+#endif
+
vlc_module_begin ()
set_shortname( N_("DVD with menus") )
set_description( N_("DVDnav Input") )
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 )
add_shortcut( "dvd", "dvdnav", "file" )
- set_callbacks( Open, Close )
+ set_callbacks( AccessDemuxOpen, Close )
+#ifdef HAVE_DVDNAV_DEMUX
+ add_submodule()
+ set_description( N_("DVDnav demuxer") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability( "demux", 5 )
+ set_callbacks( DemuxOpen, Close )
+ add_shortcut( "dvd", "iso" )
+#endif
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
/* */
bool b_reset_pcr;
+ bool b_readahead;
struct
{
static void StillTimer( 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:
+ * CommonOpen:
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int CommonOpen( vlc_object_t *p_this,
+ dvdnav_t *p_dvdnav, bool b_readahead )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- dvdnav_t *p_dvdnav;
int i_angle;
- char *psz_file;
char *psz_code;
- if( !p_demux->psz_file || !*p_demux->psz_file )
- {
- /* Only when selected */
- if( !p_demux->psz_access || !*p_demux->psz_access )
- return VLC_EGENERIC;
-
- psz_file = var_InheritString( p_this, "dvd" );
- }
- else
- psz_file = strdup( p_demux->psz_file );
-
-#if defined( WIN32 ) || defined( __OS2__ )
- if( psz_file != NULL )
- {
- /* Remove trailing backslash, otherwise dvdnav_open will fail */
- size_t flen = strlen( psz_file );
- if( flen > 0 && psz_file[flen - 1] == '\\' )
- psz_file[flen - 1] = '\0';
- }
- else
- psz_file = strdup("");
-#endif
- if( unlikely(psz_file == NULL) )
- return VLC_EGENERIC;
-
- /* Try some simple probing to avoid going through dvdnav_open too often */
- if( ProbeDVD( psz_file ) != VLC_SUCCESS )
- {
- free( psz_file );
- return VLC_EGENERIC;
- }
-
- /* Open dvdnav */
- const char *psz_path = ToLocale( psz_file );
- if( dvdnav_open( &p_dvdnav, psz_path ) != DVDNAV_STATUS_OK )
- p_dvdnav = NULL;
- LocaleFree( psz_path );
- if( p_dvdnav == NULL )
- {
- msg_Warn( p_demux, "cannot open DVD (%s)", psz_file);
- free( psz_file );
- return VLC_EGENERIC;
- }
- free( psz_file );
+ assert( p_dvdnav );
/* Fill p_demux field */
DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
p_sys->b_spu_change = false;
p_sys->i_vobu_index = 0;
p_sys->i_vobu_flush = 0;
+ p_sys->b_readahead = b_readahead;
if( 1 )
{
}
/* Configure dvdnav */
- if( dvdnav_set_readahead_flag( p_sys->dvdnav, DVD_READ_CACHE ) !=
+ if( dvdnav_set_readahead_flag( p_sys->dvdnav, p_sys->b_readahead ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "cannot set read-a-head flag" );
msg_Warn( p_demux, "cannot set PGC positioning flag" );
}
- /* Set menu language
- * XXX A menu-language may be better than sub-language */
- psz_code = DemuxGetLanguageCode( p_demux, "sub-language" );
+ /* Set menu language */
+ psz_code = DemuxGetLanguageCode( p_demux, "menu-language" );
if( dvdnav_menu_language_select( p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{
dialog_Fatal( p_demux, _("Playback failure"), "%s",
_("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;
}
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 );
/* catch vout creation event */
var_AddCallback( p_sys->p_input, "intf-event", EventIntf, p_demux );
return VLC_SUCCESS;
}
+/*****************************************************************************
+ * AccessDemuxOpen:
+ *****************************************************************************/
+static int AccessDemuxOpen ( vlc_object_t *p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ dvdnav_t *p_dvdnav = NULL;
+ char *psz_file = NULL;
+ const char *psz_path = NULL;
+ int i_ret = VLC_EGENERIC;
+ 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( !forced )
+ return VLC_EGENERIC;
+
+ psz_file = var_InheritString( p_this, "dvd" );
+ }
+ else
+ psz_file = strdup( p_demux->psz_file );
+
+#if defined( _WIN32 ) || defined( __OS2__ )
+ if( psz_file != NULL )
+ {
+ /* Remove trailing backslash, otherwise dvdnav_open will fail */
+ size_t flen = strlen( psz_file );
+ if( flen > 0 && psz_file[flen - 1] == '\\' )
+ psz_file[flen - 1] = '\0';
+ }
+ else
+ psz_file = strdup("");
+#endif
+
+ if( unlikely(psz_file == NULL) )
+ return VLC_EGENERIC;
+
+ /* Try some simple probing to avoid going through dvdnav_open too often */
+ if( !forced && ProbeDVD( psz_file ) != VLC_SUCCESS )
+ goto bailout;
+
+ /* Open dvdnav */
+ psz_path = ToLocale( psz_file );
+ if( dvdnav_open( &p_dvdnav, psz_path ) != DVDNAV_STATUS_OK )
+ {
+ msg_Warn( p_demux, "cannot open DVD (%s)", psz_file);
+ goto bailout;
+ }
+
+ i_ret = CommonOpen( p_this, p_dvdnav, !!DVD_READ_CACHE );
+ if( i_ret != VLC_SUCCESS )
+ dvdnav_close( p_dvdnav );
+
+bailout:
+ free( psz_file );
+ if( psz_path )
+ LocaleFree( psz_path );
+ return i_ret;
+}
+
+#ifdef HAVE_DVDNAV_DEMUX
+/*****************************************************************************
+ * StreamProbeDVD: very weak probing that avoids going too often into a dvdnav_open()
+ *****************************************************************************/
+static int StreamProbeDVD( stream_t *s )
+{
+ /* ISO 9660 volume descriptor */
+ char iso_dsc[6];
+ if( stream_Seek( s, 0x8000 + 1 ) != VLC_SUCCESS
+ || stream_Read( s, iso_dsc, sizeof (iso_dsc) ) < (int)sizeof (iso_dsc)
+ || memcmp( iso_dsc, "CD001\x01", 6 ) )
+ return VLC_EGENERIC;
+
+ /* Try to find the anchor (2 bytes at LBA 256) */
+ uint16_t anchor;
+
+ if( stream_Seek( s, 256 * DVD_VIDEO_LB_LEN ) == VLC_SUCCESS
+ && stream_Read( s, &anchor, 2 ) == 2
+ && GetWLE( &anchor ) == 2 )
+ return VLC_SUCCESS;
+ else
+ return VLC_EGENERIC;
+}
+
+/*****************************************************************************
+ * dvdnav stream callbacks
+ *****************************************************************************/
+static int stream_cb_seek( void *s, uint64_t pos )
+{
+ return stream_Seek( (stream_t *)s, pos );
+}
+
+static int stream_cb_read( void *s, void* buffer, int size )
+{
+ return stream_Read( (stream_t *)s, buffer, size );
+}
+
+/*****************************************************************************
+ * DemuxOpen:
+ *****************************************************************************/
+static int DemuxOpen ( vlc_object_t *p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ dvdnav_t *p_dvdnav = NULL;
+ int i_ret;
+ int64_t i_init_pos;
+ bool forced = false, b_seekable = false;
+
+ if( p_demux->psz_demux != NULL
+ && !strncmp(p_demux->psz_demux, "dvd", 3) )
+ forced = true;
+
+ /* StreamProbeDVD need FASTSEEK, but if dvd is forced, we don't probe thus
+ * don't need fastseek */
+ stream_Control( p_demux->s, forced ? STREAM_CAN_SEEK : STREAM_CAN_FASTSEEK,
+ &b_seekable );
+ if( !b_seekable )
+ return VLC_EGENERIC;
+
+ i_init_pos = stream_Tell( p_demux->s );
+
+ /* Try some simple probing to avoid going through dvdnav_open too often */
+ if( !forced && (i_ret = StreamProbeDVD( p_demux->s )) != VLC_SUCCESS )
+ goto bailout;
+
+ static dvdnav_stream_cb stream_cb =
+ {
+ .pf_seek = stream_cb_seek,
+ .pf_read = stream_cb_read,
+ .pf_readv = NULL,
+ };
+
+ /* Open dvdnav with stream callbacks */
+ if( dvdnav_open_stream( &p_dvdnav, p_demux->s,
+ &stream_cb ) != DVDNAV_STATUS_OK )
+ {
+ msg_Warn( p_demux, "cannot open DVD with open_stream" );
+ goto bailout;
+ }
+
+ i_ret = CommonOpen( p_this, p_dvdnav, false );
+ if( i_ret != VLC_SUCCESS )
+ dvdnav_close( p_dvdnav );
+
+bailout:
+ if( i_ret != VLC_SUCCESS )
+ stream_Seek( p_demux->s, i_init_pos );
+ return i_ret;
+}
+#endif
+
/*****************************************************************************
* Close:
*****************************************************************************/
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_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" );
*va_arg( args, int* ) = 1; /* Chapter offset */
/* Duplicate title infos */
- *ppp_title = malloc( sizeof( input_title_t ** ) * p_sys->i_title );
+ *ppp_title = malloc( p_sys->i_title * sizeof( input_title_t * ) );
for( i = 0; i < p_sys->i_title; i++ )
{
(*ppp_title)[i] = vlc_input_title_Duplicate( p_sys->title[i] );
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:
return VLC_EGENERIC;
}
+ case DEMUX_NAV_ACTIVATE:
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+
+ ButtonUpdate( p_demux, true );
+ dvdnav_button_activate( p_sys->dvdnav, pci );
+ break;
+ }
+
+ case DEMUX_NAV_UP:
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+
+ dvdnav_upper_button_select( p_sys->dvdnav, pci );
+ break;
+ }
+
+ case DEMUX_NAV_DOWN:
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+
+ dvdnav_lower_button_select( p_sys->dvdnav, pci );
+ break;
+ }
+
+ case DEMUX_NAV_LEFT:
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+
+ dvdnav_left_button_select( p_sys->dvdnav, pci );
+ break;
+ }
+
+ case DEMUX_NAV_RIGHT:
+ {
+ pci_t *pci = dvdnav_get_current_nav_pci( p_sys->dvdnav );
+
+ dvdnav_right_button_select( p_sys->dvdnav, pci );
+ break;
+ }
+
/* TODO implement others */
default:
return VLC_EGENERIC;
}
+
+ return VLC_SUCCESS;
}
static int ControlInternal( demux_t *p_demux, int i_query, ... )
uint8_t *packet = buffer;
int i_event;
int i_len;
+ dvdnav_status_t status;
-#if DVD_READ_CACHE
- if( dvdnav_get_next_cache_block( p_sys->dvdnav, &packet, &i_event, &i_len )
- == DVDNAV_STATUS_ERR )
-#else
- if( dvdnav_get_next_block( p_sys->dvdnav, packet, &i_event, &i_len )
- == DVDNAV_STATUS_ERR )
-#endif
+ if( p_sys->b_readahead )
+ status = dvdnav_get_next_cache_block( p_sys->dvdnav, &packet, &i_event,
+ &i_len );
+ else
+ status = dvdnav_get_next_block( p_sys->dvdnav, packet, &i_event,
+ &i_len );
+ if( status == DVDNAV_STATUS_ERR )
{
msg_Warn( p_demux, "cannot get next block (%s)",
dvdnav_err_to_string( p_sys->dvdnav ) );
tk->b_seen = false;
}
-#if defined(HAVE_DVDNAV_GET_VIDEO_RESOLUTION)
uint32_t i_width, i_height;
if( dvdnav_get_video_resolution( p_sys->dvdnav,
&i_width, &i_height ) )
p_sys->sar.i_den = 0;
break;
}
-#endif
if( dvdnav_current_title_info( p_sys->dvdnav, &i_title,
&i_part ) == DVDNAV_STATUS_OK )
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_update |= INPUT_UPDATE_SEEKPOINT;
+ p_demux->info.i_seekpoint = i_part - 1;
+ }
}
}
break;
case DVDNAV_STOP: /* EOF */
msg_Dbg( p_demux, "DVDNAV_STOP" );
-#if DVD_READ_CACHE
- dvdnav_free_cache_block( p_sys->dvdnav, packet );
-#endif
+ if( p_sys->b_readahead )
+ dvdnav_free_cache_block( p_sys->dvdnav, packet );
return 0;
case DVDNAV_HIGHLIGHT:
break;
}
-#if DVD_READ_CACHE
- dvdnav_free_cache_block( p_sys->dvdnav, packet );
-#endif
+ if( p_sys->b_readahead )
+ dvdnav_free_cache_block( p_sys->dvdnav, packet );
return 1;
}
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 ) )
/* Find out number of titles/chapters */
dvdnav_get_number_of_titles( p_sys->dvdnav, &i_titles );
+
+ if( i_titles > 90 )
+ msg_Err( p_demux, "This is probably an Arccos Protected DVD. This could take time..." );
+
for( i = 1; i <= i_titles; i++ )
{
int32_t i_chapters;
uint64_t i_title_length;
-
-#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;
-#else
- if( dvdnav_get_number_of_parts( p_sys->dvdnav, i, &i_chapters ) != DVDNAV_STATUS_OK )
- i_chapters = 0;
- i_title_length = 0;
-#endif
+ p_chapters_time = NULL;
+ }
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;
+ 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 )
}
/* Create a block */
- block_t *p_pkt = block_New( p_demux, i_size );
+ block_t *p_pkt = block_Alloc( i_size );
memcpy( p_pkt->p_buffer, p, i_size);
/* Parse it and send it */
if( tk->b_seen ) return;
- if( ps_track_fill( tk, 0, i_id ) )
+ if( ps_track_fill( tk, 0, i_id, NULL ) )
{
msg_Warn( p_demux, "unknown codec for id=0x%x", i_id );
return;
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 )
-{
- 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 EventIntf( vlc_object_t *p_input, char const *psz_var,
vlc_value_t oldval, vlc_value_t val, void *p_data )
{
#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) ) < (int)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;
projects / vlc / blobdiff