set_description( N_("DVDnav Input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
- add_integer( "dvdnav-angle", 1, NULL, ANGLE_TEXT,
+ add_integer( "dvdnav-angle", 1, ANGLE_TEXT,
ANGLE_LONGTEXT, false )
- add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ add_integer( "dvdnav-caching", DEFAULT_PTS_DELAY / 1000,
CACHING_TEXT, CACHING_LONGTEXT, true )
- add_bool( "dvdnav-menu", true, NULL,
+ add_bool( "dvdnav-menu", true,
MENU_TEXT, MENU_LONGTEXT, false )
set_capability( "access_demux", 5 )
add_shortcut( "dvd", "dvdnav", "file" )
demux_sys_t *p_sys;
dvdnav_t *p_dvdnav;
int i_angle;
- char *psz_name;
+ char *psz_file;
char *psz_code;
if( !p_demux->psz_file || !*p_demux->psz_file )
if( !p_demux->psz_access || !*p_demux->psz_access )
return VLC_EGENERIC;
- psz_name = var_CreateGetString( p_this, "dvd" );
- if( !psz_name )
- {
- psz_name = strdup("");
- }
+ psz_file = var_InheritString( p_this, "dvd" );
}
else
- psz_name = ToLocaleDup( p_demux->psz_file );
+ psz_file = strdup( p_demux->psz_file );
#ifdef WIN32
- /* Remove trailing backslash, otherwise dvdnav_open will fail */
- if( *psz_name && *(psz_name + strlen(psz_name) - 1) == '\\' )
+ if( psz_file != NULL )
{
- *(psz_name + strlen(psz_name) - 1) = '\0';
+ /* 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( p_demux, psz_name ) != VLC_SUCCESS )
+ if( ProbeDVD( p_demux, psz_file ) != VLC_SUCCESS )
{
- free( psz_name );
+ free( psz_file );
return VLC_EGENERIC;
}
/* Open dvdnav */
- if( dvdnav_open( &p_dvdnav, psz_name ) != DVDNAV_STATUS_OK )
+ 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 dvdnav" );
- free( psz_name );
+ msg_Warn( p_demux, "cannot open DVD (%s)", psz_file);
+ free( psz_file );
return VLC_EGENERIC;
}
- free( psz_name );
+ free( psz_file );
/* Fill p_demux field */
DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys;
dvdnav_get_number_of_titles( p_sys->dvdnav, &i_titles );
for( i = 1; i <= i_titles; i++ )
{
- int32_t i_chapters = 0;
- int j;
-
- dvdnav_get_number_of_parts( p_sys->dvdnav, i, &i_chapters );
-
+ 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
+ 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
t = vlc_input_title_New();
- for( j = 0; j < __MAX( i_chapters, 1 ); j++ )
+ t->i_length = i_title_length * 1000 / 90;
+ for( int j = 0; j < __MAX( i_chapters, 1 ); j++ )
{
s = vlc_seekpoint_New();
TAB_APPEND( t->i_seekpoint, t->seekpoint, s );
/*****************************************************************************
* DemuxBlock: demux a given block
*****************************************************************************/
-static int DemuxBlock( demux_t *p_demux, const uint8_t *pkt, int i_pkt )
+static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
{
demux_sys_t *p_sys = p_demux->p_sys;
- const uint8_t *p = pkt;
- while( (p - pkt) <= (i_pkt - 6) )
+ while( len > 0 )
{
- /* ps_pkt_size() needs at least 6 bytes */
- int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
- if( i_size <= 0 )
+ int i_size = ps_pkt_size( p, len );
+ if( i_size <= 0 || i_size > len )
{
break;
}
}
p += i_size;
+ len -= i_size;
}
return VLC_SUCCESS;