/*****************************************************************************
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2004 VideoLAN
+ * Copyright (C) 2001-2006 the VideoLAN team
* $Id$
*
- * Authors: Stéphane Borel <stef@via.ecp.fr>
+ * Authors: Stéphane 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h> /* strdup() */
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_input.h>
+#include <vlc_access.h>
+
+#include <vlc_interface.h>
#include "iso_lang.h"
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <string.h>
#include <dvdread/dvd_reader.h>
#include <dvdread/ifo_types.h>
*****************************************************************************/
#define ANGLE_TEXT N_("DVD angle")
#define ANGLE_LONGTEXT N_( \
- "Allows you to select the default DVD angle." )
+ "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." )
+ "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_( \
"libcss.\n" \
"The default method is: key.")
-static char *psz_css_list[] = { "title", "disc", "key" };
-static char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
+static const char *psz_css_list[] = { "title", "disc", "key" };
+static const char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
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;
/* 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] == ':' &&
if( !(p_dvdread = DVDOpen( psz_name )) )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
+ intf_UserFatal( p_demux, VLC_FALSE, _("Playback failure"),
+ _("DVDRead could not open disk \"%s\"."), psz_name );
free( psz_name );
return VLC_EGENERIC;
}
msg_Dbg( p_demux, "VMG opened" );
/* Fill p_demux field */
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- memset( p_sys, 0, sizeof( demux_sys_t ) );
+ STANDARD_DEMUX_INIT; p_sys = p_demux->p_sys;
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_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 );
i_micro_second += (int64_t)(BCD2D(dtime->minute)) * 60 * 1000000;
i_micro_second += (int64_t)(BCD2D(dtime->second)) * 1000000;
- switch((dtime->frame_u & 0xc0) >> 6)
+ switch((dtime->frame_u & 0xc0) >> 6)
{
case 1:
f_fps = 25.0;
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_title_cur_time > 0 )
+ if( p_demux->info.i_title >= 0 && p_demux->info.i_title < p_sys->i_titles )
{
- *pi64 = (int64_t)p_sys->i_title_cur_time;
+ *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 );
+ *pi64 = (int64_t)dvdtime_to_time( &p_sys->p_cur_pgc->playback_time, 0 );
return VLC_SUCCESS;
}
*pi64 = 0;
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 );
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, VLC_FALSE, _("Playback failure"),
+ _("DVDRead could not read %d/%d blocks at 0x%02x."),
+ i_read, i_blocks_once, p_sys->i_cur_block );
return -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;*/
+ if( i_mux_rate > 0 ) p_sys->i_mux_rate = i_mux_rate;
}
block_Release( p_pkt );
break;
/*
* 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_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 );
/*
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",
+ 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, "cat 0x%02x ilvu_ea %d ilvu_sa %d size %d",