/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CACHING_TEXT N_("caching value in ms")
+#define ANGLE_TEXT N_("DVD angle")
+#define ANGLE_LONGTEXT N_( \
+ "Allows you to select the default DVD angle." )
+
+#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for DVDread streams. " \
"This value should be set in millisecond units." )
static void Close( vlc_object_t * );
vlc_module_begin();
- set_description( _("DVDRead Input") );
+ set_name( _("DVD without menus") );
+ set_description( _("DVDRead Input (DVD without menu support)") );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_ACCESS );
+ add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
+ ANGLE_LONGTEXT, VLC_FALSE );
add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "dvdread-css-method", NULL, NULL, CSSMETHOD_TEXT,
CSSMETHOD_LONGTEXT, VLC_TRUE );
change_string_list( psz_css_list, psz_css_list_text, 0 );
set_capability( "access_demux", 0 );
- //add_shortcut( "dvd" );
+ 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 64
+#define DVD_BLOCK_READ_ONCE 4
/*****************************************************************************
* Local prototypes
ifo_handle_t *p_vmg_file;
ifo_handle_t *p_vts_file;
- unsigned int i_title;
- unsigned int i_chapter, i_chapters;
- unsigned int i_angle, i_angles;
+ int i_title;
+ int i_chapter, i_chapters;
+ int i_angle, i_angles;
tt_srpt_t *p_tt_srpt;
pgc_t *p_cur_pgc;
-
dsi_t dsi_pack;
-
int i_ttn;
- unsigned int i_pack_len;
- unsigned int i_cur_block;
- unsigned int i_next_vobu;
+ int i_pack_len;
+ int i_cur_block;
+ int i_next_vobu;
/* Current title start/end blocks */
- unsigned int i_title_start_block;
- unsigned int i_title_end_block;
- unsigned int i_title_blocks;
- unsigned int i_title_offset;
+ int i_title_start_block;
+ int i_title_end_block;
+ int i_title_blocks;
+ int i_title_offset;
- unsigned int i_title_start_cell;
- unsigned int i_cur_cell;
- unsigned int i_next_cell;
+ int i_title_start_cell;
+ int i_title_end_cell;
+ int i_cur_cell;
+ int i_next_cell;
- /* track */
- ps_track_t tk[PS_TK_COUNT];
+ /* Track */
+ ps_track_t tk[PS_TK_COUNT];
+ int i_mux_rate;
- /* for spu variables */
- input_thread_t *p_input;
-
- /* FIXME */
- uint8_t alpha[4];
- uint32_t clut[16];
+ int i_titles;
+ input_title_t **titles;
- /* */
+ /* Video */
int i_aspect;
- int i_titles;
- input_title_t **titles;
+ /* SPU */
+ uint32_t clut[16];
};
-static char *ParseCL( vlc_object_t *, char *, vlc_bool_t, int *, int *, int *);
-
static int Control ( demux_t *, int, va_list );
static int Demux ( demux_t * );
static int DemuxBlock( demux_t *, uint8_t *, int );
-enum
-{
- AR_SQUARE_PICTURE = 1, /* square pixels */
- AR_3_4_PICTURE = 2, /* 3:4 picture (TV) */
- AR_16_9_PICTURE = 3, /* 16:9 picture (wide screen) */
- AR_221_1_PICTURE = 4, /* 2.21:1 picture (movie) */
-};
-
-static void DemuxTitles( demux_t *, int *, int *, int * );
+static void DemuxTitles( demux_t *, int * );
static void ESNew( demux_t *, int, int );
static int DvdReadSetArea ( demux_t *, int, int, int );
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- int i_title, i_chapter, i_angle;
char *psz_name;
char *psz_dvdcss_env;
dvd_reader_t *p_dvdread;
ifo_handle_t *p_vmg_file;
+ vlc_value_t val;
- psz_name = ParseCL( VLC_OBJECT(p_demux), p_demux->psz_path, VLC_TRUE,
- &i_title, &i_chapter, &i_angle );
- if( !psz_name )
+ if( !p_demux->psz_path || !*p_demux->psz_path )
{
- return VLC_EGENERIC;
+ /* Only when selected */
+ if( !p_this->b_force ) return VLC_EGENERIC;
+
+ psz_name = var_CreateGetString( p_this, "dvd" );
+ if( !psz_name || !*psz_name )
+ {
+ if( psz_name ) free( psz_name );
+ return VLC_EGENERIC;
+ }
}
+ else psz_name = strdup( p_demux->psz_path );
+
+#ifdef WIN32
+ if( psz_name[0] && psz_name[1] == ':' &&
+ psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
+#endif
/* Override environment variable DVDCSS_METHOD with config option
* (FIXME: this creates a small memory leak) */
psz_env = malloc( strlen("DVDCSS_METHOD=") +
strlen( psz_dvdcss_env ) + 1 );
-
if( !psz_env )
{
free( psz_dvdcss_env );
ps_track_init( p_sys->tk );
p_sys->i_aspect = -1;
+ p_sys->i_mux_rate = 0;
p_sys->p_dvdread = p_dvdread;
p_sys->p_vmg_file = p_vmg_file;
p_sys->p_vts_file = NULL;
p_sys->i_title = p_sys->i_chapter = -1;
- p_sys->i_angle = i_angle;
- DemuxTitles( p_demux, &i_title, &i_chapter, &i_angle );
+ 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;
- DvdReadSetArea( p_demux, i_title - 1, i_chapter, i_angle );
+ DemuxTitles( p_demux, &p_sys->i_angle );
+ DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle );
/* Update default_pts to a suitable value for dvdread access */
var_Create( p_demux, "dvdread-caching",
return VLC_SUCCESS;
}
+ case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->i_mux_rate > 0 )
+ {
+ *pi64 = (int64_t)1000000 * DVD_VIDEO_LB_LEN *
+ p_sys->i_title_offset / 50 / p_sys->i_mux_rate;
+ return VLC_SUCCESS;
+ }
+ *pi64 = 0;
+ return VLC_EGENERIC;
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->i_mux_rate > 0 )
+ {
+ *pi64 = (int64_t)1000000 * DVD_VIDEO_LB_LEN *
+ p_sys->i_title_blocks / 50 / p_sys->i_mux_rate;
+ return VLC_SUCCESS;
+ }
+ *pi64 = 0;
+ return VLC_EGENERIC;
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_GET_TITLE_INFO:
ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
pi_int = (int*)va_arg( args, int* );
+ *((int*)va_arg( args, int* )) = 1; /* Title offset */
+ *((int*)va_arg( args, int* )) = 1; /* Chapter offset */
/* Duplicate title infos */
*pi_int = p_sys->i_titles;
/* End of title */
if( p_sys->i_next_vobu > p_sys->i_title_end_block )
{
- if( p_sys->i_title + 1 >= p_sys->i_titles ) return 0; /* EOF */
+ if( p_sys->i_title + 1 >= p_sys->i_titles )
+ {
+ return 0; /* EOF */
+ }
DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 );
}
- if( p_sys->i_pack_len <= 0 )
+ if( p_sys->i_pack_len >= 1024 )
{
- msg_Err( p_demux, "i_pack_len <= 0. This shouldn't happen!" );
+ msg_Err( p_demux, "i_pack_len >= 1024 (%i). "
+ "This shouldn't happen!", p_sys->i_pack_len );
return 0; /* EOF */
}
if( p_sys->i_cur_block > p_sys->i_title_end_block )
{
- if( p_sys->i_title + 1 >= p_sys->i_titles ) return 0; /* EOF */
+ if( p_sys->i_title + 1 >= p_sys->i_titles )
+ {
+ return 0; /* EOF */
+ }
DvdReadSetArea( p_demux, p_sys->i_title + 1, 0, -1 );
}
if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) )
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_scr );
+ if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
}
block_Release( p_pkt );
break;
if( tk->b_seen ) return;
- if( ps_track_fill( tk, i_id ) )
+ if( ps_track_fill( tk, 0, i_id ) )
{
msg_Warn( p_demux, "unknown codec for id=0x%x", i_id );
return;
int i_angle )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int pgc_id = 0;
- int pgn = 0;
- int i;
- vlc_value_t val;
+ int pgc_id = 0, pgn = 0;
+ int i;
#define p_pgc p_sys->p_cur_pgc
#define p_vmg p_sys->p_vmg_file
p_sys->i_title_start_block =
p_pgc->cell_playback[i_start_cell].first_sector;
- i_end_cell = p_pgc->nr_of_cells - 1;
+ p_sys->i_title_end_cell =
+ i_end_cell = p_pgc->nr_of_cells - 1;
p_sys->i_title_end_block =
p_pgc->cell_playback[i_end_cell].last_sector;
ESNew( p_demux, 0xe0, 0 ); /* Video, FIXME ? */
+ p_sys->i_aspect = p_vts->vtsi_mat->vts_video_attr.display_aspect_ratio;
#define audio_control \
p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->audio_control[i-1]
}
#undef audio_control
+#define spu_palette \
+ p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->palette
+
+ memcpy( p_sys->clut, spu_palette, 16 * sizeof( uint32_t ) );
+
#define spu_control \
p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id-1].pgc->subp_control[i-1]
/* 16:9 */
switch( p_vts->vtsi_mat->vts_video_attr.permitted_df )
{
- case 1:
+ case 1: /* letterbox */
i_position = spu_control & 0xff;
break;
- case 2:
+ case 2: /* pan&scan */
i_position = ( spu_control >> 8 ) & 0xff;
break;
- default:
+ default: /* widescreen */
i_position = ( spu_control >> 16 ) & 0xff;
break;
}
#undef spu_control
}
- else
+ else if( i_title != -1 && i_title != p_sys->i_title )
+
{
- /* TODO: update input ? */
+ return VLC_EGENERIC; /* Couldn't set title */
}
/*
* Chapter selection
*/
- if( i_chapter >= 0 && i_chapter <= p_sys->i_chapters &&
- i_chapter != p_sys->i_chapter )
+ if( i_chapter >= 0 && i_chapter < p_sys->i_chapters )
{
pgc_id = p_vts->vts_ptt_srpt->title[
p_sys->i_ttn - 1].ptt[i_chapter].pgcn;
p_demux->info.i_seekpoint = i_chapter;
}
}
+ else if( i_chapter != -1 )
+
+ {
+ return VLC_EGENERIC; /* Couldn't set chapter */
+ }
#undef p_pgc
#undef p_vts
static void DvdReadSeek( demux_t *p_demux, int i_block_offset )
{
demux_sys_t *p_sys = p_demux->p_sys;
- unsigned int i_tmp;
- unsigned int i_chapter = 0;
- unsigned int i_cell = 0;
- unsigned int i_vobu = 0;
- unsigned int i_sub_cell = 0;
+ int i_chapter = 0;
+ int i_cell = 0;
+ int i_vobu = 0;
+ int i_sub_cell = 0;
int i_block;
#define p_pgc p_sys->p_cur_pgc
#define p_vts p_sys->p_vts_file
/* Find cell */
- p_sys->i_title_offset = i_block = i_block_offset;
- while( i_block >= (int)p_pgc->cell_playback[i_cell].last_sector -
- (int)p_pgc->cell_playback[i_cell].first_sector + 1 )
+ i_block = i_block_offset;
+ for( i_cell = p_sys->i_title_start_cell;
+ i_cell <= p_sys->i_title_end_cell; i_cell++ )
{
- i_cell++;
+ if( i_block < (int)p_pgc->cell_playback[i_cell].last_sector -
+ (int)p_pgc->cell_playback[i_cell].first_sector + 1 ) break;
- i_block -= p_pgc->cell_playback[i_cell].last_sector -
- p_pgc->cell_playback[i_cell].first_sector + 1;
+ i_block -= (p_pgc->cell_playback[i_cell].last_sector -
+ p_pgc->cell_playback[i_cell].first_sector + 1);
+ }
+ if( i_cell > p_sys->i_title_end_cell )
+ {
+ msg_Err( p_demux, "couldn't find cell for block %i", i_block_offset );
+ return;
}
-
i_block += p_pgc->cell_playback[i_cell].first_sector;
+ p_sys->i_title_offset = i_block_offset;
/* Find chapter */
- do
+ for( i_chapter = 0; i_chapter < p_sys->i_chapters; i_chapter++ )
{
- int pgc_id, pgn;
+ int pgc_id, pgn, i_tmp;
- i_chapter++;
pgc_id = p_vts->vts_ptt_srpt->title[
p_sys->i_ttn - 1].ptt[i_chapter].pgcn;
pgn = p_vts->vts_ptt_srpt->title[
i_tmp = p_vts->vts_pgcit->pgci_srp[pgc_id - 1].pgc->program_map[pgn-1];
- } while( i_tmp <= i_cell );
+ if( i_tmp > i_cell ) break;
+ }
+
+ if( i_chapter < p_sys->i_chapters &&
+ p_demux->info.i_seekpoint != i_chapter )
+ {
+ p_demux->info.i_update |= INPUT_UPDATE_SEEKPOINT;
+ p_demux->info.i_seekpoint = i_chapter;
+ }
/* Find vobu */
- while( p_vts->vts_vobu_admap->vobu_start_sectors[i_vobu] <= i_block )
+ while( (int)p_vts->vts_vobu_admap->vobu_start_sectors[i_vobu] <= i_block )
{
i_vobu++;
}
#if 1
msg_Dbg( p_demux, "cell %d i_sub_cell %d chapter %d vobu %d "
"cell_sector %d vobu_sector %d sub_cell_sector %d",
- i_cell, i_sub_cell,i_chapter, i_vobu,
+ i_cell, i_sub_cell, i_chapter, i_vobu,
p_sys->p_cur_pgc->cell_playback[i_cell].first_sector,
p_vts->vts_vobu_admap->vobu_start_sectors[i_vobu],
p_vts->vts_c_adt->cell_adr_table[i_sub_cell - 1].start_sector);
* care about.
*/
p_sys->i_cur_block = p_sys->dsi_pack.dsi_gi.nv_pck_lbn;
+ p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
/*
* If we're not at the end of this cell, we can determine the next
* avoiding the doubled scenes in The Matrix, and makes our life
* really happy.
*/
- if( p_sys->dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL )
+
+ p_sys->i_next_vobu = p_sys->i_cur_block +
+ ( p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
+
+ if( p_sys->dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL
+ && p_sys->i_angle > 1 )
{
switch( ( p_sys->dsi_pack.sml_pbi.category & 0xf000 ) >> 12 )
{
{
p_sys->i_next_vobu = p_sys->i_cur_block +
p_sys->dsi_pack.dsi_gi.vobu_ea + 1;
- p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
}
break;
case 0x5:
default:
p_sys->i_next_vobu = p_sys->i_cur_block +
( p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff );
- p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
break;
}
}
- else
+ else if( p_sys->dsi_pack.vobu_sri.next_vobu == SRI_END_OF_CELL )
{
p_sys->i_cur_cell = p_sys->i_next_cell;
DvdReadFindCell( p_demux );
- p_sys->i_pack_len = p_sys->dsi_pack.dsi_gi.vobu_ea;
p_sys->i_next_vobu =
p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].first_sector;
}
#if 0
- msg_Dbg( p_input, 12, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d",
+ msg_Dbg( p_demux, 12, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d",
p_sys->dsi_pack.dsi_gi.nv_pck_scr,
p_sys->dsi_pack.dsi_gi.nv_pck_lbn,
p_sys->dsi_pack.dsi_gi.vobu_ea,
p_sys->dsi_pack.dsi_gi.vobu_vob_idn,
p_sys->dsi_pack.dsi_gi.vobu_c_idn );
- msg_Dbg( p_input, 12, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d",
+ msg_Dbg( p_demux, 12, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d",
p_sys->dsi_pack.sml_pbi.category,
p_sys->dsi_pack.sml_pbi.ilvu_ea,
p_sys->dsi_pack.sml_pbi.ilvu_sa,
p_sys->dsi_pack.sml_pbi.size );
- msg_Dbg( p_input, 12, "next_vobu %d next_ilvu1 %d next_ilvu2 %d",
+ msg_Dbg( p_demux, 12, "next_vobu %d next_ilvu1 %d next_ilvu2 %d",
p_sys->dsi_pack.vobu_sri.next_vobu & 0x7fffffff,
p_sys->dsi_pack.sml_agli.data[ p_sys->i_angle - 1 ].address,
p_sys->dsi_pack.sml_agli.data[ p_sys->i_angle ].address);
if( cell[p_sys->i_cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK )
{
-#if 0
- p_sys->i_next_cell = p_sys->i_cur_cell + p_sys->i_angle_nb;
- p_sys->i_cur_cell += p_sys->i_angle - 1;
-#else
p_sys->i_cur_cell += p_sys->i_angle - 1;
while( cell[p_sys->i_cur_cell+i].block_mode != BLOCK_MODE_LAST_CELL )
i++;
}
p_sys->i_next_cell = p_sys->i_cur_cell + i + 1;
-#endif
}
else
{
#undef cell
+ if( p_sys->i_chapter + 1 >= p_sys->i_chapters ) return;
+
pgc_id = p_sys->p_vts_file->vts_ptt_srpt->title[
- p_sys->i_ttn - 1].ptt[p_sys->i_chapter].pgcn;
+ p_sys->i_ttn - 1].ptt[p_sys->i_chapter + 1].pgcn;
pgn = p_sys->p_vts_file->vts_ptt_srpt->title[
- p_sys->i_ttn - 1].ptt[p_sys->i_chapter].pgn;
+ p_sys->i_ttn - 1].ptt[p_sys->i_chapter + 1].pgn;
p_pgc = p_sys->p_vts_file->vts_pgcit->pgci_srp[pgc_id - 1].pgc;
- if( p_pgc->program_map[pgn - 1] <= p_sys->i_cur_cell )
+ if( p_sys->i_cur_cell >= p_pgc->program_map[pgn - 1] - 1 )
{
p_sys->i_chapter++;
/*****************************************************************************
* DemuxTitles: get the titles/chapters structure
*****************************************************************************/
-static void DemuxTitles( demux_t *p_demux,
- int *pi_title, int *pi_chapter, int *pi_angle )
+static void DemuxTitles( demux_t *p_demux, int *pi_angle )
{
demux_sys_t *p_sys = p_demux->p_sys;
input_title_t *t;
msg_Dbg( p_demux, "title %d has %d chapters", i, i_chapters );
t = vlc_input_title_New();
+
for( j = 0; j < __MAX( i_chapters, 1 ); j++ )
{
s = vlc_seekpoint_New();
TAB_APPEND( p_sys->i_titles, p_sys->titles, t );
}
- /* Set forced title/chapter/angle */
- *pi_title = (*pi_title >= 1 && *pi_title <= i_titles) ? *pi_title : 1;
- *pi_chapter = (*pi_chapter >= 0 && *pi_chapter <
- tt_srpt->title[*pi_title].nr_of_ptts) ? *pi_chapter : 0;
-
#undef tt_srpt
}
-
-/*****************************************************************************
- * ParseCL: parse command line
- *****************************************************************************/
-static char *ParseCL( vlc_object_t *p_this, char *psz_name, vlc_bool_t b_force,
- int *i_title, int *i_chapter, int *i_angle )
-{
- char *psz_parser, *psz_source, *psz_next;
-
- psz_source = strdup( psz_name );
- if( psz_source == NULL ) return NULL;
-
- *i_title = 0;
- *i_chapter = 0;
- *i_angle = 1;
-
- /* Start with the end, because you could have :
- * dvdnav:/Volumes/my@toto/VIDEO_TS@1,1
- * (yes, this is kludgy). */
- for( psz_parser = psz_source + strlen(psz_source) - 1;
- psz_parser >= psz_source && *psz_parser != '@';
- psz_parser-- );
-
- if( psz_parser >= psz_source && *psz_parser == '@' )
- {
- /* Found options */
- *psz_parser = '\0';
- ++psz_parser;
-
- *i_title = (int)strtol( psz_parser, &psz_next, 10 );
- if( *psz_next )
- {
- psz_parser = psz_next + 1;
- *i_chapter = (int)strtol( psz_parser, &psz_next, 10 );
- if( *psz_next )
- {
- *i_angle = (int)strtol( psz_next + 1, NULL, 10 );
- }
- }
- }
-
- *i_title = *i_title >= 0 ? *i_title : 0;
- *i_chapter = *i_chapter ? *i_chapter : 0;
- *i_angle = *i_angle ? *i_angle : 1;
-
- if( !*psz_source )
- {
- free( psz_source );
- if( !b_force )
- {
- return NULL;
- }
- psz_source = config_GetPsz( p_this, "dvd" );
- if( !psz_source ) return NULL;
- }
-
-#ifdef WIN32
- if( psz_source[0] && psz_source[1] == ':' &&
- psz_source[2] == '\\' && psz_source[3] == '\0' )
- {
- psz_source[2] = '\0';
- }
-#endif
-
- msg_Dbg( p_this, "dvdroot=%s title=%d chapter=%d angle=%d",
- psz_source, *i_title, *i_chapter, *i_angle );
-
- return psz_source;
-}
projects / vlc / blobdiff