/*****************************************************************************
* dvdread.c : DvdRead input module for vlc
*****************************************************************************
- * Copyright (C) 2001-2006 the VideoLAN team
+ * Copyright (C) 2001-2006 VLC authors and VideoLAN
* $Id$
*
* 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+/*****************************************************************************
+ * NOTA BENE: this module requires the linking against a library which is
+ * known to require licensing under the GNU General Public License version 2
+ * (or later). Therefore, the result of compiling this module will normally
+ * be subject to the terms of that later license.
+ *****************************************************************************/
+
+
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <sys/types.h>
-#ifdef HAVE_DVDREAD_DVD_READER_H
- #include <dvdread/dvd_reader.h>
- #include <dvdread/ifo_types.h>
- #include <dvdread/ifo_read.h>
- #include <dvdread/nav_read.h>
- #include <dvdread/nav_print.h>
-#else
- #include <libdvdread/dvd_reader.h>
- #include <libdvdread/ifo_types.h>
- #include <libdvdread/ifo_read.h>
- #include <libdvdread/nav_read.h>
- #include <libdvdread/nav_print.h>
-#endif
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_types.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_print.h>
#include <assert.h>
#define ANGLE_LONGTEXT N_( \
"Default DVD angle." )
-#define CACHING_TEXT N_("Caching value in ms")
-#define CACHING_LONGTEXT N_( \
- "Caching value for DVDs. " \
- "This value should be set in milliseconds." )
-
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
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,
+ add_integer( "dvdread-angle", 1, ANGLE_TEXT,
ANGLE_LONGTEXT, false )
- add_integer( "dvdread-caching", DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, true )
add_obsolete_string( "dvdread-css-method" ) /* obsolete since 1.1.0 */
set_capability( "access_demux", 0 )
add_shortcut( "dvd", "dvdread", "dvdsimple" )
static int Control ( demux_t *, int, va_list );
static int Demux ( demux_t * );
-static int DemuxBlock( demux_t *, uint8_t *, int );
+static int DemuxBlock( demux_t *, const uint8_t *, int );
static void DemuxTitles( demux_t *, int * );
static void ESNew( demux_t *, int, int );
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- char *psz_name;
- dvd_reader_t *p_dvdread;
+ char *psz_file;
ifo_handle_t *p_vmg_file;
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
- if( psz_name[0] && psz_name[1] == ':' &&
- psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
+#if defined( WIN32 ) || defined( __OS2__ )
+ if( psz_file != NULL )
+ {
+ 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;
/* Open dvdread */
- if( !(p_dvdread = DVDOpen( psz_name )) )
+ const char *psz_path = ToLocale( psz_file );
+ dvd_reader_t *p_dvdread = DVDOpen( psz_path );
+
+ LocaleFree( psz_path );
+ if( p_dvdread == NULL )
{
- msg_Err( p_demux, "DVDRead cannot open source: %s", psz_name );
+ msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
dialog_Fatal( p_demux, _("Playback failure"),
- _("DVDRead could not open the disc \"%s\"."), psz_name );
- free( psz_name );
+ _("DVDRead could not open the disc \"%s\"."), psz_file );
+ free( psz_file );
return VLC_EGENERIC;
}
- free( psz_name );
+ free( psz_file );
/* Ifo allocation & initialisation */
if( !( p_vmg_file = ifoOpen( p_dvdread, 0 ) ) )
DemuxTitles( p_demux, &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 );
+ Close( p_this );
return VLC_EGENERIC;
}
- /* Update default_pts to a suitable value for dvdread access */
- var_Create( p_demux, "dvdread-caching",
- VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-
return VLC_SUCCESS;
}
}
}
+ /* Free the array of titles */
+ for( int i = 0; i < p_sys->i_titles; i++ )
+ vlc_input_title_Delete( p_sys->titles[i] );
+ TAB_CLEAN( p_sys->i_titles, p_sys->titles );
+
/* Close libdvdread */
if( p_sys->p_title ) DVDCloseFile( p_sys->p_title );
if( p_sys->p_vts_file ) ifoClose( p_sys->p_vts_file );
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = var_GetInteger( p_demux, "dvdread-caching" )*1000;
+ *pi64 =
+ INT64_C(1000) * var_InheritInteger( p_demux, "disc-caching" );
return VLC_SUCCESS;
/* TODO implement others */
/*****************************************************************************
* DemuxBlock: demux a given block
*****************************************************************************/
-static int DemuxBlock( demux_t *p_demux, 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;
- uint8_t *p = pkt;
- while( p && p < &pkt[i_pkt] )
+ while( len > 0 )
{
- 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 )
+ int i_size = ps_pkt_size( p, len );
+ if( i_size <= 0 || i_size > len )
{
break;
}
/* Create a block */
- p_pkt = block_New( p_demux, i_size );
+ block_t *p_pkt = block_Alloc( i_size );
memcpy( p_pkt->p_buffer, p, i_size);
/* Parse it and send it */
}
p += i_size;
+ len -= i_size;
}
return VLC_SUCCESS;
}
else if( tk->fmt.i_cat == AUDIO_ES )
{
+#if 0
int i_audio = -1;
/* find the audio number PLEASE find another way */
if( (i_id&0xbdf8) == 0xbd88 ) /* dts */
{
i_audio = i_id&0x1f;
}
+#endif
if( psz_language[0] ) tk->fmt.psz_language = strdup( psz_language );
}
projects / vlc / blobdiff