/*****************************************************************************
* 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
*****************************************************************************/
#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 );
else
psz_file = strdup( p_demux->psz_file );
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __OS2__ )
if( psz_file != NULL )
{
size_t flen = strlen( psz_file );
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;
}
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 );
}
pgn = p_vts->vts_ptt_srpt->title[p_sys->i_ttn - 1].ptt[0].pgn;
p_pgc = p_vts->vts_pgcit->pgci_srp[pgc_id - 1].pgc;
+ if( p_pgc->cell_playback == NULL )
+ {
+ msg_Err( p_demux, "Invalid PGC (cell_playback_offset)" );
+ return VLC_EGENERIC;
+ }
+
p_sys->i_title_start_cell =
i_start_cell = p_pgc->program_map[pgn - 1] - 1;
p_sys->i_title_start_block =
p_sys->i_ttn - 1].ptt[i_chapter].pgn;
p_pgc = p_vts->vts_pgcit->pgci_srp[pgc_id - 1].pgc;
+ if( p_pgc->cell_playback == NULL )
+ return VLC_EGENERIC; /* Couldn't set chapter */
p_sys->i_cur_cell = p_pgc->program_map[pgn - 1] - 1;
p_sys->i_chapter = i_chapter;
projects / vlc / blobdiff