/*****************************************************************************
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2004 the VideoLAN team
* $Id$
*
- * Authors: Stéphane Borel <stef@via.ecp.fr>
+ * Authors: St�hane Borel <stef@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#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." )
+ "Default caching value for DVDs. " \
+ "This value should be set in milliseconds." )
#define CSSMETHOD_TEXT N_("Method used by libdvdcss for decryption")
#define CSSMETHOD_LONGTEXT N_( \
int i_cur_block;
int i_next_vobu;
+ int i_mux_rate;
+
/* Current title start/end blocks */
int i_title_start_block;
int i_title_end_block;
int i_title_blocks;
int i_title_offset;
+ mtime_t i_title_cur_time;
int i_title_start_cell;
int i_title_end_cell;
int i_cur_cell;
int i_next_cell;
+ mtime_t i_cell_cur_time;
+ mtime_t i_cell_duration;
/* Track */
ps_track_t tk[PS_TK_COUNT];
- int i_mux_rate;
int i_titles;
input_title_t **titles;
if( !p_this->b_force ) return VLC_EGENERIC;
psz_name = var_CreateGetString( p_this, "dvd" );
- if( !psz_name || !*psz_name )
+ if( !psz_name )
{
- if( psz_name ) free( psz_name );
- return VLC_EGENERIC;
+ psz_name = strdup("");
}
}
- else psz_name = strdup( p_demux->psz_path );
+ else
+ psz_name = strdup( p_demux->psz_path );
#ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' &&
ps_track_init( p_sys->tk );
p_sys->i_aspect = -1;
- p_sys->i_mux_rate = 0;
+ p_sys->i_title_cur_time = (mtime_t) 0;
+ p_sys->i_cell_cur_time = (mtime_t) 0;
+ p_sys->i_cell_duration = (mtime_t) 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_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;
DemuxTitles( p_demux, &p_sys->i_angle );
- DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle );
+ if( DvdReadSetArea( p_demux, 0, 0, p_sys->i_angle ) != VLC_SUCCESS )
+ {
+ Close( p_this );
+ msg_Err( p_demux, "DvdReadSetArea(0,0,%i) failed (can't decrypt DVD?)",
+ p_sys->i_angle );
+ return VLC_EGENERIC;
+ }
/* Update default_pts to a suitable value for dvdread access */
var_Create( p_demux, "dvdread-caching",
i_micro_second = still_time;
i_micro_second = (int64_t)((double)i_micro_second * 1000000.0);
}
-
+
return i_micro_second;
}
}
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->i_mux_rate > 0 )
+ if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
{
- *pi64 = (int64_t)1000000 * DVD_VIDEO_LB_LEN *
- p_sys->i_title_offset / 50 / p_sys->i_mux_rate;
+ *pi64 = (int64_t) dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 ) /
+ p_sys->i_title_blocks * p_sys->i_title_offset;
return VLC_SUCCESS;
}
*pi64 = 0;
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
- if (p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles)
+ if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
{
- *pi64 = dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 );
- p_sys->i_mux_rate = p_sys->i_title_blocks * DVD_VIDEO_LB_LEN / (*pi64 / 20000);
+ *pi64 = (int64_t)dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 );
return VLC_SUCCESS;
}
*pi64 = 0;
DvdReadHandleDSI( p_demux, p_buffer );
/* End of title */
- if( p_sys->i_next_vobu > p_sys->i_title_end_block )
+ if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells )
{
if( p_sys->i_title + 1 >= p_sys->i_titles )
{
DemuxBlock( p_demux, p_buffer, DVD_VIDEO_LB_LEN );
}
- if( p_sys->i_cur_block > p_sys->i_title_end_block )
+ if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells )
{
if( p_sys->i_title + 1 >= p_sys->i_titles )
{
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;*/
+ if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
}
block_Release( p_pkt );
break;
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;
+ /*
+ * Store the timecodes so we can get the current time
+ */
+ p_sys->i_title_cur_time = (mtime_t) (p_sys->dsi_pack.dsi_gi.nv_pck_scr / 90 * 1000);
+ p_sys->i_cell_cur_time = (mtime_t) dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 );
+
/*
* If we're not at the end of this cell, we can determine the next
* VOBU to display using the VOBU_SRI information section of the
else if( p_sys->dsi_pack.vobu_sri.next_vobu == SRI_END_OF_CELL )
{
p_sys->i_cur_cell = p_sys->i_next_cell;
+
+ /* End of title */
+ if( p_sys->i_cur_cell >= p_sys->p_cur_pgc->nr_of_cells ) return;
+
DvdReadFindCell( p_demux );
p_sys->i_next_vobu =
p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].first_sector;
+
+ p_sys->i_cell_duration = (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 );
}
+
#if 0
- msg_Dbg( p_demux, 12, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d",
+ msg_Dbg( p_demux, "scr %d lbn 0x%02x vobu_ea %d vob_id %d c_id %d c_time %lld",
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 );
+ p_sys->dsi_pack.dsi_gi.vobu_c_idn,
+ dvdtime_to_time( &p_sys->dsi_pack.dsi_gi.c_eltm, 0 ) );
+
+ msg_Dbg( p_demux, "cell duration: %lld",
+ (mtime_t)dvdtime_to_time( &p_sys->p_cur_pgc->cell_playback[p_sys->i_cur_cell].playback_time, 0 ) );
- msg_Dbg( p_demux, 12, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d",
+ msg_Dbg( p_demux, "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_demux, 12, "next_vobu %d next_ilvu1 %d next_ilvu2 %d",
+ msg_Dbg( p_demux, "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);
projects / vlc / blobdiff