#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_charset.h>
-
#include <vlc_interface.h>
+#include <vlc_dialog.h>
#include <vlc_iso_lang.h>
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname( N_("DVD without menus") );
- set_description( N_("DVDRead Input (DVD without menu support)") );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_ACCESS );
+vlc_module_begin ()
+ set_shortname( N_("DVD without menus") )
+ set_description( N_("DVDRead Input (no menu support)") )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_ACCESS )
add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
- ANGLE_LONGTEXT, false );
+ ANGLE_LONGTEXT, false )
add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, true );
+ CACHING_TEXT, CACHING_LONGTEXT, true )
add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT,
- CSSMETHOD_LONGTEXT, true );
- change_string_list( psz_css_list, psz_css_list_text, 0 );
- set_capability( "access_demux", 0 );
- add_shortcut( "dvd" );
- add_shortcut( "dvdread" );
- add_shortcut( "dvdsimple" );
- set_callbacks( Open, Close );
-vlc_module_end();
+ CSSMETHOD_LONGTEXT, true )
+ change_string_list( psz_css_list, psz_css_list_text, 0 )
+ set_capability( "access_demux", 0 )
+ add_shortcut( "dvd" )
+ add_shortcut( "dvdread" )
+ add_shortcut( "dvdsimple" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/* how many blocks DVDRead will read in each loop */
#define DVD_BLOCK_READ_ONCE 4
char *psz_dvdcss_env;
dvd_reader_t *p_dvdread;
ifo_handle_t *p_vmg_file;
- vlc_value_t val;
if( !p_demux->psz_path || !*p_demux->psz_path )
{
if( !(p_dvdread = DVDOpen( psz_name )) )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
- intf_UserFatal( p_demux, false, _("Playback failure"),
- _("DVDRead could not open the disk \"%s\"."), psz_name );
+ dialog_Fatal( p_demux, _("Playback failure"),
+ _("DVDRead could not open the disc \"%s\"."), psz_name );
free( psz_name );
return VLC_EGENERIC;
}
p_sys->i_title = p_sys->i_chapter = -1;
p_sys->i_mux_rate = 0;
- var_Create( p_demux, "dvdread-angle", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- var_Get( p_demux, "dvdread-angle", &val );
- p_sys->i_angle = val.i_int > 0 ? val.i_int : 1;
+ p_sys->i_angle = var_CreateGetInteger( p_demux, "dvdread-angle" );
+ if( p_sys->i_angle <= 0 ) p_sys->i_angle = 1;
DemuxTitles( p_demux, &p_sys->i_angle );
if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS )
1, p_buffer ) != 1 )
{
msg_Err( p_demux, "read failed for block %d", p_sys->i_next_vobu );
- intf_UserWarn( p_demux, _("Playback failure"),
- _("DVDRead could not read block %d."),
- p_sys->i_next_vobu );
+ dialog_Fatal( p_demux, _("Playback failure"),
+ _("DVDRead could not read block %d."),
+ p_sys->i_next_vobu );
return -1;
}
{
msg_Err( p_demux, "read failed for %d/%d blocks at 0x%02x",
i_read, i_blocks_once, p_sys->i_cur_block );
- intf_UserFatal( p_demux, false, _("Playback failure"),
+ dialog_Fatal( p_demux, _("Playback failure"),
_("DVDRead could not read %d/%d blocks at 0x%02x."),
i_read, i_blocks_once, p_sys->i_cur_block );
return -1;
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t *p = pkt;
- while( p < &pkt[i_pkt] )
+ while( p && p < &pkt[i_pkt] )
{
- int i_size = ps_pkt_size( p, &pkt[i_pkt] - p );
block_t *p_pkt;
+ int i_size = &pkt[i_pkt] - p;
+
+ if( i_size < 6 )
+ break;
+
+ i_size = ps_pkt_size( p, i_size );
if( i_size <= 0 )
{
break;
/* 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;
}
}
else if( tk->fmt.i_cat == AUDIO_ES )
static int DvdReadSetArea( demux_t *p_demux, int i_title, int i_chapter,
int i_angle )
{
+ VLC_UNUSED( i_angle );
+
demux_sys_t *p_sys = p_demux->p_sys;
int pgc_id = 0, pgn = 0;
int i;
*****************************************************************************/
static void DemuxTitles( demux_t *p_demux, int *pi_angle )
{
+ VLC_UNUSED( pi_angle );
+
demux_sys_t *p_sys = p_demux->p_sys;
input_title_t *t;
seekpoint_t *s;
- int32_t i_titles;
- int i;
/* Find out number of titles/chapters */
#define tt_srpt p_sys->p_vmg_file->tt_srpt
- i_titles = tt_srpt->nr_of_srpts;
+ int32_t i_titles = tt_srpt->nr_of_srpts;
msg_Dbg( p_demux, "number of titles: %d", i_titles );
- for( i = 0; i < i_titles; i++ )
+ for( int i = 0; i < i_titles; i++ )
{
int32_t i_chapters = 0;
int j;