-/*****************************************************************************
- * input_dvd.c: DVD raw reading plugin.
+/* input_dvd.c: DVD raw reading plugin.
*****************************************************************************
* This plugins should handle all the known specificities of the DVD format,
* especially the 2048 bytes logical block size.
* It depends on:
- * -input_netlist used to read packets
* -libdvdcss for access and unscrambling
* -dvd_ifo for ifo parsing and analyse
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.73 2001/06/14 01:49:44 sam Exp $
+ * $Id: input_dvd.c,v 1.126 2002/03/03 17:34:27 xav Exp $
*
* Author: Stéphane Borel <stef@via.ecp.fr>
*
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include "defs.h"
-
-#ifdef HAVE_CSS
-# define MODULE_NAME dvd
-#else /* HAVE_CSS */
-# define MODULE_NAME dvdnocss
-#endif /* HAVE_CSS */
-
-#include "modules_inner.h"
-
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+
+#include <videolan/vlc.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#include <fcntl.h>
#include <sys/types.h>
+#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#endif
#if defined( WIN32 )
-# include <io.h>
-# include "input_iovec.h"
+# include <io.h> /* read() */
#else
# include <sys/uio.h> /* struct iovec */
#endif
-#include <videolan/dvdcss.h>
-
-#include "config.h"
-#include "common.h"
-#include "threads.h"
-#include "mtime.h"
-#include "tests.h"
-
-#include "intf_msg.h"
+#ifdef GOD_DAMN_DMCA
+# include "dummy_dvdcss.h"
+#else
+# include <videolan/dvdcss.h>
+#endif
-#include "main.h"
+#if defined( WIN32 )
+# include "input_iovec.h"
+#endif
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
-
-#include "input.h"
+#include "input_ext-plugins.h"
#include "input_dvd.h"
-#include "dvd_netlist.h"
#include "dvd_ifo.h"
#include "dvd_summary.h"
-#include "mpeg_system.h"
+#include "iso_lang.h"
#include "debug.h"
-#include "modules.h"
-#include "modules_export.h"
-
-/* how many blocks DVDRead will read in each loop */
-#define DVD_BLOCK_READ_ONCE 64
-#define DVD_DATA_READ_ONCE (4 * DVD_BLOCK_READ_ONCE)
-
-/* Size of netlist */
-#define DVD_NETLIST_SIZE 256
+/* how many packets DVDDemux will read in each loop */
+#define DVD_READ_ONCE 64
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
/* called from outside */
-static int DVDProbe ( probedata_t *p_data );
-static void DVDInit ( struct input_thread_s * );
-static void DVDEnd ( struct input_thread_s * );
-static void DVDOpen ( struct input_thread_s * );
-static void DVDClose ( struct input_thread_s * );
-static int DVDSetArea ( struct input_thread_s *, struct input_area_s * );
-static int DVDRead ( struct input_thread_s *, data_packet_t ** );
-static void DVDSeek ( struct input_thread_s *, off_t );
-static int DVDRewind ( struct input_thread_s * );
+static int DVDOpen ( struct input_thread_s * );
+static void DVDClose ( struct input_thread_s * );
+static int DVDSetArea ( struct input_thread_s *, struct input_area_s * );
+static int DVDSetProgram ( struct input_thread_s *, pgrm_descriptor_t * );
+static int DVDRead ( struct input_thread_s *, byte_t *, size_t );
+static void DVDSeek ( struct input_thread_s *, off_t );
+
+static int DVDRewind ( struct input_thread_s * );
+static int DVDDemux ( struct input_thread_s * );
+static int DVDInit ( struct input_thread_s * );
+static void DVDEnd ( struct input_thread_s * );
/* called only inside */
+static void DVDLaunchDecoders( input_thread_t * p_input );
static int DVDChooseAngle( thread_dvd_data_t * );
static int DVDFindCell( thread_dvd_data_t * );
static int DVDFindSector( thread_dvd_data_t * );
* Functions exported as capabilities. They are declared as static so that
* we don't pollute the namespace too much.
*****************************************************************************/
-void _M( input_getfunctions )( function_list_t * p_function_list )
+void _M( access_getfunctions)( function_list_t * p_function_list )
{
-#define input p_function_list->functions.input
- p_function_list->pf_probe = DVDProbe;
- input.pf_init = DVDInit;
+#define input p_function_list->functions.access
input.pf_open = DVDOpen;
input.pf_close = DVDClose;
- input.pf_end = DVDEnd;
input.pf_read = DVDRead;
input.pf_set_area = DVDSetArea;
- input.pf_demux = input_DemuxPS;
- input.pf_new_packet = DVDNewPacket;
- input.pf_new_pes = DVDNewPES;
- input.pf_delete_packet = DVDDeletePacket;
- input.pf_delete_pes = DVDDeletePES;
- input.pf_rewind = DVDRewind;
+ input.pf_set_program = DVDSetProgram;
input.pf_seek = DVDSeek;
#undef input
}
+void _M( demux_getfunctions)( function_list_t * p_function_list )
+{
+#define demux p_function_list->functions.demux
+ demux.pf_init = DVDInit;
+ demux.pf_end = DVDEnd;
+ demux.pf_demux = DVDDemux;
+ demux.pf_rewind = DVDRewind;
+#undef demux
+}
+
/*
- * Data reading functions
+ * Data demux functions
*/
/*****************************************************************************
- * DVDProbe: verifies that the stream is a PS stream
+ * DVDInit: initializes DVD structures
*****************************************************************************/
-static int DVDProbe( probedata_t *p_data )
+static int DVDInit( input_thread_t * p_input )
{
- input_thread_t * p_input = (input_thread_t *)p_data;
-
- char * psz_name = p_input->p_source;
- int i_handle;
- int i_score = 5;
-#if defined( WIN32 )
- char buf[7];
-#endif
- if( TestMethod( INPUT_METHOD_VAR, "dvd" ) )
+ if( strncmp( p_input->p_access_module->psz_name, "dvd", 3 ) )
{
-#ifdef HAVE_CSS
- return( 999 );
-#else /* HAVE_CSS */
- return( 998 );
-#endif /* HAVE_CSS */
+ return -1;
}
- if( ( strlen(psz_name) > 4 ) && !strncasecmp( psz_name, "dvd:", 4 ) )
- {
- /* If the user specified "dvd:" then it's probably a DVD */
-#ifdef HAVE_CSS
- i_score = 100;
-#else /* HAVE_CSS */
- i_score = 90;
-#endif /* HAVE_CSS */
- psz_name += 4;
- }
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ DVDLaunchDecoders( p_input );
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
-#if !defined( WIN32 )
- i_handle = open( psz_name, 0 );
- if( i_handle == -1 )
- {
- return( 0 );
+ return 0;
+}
+
+/*****************************************************************************
+ * DVDEnd: frees unused data
+ *****************************************************************************/
+static void DVDEnd( input_thread_t * p_input )
+{
+}
+
+/*****************************************************************************
+ * DVDDemux
+ *****************************************************************************/
+#define PEEK( SIZE ) \
+ i_result = input_Peek( p_input, &p_peek, SIZE ); \
+ if( i_result == -1 ) \
+ { \
+ return( -1 ); \
+ } \
+ else if( i_result < SIZE ) \
+ { \
+ /* EOF */ \
+ return( 0 ); \
}
- close( i_handle );
-#else
- snprintf( buf, 7, "\\\\.\\%c:", psz_name[0] );
- (HANDLE) i_handle = CreateFile( i_score < 90 ? psz_name : buf,
- GENERIC_READ | GENERIC_WRITE,
- FILE_SHARE_READ | FILE_SHARE_WRITE,
- NULL, OPEN_EXISTING, 0, NULL );
- if( (HANDLE) i_handle == INVALID_HANDLE_VALUE )
+
+static int DVDDemux( input_thread_t * p_input )
+{
+ int i;
+ byte_t * p_peek;
+ data_packet_t * p_data;
+ ssize_t i_result;
+ int i_packet_size;
+
+
+ /* Read headers to compute payload length */
+ for( i = 0 ; i < DVD_READ_ONCE ; i++ )
{
- return( 0 );
+
+ /* Read what we believe to be a packet header. */
+ PEEK( 4 );
+
+ /* Default header */
+ if( U32_AT( p_peek ) != 0x1BA )
+ {
+ /* That's the case for all packets, except pack header. */
+ i_packet_size = U16_AT( p_peek + 4 );
+ }
+ else
+ {
+ /* MPEG-2 Pack header. */
+ i_packet_size = 8;
+ }
+
+ /* Fetch a packet of the appropriate size. */
+ i_result = input_SplitBuffer( p_input, &p_data, i_packet_size + 6 );
+ if( i_result <= 0 )
+ {
+ return( i_result );
+ }
+
+ /* In MPEG-2 pack headers we still have to read stuffing bytes. */
+ if( (p_data->p_demux_start[3] == 0xBA) && (i_packet_size == 8) )
+ {
+ size_t i_stuffing = (p_data->p_demux_start[13] & 0x7);
+ /* Force refill of the input buffer - though we don't care
+ * about p_peek. Please note that this is unoptimized. */
+ PEEK( i_stuffing );
+ p_input->p_current_data += i_stuffing;
+ }
+
+ input_DemuxPS( p_input, p_data );
+
}
- CloseHandle( (HANDLE) i_handle );
-#endif
+
+ return i;
+}
- return( i_score );
+/*****************************************************************************
+ * DVDRewind : reads a stream backward
+ *****************************************************************************/
+static int DVDRewind( input_thread_t * p_input )
+{
+ return( -1 );
}
+
+
+/*
+ * Data access functions
+ */
+
/*****************************************************************************
- * DVDInit: initializes DVD structures
+ * DVDOpen: open dvd
*****************************************************************************/
-static void DVDInit( input_thread_t * p_input )
+static int DVDOpen( struct input_thread_s *p_input )
{
+ struct stat stat_info;
+ char * psz_parser = p_input->psz_name;
+ char * psz_device = p_input->psz_name;
+ dvdcss_handle dvdhandle;
thread_dvd_data_t * p_dvd;
input_area_t * p_area;
int i_title;
int i_chapter;
int i;
- p_dvd = malloc( sizeof(thread_dvd_data_t) );
- if( p_dvd == NULL )
+ /* Parse input string : device[@rawdevice] */
+ while( *psz_parser && *psz_parser != '@' )
{
- intf_ErrMsg( "dvd error: out of memory" );
- p_input->b_error = 1;
- return;
+ psz_parser++;
}
- p_input->p_plugin_data = (void *)p_dvd;
- p_input->p_method_data = NULL;
+ if( *psz_parser == '@' )
+ {
+ /* Found raw device */
+ *psz_parser = '\0';
+ psz_parser++;
+
+ config_PutPszVariable( "DVDCSS_RAW_DEVICE", psz_parser );
+ }
- /* XXX: put this shit in an access plugin */
- if( strlen( p_input->p_source ) > 4
- && !strncasecmp( p_input->p_source, "dvd:", 4 ) )
+ if( stat( psz_device, &stat_info ) == -1 )
{
- p_dvd->dvdhandle = dvdcss_open( p_input->p_source + 4,
- DVDCSS_INIT_QUIET );
+ intf_ErrMsg( "input error: cannot stat() device `%s' (%s)",
+ psz_device, strerror(errno));
+ return( -1 );
}
- else
+
+#ifndef WIN32
+ if( !S_ISBLK(stat_info.st_mode) && !S_ISCHR(stat_info.st_mode) )
{
- p_dvd->dvdhandle = dvdcss_open( p_input->p_source,
- DVDCSS_INIT_QUIET );
+ intf_WarnMsg( 3, "input : DVD plugin discarded"
+ " (not a valid block device)" );
+ return -1;
}
+#endif
+
+ intf_WarnMsg( 2, "input: dvd=%s raw=%s", psz_device, psz_parser );
+
+ /*
+ * set up input
+ */
+ p_input->i_mtu = 0;
+
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+
+ p_input->stream.i_method = INPUT_METHOD_DVD;
- if( p_dvd->dvdhandle == NULL )
+ /* If we are here we can control the pace... */
+ p_input->stream.b_pace_control = 1;
+
+ p_input->stream.b_seekable = 1;
+ p_input->stream.p_selected_area->i_size = 0;
+
+ p_input->stream.p_selected_area->i_tell = 0;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+
+ /*
+ * get plugin ready
+ */
+ dvdhandle = dvdcss_open( psz_device );
+
+ if( dvdhandle == NULL )
{
- free( p_dvd );
- p_input->b_error = 1;
- return;
+ intf_ErrMsg( "dvd error: dvdcss can't open device" );
+ return -1;
}
- dvdcss_seek( p_dvd->dvdhandle, 0 );
+ p_dvd = malloc( sizeof(thread_dvd_data_t) );
+ if( p_dvd == NULL )
+ {
+ intf_ErrMsg( "dvd error: out of memory" );
+ return -1;
+ }
- /* We read DVD_BLOCK_READ_ONCE in each loop, so the input will receive
- * DVD_DATA_READ_ONCE at most */
- p_dvd->i_block_once = DVD_BLOCK_READ_ONCE;
- /* this value mustn't be modifed */
- p_input->i_read_once = DVD_DATA_READ_ONCE;
+ p_dvd->dvdhandle = (dvdcss_handle) dvdhandle;
+ p_input->p_access_data = (void *)p_dvd;
- /* Reading structures initialisation */
- p_input->p_method_data =
- DVDNetlistInit( DVD_NETLIST_SIZE, 2 * DVD_NETLIST_SIZE,
- DVD_NETLIST_SIZE, DVD_LB_SIZE, p_dvd->i_block_once );
- intf_WarnMsg( 2, "dvd info: netlist initialized" );
+ if( dvdcss_seek( p_dvd->dvdhandle, 0, DVDCSS_NOFLAGS ) < 0 )
+ {
+ intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
+ return -1;
+ }
/* Ifo allocation & initialisation */
if( IfoCreate( p_dvd ) < 0 )
{
intf_ErrMsg( "dvd error: allcation error in ifo" );
- dvdcss_close( p_dvd->dvdhandle );
free( p_dvd );
- p_input->b_error = 1;
- return;
+ return -1;
}
if( IfoInit( p_dvd->p_ifo ) < 0 )
{
intf_ErrMsg( "dvd error: fatal failure in ifo" );
IfoDestroy( p_dvd->p_ifo );
- dvdcss_close( p_dvd->dvdhandle );
free( p_dvd );
- p_input->b_error = 1;
- return;
+ return -1;
}
/* Set stream and area data */
/* Initialize ES structures */
input_InitStream( p_input, sizeof( stream_ps_data_t ) );
- /* disc input method */
- p_input->stream.i_method = INPUT_METHOD_DVD;
-
#define title_inf p_dvd->p_ifo->vmg.title_inf
intf_WarnMsg( 2, "dvd info: number of titles: %d", title_inf.i_title_nb );
#undef area
/* Get requested title - if none try the first title */
- i_title = main_GetIntVariable( INPUT_TITLE_VAR, 1 );
+ i_title = config_GetIntVariable( INPUT_TITLE_VAR );
if( i_title <= 0 || i_title > title_inf.i_title_nb )
{
i_title = 1;
#undef title_inf
/* Get requested chapter - if none defaults to first one */
- i_chapter = main_GetIntVariable( INPUT_CHAPTER_VAR, 1 );
+ i_chapter = config_GetIntVariable( INPUT_CHAPTER_VAR );
if( i_chapter <= 0 )
{
i_chapter = 1;
}
- p_input->stream.pp_areas[i_title]->i_part = i_chapter;
-
p_area = p_input->stream.pp_areas[i_title];
+ p_area->i_part = i_chapter;
/* set title, chapter, audio and subpic */
- DVDSetArea( p_input, p_area );
+ if( DVDSetArea( p_input, p_area ) )
+ {
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ return -1;
+ }
vlc_mutex_unlock( &p_input->stream.stream_lock );
- return;
+ return 0;
+
}
/*****************************************************************************
- * DVDEnd: frees unused data
+ * DVDClose: close dvd
*****************************************************************************/
-static void DVDEnd( input_thread_t * p_input )
+static void DVDClose( struct input_thread_s *p_input )
{
thread_dvd_data_t * p_dvd;
- dvd_netlist_t * p_netlist;
- p_dvd = (thread_dvd_data_t*)p_input->p_plugin_data;
- p_netlist = (dvd_netlist_t *)p_input->p_method_data;
+ p_dvd = (thread_dvd_data_t*)p_input->p_access_data;
IfoDestroy( p_dvd->p_ifo );
- /* Clean up libdvdcss */
- dvdcss_close( p_dvd->dvdhandle );
-
+ p_input->p_access_data = (void *)(p_dvd->dvdhandle);
free( p_dvd );
- DVDNetlistEnd( p_netlist );
+ /* Clean up libdvdcss */
+ dvdcss_close( (dvdcss_handle) p_input->p_access_data );
+}
+
+/*****************************************************************************
+ * DVDSetProgram: Does nothing, a DVD is mono-program
+ *****************************************************************************/
+static int DVDSetProgram( input_thread_t * p_input,
+ pgrm_descriptor_t * p_program )
+{
+ return 0;
}
/*****************************************************************************
es_descriptor_t * p_es;
u16 i_id;
int i_vts_title;
- int i_audio;
- int i_spu;
+ int i_audio_nb = 0;
+ int i_spu_nb = 0;
int i;
- p_dvd = (thread_dvd_data_t*)p_input->p_plugin_data;
+ p_dvd = (thread_dvd_data_t*)(p_input->p_access_data);
/* we can't use the interface slider until initilization is complete */
p_input->stream.b_seekable = 0;
if( p_area != p_input->stream.p_selected_area )
{
+ /* Reset the Chapter position of the old title */
+ p_input->stream.p_selected_area->i_part = 0;
/*
* We have to load all title information
p_dvd->i_title_id =
vts.title_inf.p_title_start[i_vts_title-1].i_title_id;
- intf_WarnMsgImm( 3, "dvd: title %d vts_title %d pgc %d",
- p_dvd->i_title, i_vts_title, p_dvd->i_title_id );
-
- /*
- * CSS cracking has to be done again
- */
- dvdcss_crack( p_dvd->dvdhandle,
- vmg.title_inf.p_attr[p_dvd->i_title-1].i_title_set_num,
- vts.i_pos + vts.manager_inf.i_title_vob_start_sector );
+ intf_WarnMsg( 3, "dvd: title %d vts_title %d pgc %d",
+ p_dvd->i_title, i_vts_title, p_dvd->i_title_id );
/*
* Angle management
*/
p_dvd->i_angle_nb = vmg.title_inf.p_attr[p_dvd->i_title-1].i_angle_nb;
- p_dvd->i_angle = main_GetIntVariable( INPUT_ANGLE_VAR, 1 );
+ p_dvd->i_angle = config_GetIntVariable( INPUT_ANGLE_VAR );
if( ( p_dvd->i_angle <= 0 ) || p_dvd->i_angle > p_dvd->i_angle_nb )
{
p_dvd->i_angle = 1;
p_input->b_error = 1;
return -1;
}
-
+
/* temporary hack to fix size in some dvds */
if( p_dvd->i_cell >= vts.cell_inf.i_cell_nb )
{
p_dvd->i_sector = 0;
p_dvd->i_size = vts.cell_inf.p_cell_map[p_dvd->i_cell].i_end_sector;
- intf_WarnMsg( 2, "dvd info: stream size 1: %d", p_dvd->i_size );
if( DVDChapterSelect( p_dvd, 1 ) < 0 )
{
p_input->b_error = 1;
return -1;
}
+
+ /* Force libdvdcss to check its title key.
+ * It is only useful for title cracking method. Methods using the
+ * decrypted disc key are fast enough to check the key at each seek */
+
+ if( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start,
+ DVDCSS_SEEK_KEY ) < 0 )
+ {
+ intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
+ return -1;
+ }
p_dvd->i_size -= p_dvd->i_sector + 1;
p_input->stream.p_selected_area->i_angle_nb = p_dvd->i_angle_nb;
p_input->stream.p_selected_area->i_angle = p_dvd->i_angle;
+#if 0
/* start at the beginning of the title */
/* FIXME: create a conf option to select whether to restart
* title or not */
p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.p_selected_area->i_part = 1;
+#endif
/*
* Destroy obsolete ES by reinitializing program 0
input_UnselectES( p_input, p_input->stream.pp_selected_es[i] );
}
- input_DelProgram( p_input, p_input->stream.pp_programs[0] );
+ free( p_input->stream.pp_selected_es );
+ input_DelProgram( p_input, p_input->stream.p_selected_program );
p_input->stream.pp_selected_es = NULL;
p_input->stream.i_selected_es_number = 0;
}
input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
+ p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
+// p_input->stream.p_new_program = p_input->stream.pp_programs[0];
/* No PSM to read in DVD mode, we already have all information */
- p_input->stream.pp_programs[0]->b_is_ok = 1;
+ p_input->stream.p_selected_program->b_is_ok = 1;
p_es = NULL;
/* ES 0 -> video MPEG2 */
IfoPrintVideo( p_dvd );
- p_es = input_AddES( p_input, p_input->stream.pp_programs[0], 0xe0, 0 );
+ p_es = input_AddES( p_input, p_input->stream.p_selected_program,
+ 0xe0, 0 );
p_es->i_stream_id = 0xe0;
p_es->i_type = MPEG2_VIDEO_ES;
p_es->i_cat = VIDEO_ES;
- if( p_main->b_video )
- {
- input_SelectES( p_input, p_es );
- }
-
+
#define audio_status \
vts.title_unit.p_title[p_dvd->i_title_id-1].title.pi_audio_status[i-1]
/* Audio ES, in the order they appear in .ifo */
/* audio channel is active if first byte is 0x80 */
if( audio_status.i_available )
{
+ i_audio_nb++;
+
switch( vts.manager_inf.p_audio_attr[i-1].i_coding_mode )
{
case 0x00: /* AC3 */
i_id = ( ( 0x80 + audio_status.i_position ) << 8 ) | 0xbd;
p_es = input_AddES( p_input,
- p_input->stream.pp_programs[0], i_id, 0 );
+ p_input->stream.p_selected_program, i_id, 0 );
p_es->i_stream_id = 0xbd;
p_es->i_type = AC3_AUDIO_ES;
p_es->b_audio = 1;
p_es->i_cat = AUDIO_ES;
- strcpy( p_es->psz_desc, IfoLanguage( hton16(
+ strcpy( p_es->psz_desc, DecodeLanguage( hton16(
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (ac3)" );
case 0x03: /* MPEG audio */
i_id = 0xc0 + audio_status.i_position;
p_es = input_AddES( p_input,
- p_input->stream.pp_programs[0], i_id, 0 );
+ p_input->stream.p_selected_program, i_id
+ , 0 );
p_es->i_stream_id = i_id;
p_es->i_type = MPEG2_AUDIO_ES;
p_es->b_audio = 1;
p_es->i_cat = AUDIO_ES;
- strcpy( p_es->psz_desc, IfoLanguage( hton16(
+ strcpy( p_es->psz_desc, DecodeLanguage( hton16(
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (mpeg)" );
i_id = ( ( 0xa0 + audio_status.i_position ) << 8 ) | 0xbd;
p_es = input_AddES( p_input,
- p_input->stream.pp_programs[0], i_id, 0 );
- p_es->i_stream_id = i_id;
+ p_input->stream.p_selected_program,
+ i_id, 0 );
+ p_es->i_stream_id = 0xbd;
p_es->i_type = LPCM_AUDIO_ES;
p_es->b_audio = 1;
p_es->i_cat = AUDIO_ES;
- strcpy( p_es->psz_desc, IfoLanguage( hton16(
+ strcpy( p_es->psz_desc, DecodeLanguage( hton16(
vts.manager_inf.p_audio_attr[i-1].i_lang_code ) ) );
strcat( p_es->psz_desc, " (lpcm)" );
if( spu_status.i_available )
{
+ i_spu_nb++;
+
/* there are several streams for one spu */
if( vts.manager_inf.video_attr.i_ratio )
{
| 0xbd;
}
p_es = input_AddES( p_input,
- p_input->stream.pp_programs[0], i_id, 0 );
+ p_input->stream.p_selected_program,
+ i_id, 0 );
p_es->i_stream_id = 0xbd;
p_es->i_type = DVD_SPU_ES;
p_es->i_cat = SPU_ES;
- strcpy( p_es->psz_desc, IfoLanguage( hton16(
+ strcpy( p_es->psz_desc, DecodeLanguage( hton16(
vts.manager_inf.p_spu_attr[i-1].i_lang_code ) ) );
}
}
#undef spu_status
- if( p_main->b_audio )
+
+ /* FIXME: hack to check that the demuxer is ready, and set
+ * the decoders */
+ if( p_input->p_demux_module )
{
- /* For audio: first one if none or a not existing one specified */
- i_audio = main_GetIntVariable( INPUT_CHANNEL_VAR, 1 );
- if( i_audio < 0 || i_audio > vts.manager_inf.i_audio_nb )
- {
- main_PutIntVariable( INPUT_CHANNEL_VAR, 1 );
- i_audio = 1;
- }
- if( i_audio > 0 && vts.manager_inf.i_audio_nb > 0 )
- {
- input_SelectES( p_input, p_input->stream.pp_es[i_audio] );
- }
+ DVDLaunchDecoders( p_input );
}
- if( p_main->b_video )
- {
- /* for spu, default is none */
- i_spu = main_GetIntVariable( INPUT_SUBTITLE_VAR, 0 );
- if( i_spu < 0 || i_spu > vts.manager_inf.i_spu_nb )
- {
- main_PutIntVariable( INPUT_SUBTITLE_VAR, 0 );
- i_spu = 0;
- }
- if( i_spu > 0 && vts.manager_inf.i_spu_nb > 0 )
- {
- i_spu += vts.manager_inf.i_audio_nb;
- input_SelectES( p_input, p_input->stream.pp_es[i_spu] );
- }
- }
} /* i_title >= 0 */
else
{
* Chapter selection
*/
-
if( p_area->i_part != p_dvd->i_chapter )
{
if( ( p_area->i_part > 0 ) &&
p_input->stream.b_seekable = 1;
p_input->stream.b_changed = 1;
-
return 0;
}
/*****************************************************************************
- * DVDRead: reads data packets into the netlist.
+ * DVDRead: reads data packets.
*****************************************************************************
- * Returns -1 in case of error, 0 if everything went well, and 1 in case of
- * EOF.
+ * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
+ * bytes.
*****************************************************************************/
static int DVDRead( input_thread_t * p_input,
- data_packet_t ** pp_packets )
+ byte_t * p_buffer, size_t i_count )
{
thread_dvd_data_t * p_dvd;
- dvd_netlist_t * p_netlist;
- struct iovec * p_vec;
- struct data_packet_s * pp_data[DVD_DATA_READ_ONCE];
- u8 * pi_cur;
int i_block_once;
- int i_packet_size;
- int i_iovec;
- int i_packet;
- int i_pos;
int i_read_blocks;
- off_t i_off;
- boolean_t b_eof;
- boolean_t b_eot;
+ int i_read_total;
+ int i_sector;
+ int i_blocks;
+ boolean_t b_eoc;
- p_dvd = (thread_dvd_data_t *)p_input->p_plugin_data;
- p_netlist = (dvd_netlist_t *)p_input->p_method_data;
+ p_dvd = (thread_dvd_data_t *)(p_input->p_access_data);
- i_block_once = p_dvd->i_end_sector - p_dvd->i_sector + 1;
+ i_sector = 0;
+ i_read_total = 0;
+ i_read_blocks = 0;
+ b_eoc = 0;
- /* Get the position of the next cell if we're at cell end */
- if( i_block_once <= 0 )
- {
- int i_angle;
+ i_blocks = OFF2LB(i_count);
- p_dvd->i_cell++;
- p_dvd->i_angle_cell++;
+ while( i_blocks )
+ {
+ i_sector = p_dvd->i_title_start + p_dvd->i_sector;
+ i_block_once = p_dvd->i_end_sector - p_dvd->i_sector + 1;
- /* Find cell index in adress map */
- if( DVDFindSector( p_dvd ) < 0 )
+ /* Get the position of the next cell if we're at cell end */
+ if( i_block_once <= 0 )
{
- pp_packets[0] = NULL;
- intf_ErrMsg( "dvd error: can't find next cell" );
- return 1;
- }
+ int i_angle;
- /* Position the fd pointer on the right address */
- i_off = LB2OFF( dvdcss_seek( p_dvd->dvdhandle,
- p_dvd->i_title_start + p_dvd->i_sector ) );
+ p_dvd->i_cell++;
+ p_dvd->i_angle_cell++;
- /* update chapter : it will be easier when we have navigation
- * ES support */
- if( p_dvd->i_chapter < ( p_dvd->i_chapter_nb - 1 ) )
- {
- if( title.p_cell_play[p_dvd->i_prg_cell].i_category & 0xf000 )
- {
- i_angle = p_dvd->i_angle - 1;
- }
- else
+ /* Find cell index in adress map */
+ if( DVDFindSector( p_dvd ) < 0 )
{
- i_angle = 0;
+ intf_ErrMsg( "dvd error: can't find next cell" );
+ return 1;
}
- if( title.chapter_map.pi_start_cell[p_dvd->i_chapter] <=
- ( p_dvd->i_prg_cell - i_angle + 1 ) )
- {
- p_dvd->i_chapter++;
- }
- }
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- p_input->stream.p_selected_area->i_tell = i_off -
- p_input->stream.p_selected_area->i_start;
- p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- i_block_once = p_dvd->i_end_sector - p_dvd->i_sector + 1;
- }
-
- /* The number of blocks read is the max between the requested
- * value and the leaving block in the cell */
- if( i_block_once > p_dvd->i_block_once )
- {
- i_block_once = p_dvd->i_block_once;
- }
-//intf_WarnMsg( 2, "Sector: 0x%x Read: %d Chapter: %d", p_dvd->i_sector, i_block_once, p_dvd->i_chapter );
-
- p_netlist->i_read_once = i_block_once;
-
- /* Get an iovec pointer */
- if( ( p_vec = DVDGetiovec( p_netlist ) ) == NULL )
- {
- intf_ErrMsg( "dvd error: can't get iovec" );
- return -1;
- }
- /* Reads from DVD */
- i_read_blocks = dvdcss_readv( p_dvd->dvdhandle, p_vec,
- i_block_once, DVDCSS_READ_DECRYPT );
-
- /* Update netlist indexes: we don't do it in DVDGetiovec since we
- * need know the real number of blocks read */
- DVDMviovec( p_netlist, i_read_blocks, pp_data );
-
- /* Update global position */
- p_dvd->i_sector += i_read_blocks;
-
- i_packet = 0;
-
- /* Read headers to compute payload length */
- for( i_iovec = 0 ; i_iovec < i_read_blocks ; i_iovec++ )
- {
- i_pos = 0;
-
- while( i_pos < p_netlist->i_buffer_size )
- {
- pi_cur = (u8*)p_vec[i_iovec].iov_base + i_pos;
-
- /*default header */
- if( U32_AT( pi_cur ) != 0x1BA )
+ /* Position the fd pointer on the right address */
+ if( ( i_sector = dvdcss_seek( p_dvd->dvdhandle,
+ p_dvd->i_title_start + p_dvd->i_sector,
+ DVDCSS_SEEK_MPEG ) ) < 0 )
{
- /* That's the case for all packets, except pack header. */
- i_packet_size = U16_AT( pi_cur + 4 );
- pp_packets[i_packet] = DVDNewPtr( p_netlist );
+ intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
+ return -1;
}
- else
+
+ /* update chapter : it will be easier when we have navigation
+ * ES support */
+ if( p_dvd->i_chapter < ( p_dvd->i_chapter_nb - 1 ) )
{
- /* Pack header. */
- if( ( pi_cur[4] & 0xC0 ) == 0x40 )
+ if( title.p_cell_play[p_dvd->i_prg_cell].i_category & 0xf000 )
{
- /* MPEG-2 */
- i_packet_size = 8;
+ i_angle = p_dvd->i_angle - 1;
}
- else if( ( pi_cur[4] & 0xF0 ) == 0x20 )
+ else
{
- /* MPEG-1 */
- i_packet_size = 6;
+ i_angle = 0;
}
- else
+ if( title.chapter_map.pi_start_cell[p_dvd->i_chapter] <=
+ ( p_dvd->i_prg_cell - i_angle + 1 ) )
{
- intf_ErrMsg( "Unable to determine stream type" );
- return( -1 );
+ p_dvd->i_chapter++;
+ b_eoc = 1;
}
-
- pp_packets[i_packet] = pp_data[i_iovec];
-
}
- (*pp_data[i_iovec]->pi_refcount)++;
-
- pp_packets[i_packet]->pi_refcount = pp_data[i_iovec]->pi_refcount;
-
- pp_packets[i_packet]->p_buffer = pp_data[i_iovec]->p_buffer;
+ i_block_once = p_dvd->i_end_sector - p_dvd->i_sector + 1;
+ }
- pp_packets[i_packet]->p_payload_start =
- pp_packets[i_packet]->p_buffer + i_pos;
+ /* The number of blocks read is the max between the requested
+ * value and the leaving block in the cell */
+ if( i_block_once > i_blocks )
+ {
+ i_block_once = i_blocks;
+ }
+ /*
+ intf_WarnMsg( 2, "Sector: 0x%x Read: %d Chapter: %d", p_dvd->i_sector, i_block_once, p_dvd->i_chapter );
+ */
- pp_packets[i_packet]->p_payload_end =
- pp_packets[i_packet]->p_payload_start + i_packet_size + 6;
+ /* Reads from DVD */
+ i_read_blocks = dvdcss_read( p_dvd->dvdhandle, p_buffer,
+ i_block_once, DVDCSS_READ_DECRYPT );
- pp_packets[i_packet]->p_next = NULL;
- pp_packets[i_packet]->b_discard_payload = 0;
+ i_blocks -= i_read_blocks;
+ p_buffer += LB2OFF( i_read_blocks );
+ i_read_total += i_read_blocks;
- i_packet++;
- i_pos += i_packet_size + 6;
- }
+ /* Update global position */
+ p_dvd->i_sector += i_read_blocks;
}
- pp_packets[i_packet] = NULL;
-
vlc_mutex_lock( &p_input->stream.stream_lock );
- p_input->stream.p_selected_area->i_tell += LB2OFF( i_read_blocks );
- b_eot = !( p_input->stream.p_selected_area->i_tell
- < LB2OFF( p_dvd->i_size ) );
- b_eof = b_eot && ( ( p_dvd->i_title + 1 ) >= p_input->stream.i_area_nb );
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- if( b_eof )
+ p_input->stream.p_selected_area->i_tell =
+ LB2OFF( i_sector + i_read_total ) -
+ p_input->stream.p_selected_area->i_start;
+ if( b_eoc )
{
- return 1;
+ /* We modify i_part only at end of chapter not to erase
+ * some modification from the interface */
+ p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
}
- if( b_eot )
+ if( p_input->stream.p_selected_area->i_tell
+ >= p_input->stream.p_selected_area->i_size )
{
+ if( ( p_dvd->i_title + 1 ) >= p_input->stream.i_area_nb )
+ {
+ /* EOF */
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ return 0;
+ }
+
+ /* EOT */
intf_WarnMsg( 4, "dvd info: new title" );
p_dvd->i_title++;
- vlc_mutex_lock( &p_input->stream.stream_lock );
DVDSetArea( p_input, p_input->stream.pp_areas[p_dvd->i_title] );
vlc_mutex_unlock( &p_input->stream.stream_lock );
- return 0;
+ return LB2OFF( i_read_total );
}
- if( i_read_blocks == i_block_once )
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+/*
+ if( i_read_blocks != i_block_once )
{
- return 0;
+ return -1;
}
-
- return -1;
-}
-
-/*****************************************************************************
- * DVDRewind : reads a stream backward
- *****************************************************************************/
-static int DVDRewind( input_thread_t * p_input )
-{
- return( -1 );
+*/
+ return LB2OFF( i_read_total );
}
/*****************************************************************************
static void DVDSeek( input_thread_t * p_input, off_t i_off )
{
thread_dvd_data_t * p_dvd;
+ int i_block;
int i_prg_cell;
int i_cell;
int i_chapter;
int i_angle;
- p_dvd = ( thread_dvd_data_t * )p_input->p_plugin_data;
+ p_dvd = ( thread_dvd_data_t * )(p_input->p_access_data);
+ vlc_mutex_lock( &p_input->stream.stream_lock );
/* we have to take care of offset of beginning of title */
p_dvd->i_sector = OFF2LB(i_off + p_input->stream.p_selected_area->i_start)
- p_dvd->i_title_start;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
i_prg_cell = 0;
i_chapter = 0;
* can be very wide out of such zones */
if( title.p_cell_play[p_dvd->i_prg_cell].i_category & 0xf000 )
{
- p_dvd->i_sector = MAX(
+ p_dvd->i_sector = __MAX(
cell.i_start_sector,
title.p_cell_play[p_dvd->i_prg_cell].i_start_sector );
}
- p_dvd->i_end_sector = MIN(
+ p_dvd->i_end_sector = __MIN(
cell.i_end_sector,
title.p_cell_play[p_dvd->i_prg_cell].i_end_sector );
#undef cell
}
p_dvd->i_chapter = i_chapter;
- p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
- p_input->stream.p_selected_area->i_tell =
- LB2OFF ( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_title_start
- + p_dvd->i_sector ) )
- - p_input->stream.p_selected_area->i_start;
-/*
- intf_WarnMsg( 3, "Program Cell: %d Cell: %d Chapter: %d",
- p_dvd->i_prg_cell, p_dvd->i_cell, p_dvd->i_chapter );
-*/
+ if( ( i_block = dvdcss_seek( p_dvd->dvdhandle,
+ p_dvd->i_title_start + p_dvd->i_sector,
+ DVDCSS_SEEK_MPEG ) ) < 0 )
+ {
+ intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
+ p_input->b_error = 1;
+ return;
+ }
- return;
-}
+ vlc_mutex_lock( &p_input->stream.stream_lock );
+ p_input->stream.p_selected_area->i_part = p_dvd->i_chapter;
+ p_input->stream.p_selected_area->i_tell =
+ LB2OFF ( i_block ) - p_input->stream.p_selected_area->i_start;
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
-static void DVDOpen ( struct input_thread_s *p_input )
-{
- return;
-}
+ intf_WarnMsg( 7, "Program Cell: %d Cell: %d Chapter: %d",
+ p_dvd->i_prg_cell, p_dvd->i_cell, p_dvd->i_chapter );
-static void DVDClose ( struct input_thread_s *p_input )
-{
return;
}
}
/*
-intf_WarnMsg( 3, "FindCell: i_cell %d i_index %d found %d nb %d",
+intf_WarnMsg( 12, "FindCell: i_cell %d i_index %d found %d nb %d",
p_dvd->i_cell,
p_dvd->i_prg_cell,
i_cell,
intf_ErrMsg( "dvd error: can't find sector" );
return -1;
}
-
+
/* Find start and end sectors of new cell */
#if 1
- p_dvd->i_sector = MAX(
+ p_dvd->i_sector = __MAX(
p_dvd->p_ifo->vts.cell_inf.p_cell_map[p_dvd->i_cell].i_start_sector,
title.p_cell_play[p_dvd->i_prg_cell].i_start_sector );
- p_dvd->i_end_sector = MIN(
+ p_dvd->i_end_sector = __MIN(
p_dvd->p_ifo->vts.cell_inf.p_cell_map[p_dvd->i_cell].i_end_sector,
title.p_cell_play[p_dvd->i_prg_cell].i_end_sector );
#else
#endif
/*
- intf_WarnMsg( 3, "cell: %d sector1: 0x%x end1: 0x%x\n"
+ intf_WarnMsg( 12, "cell: %d sector1: 0x%x end1: 0x%x\n"
"index: %d sector2: 0x%x end2: 0x%x\n"
"category: 0x%x ilvu end: 0x%x vobu start 0x%x",
p_dvd->i_cell,
p_dvd->i_start = p_dvd->i_title_start + p_dvd->i_sector;
/* Position the fd pointer on the right address */
- p_dvd->i_start = dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start );
+ if( ( p_dvd->i_start = dvdcss_seek( p_dvd->dvdhandle,
+ p_dvd->i_start,
+ DVDCSS_SEEK_MPEG ) ) < 0 )
+ {
+ intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
+ return -1;
+ }
p_dvd->i_chapter = i_chapter;
return 0;
}
#undef title
+/*****************************************************************************
+ * DVDLaunchDecoders
+ *****************************************************************************/
+static void DVDLaunchDecoders( input_thread_t * p_input )
+{
+ thread_dvd_data_t * p_dvd;
+ int i_audio;
+ int i_spu;
+
+ p_dvd = (thread_dvd_data_t*)(p_input->p_access_data);
+
+ /* Select Video stream (always 0) */
+ if( p_main->b_video )
+ {
+ input_SelectES( p_input, p_input->stream.pp_es[0] );
+ }
+
+ /* Select audio stream */
+ if( p_main->b_audio )
+ {
+ /* For audio: first one if none or a not existing one specified */
+ i_audio = config_GetIntVariable( INPUT_CHANNEL_VAR );
+ if( i_audio < 0 /*|| i_audio > i_audio_nb*/ )
+ {
+ config_PutIntVariable( INPUT_CHANNEL_VAR, 1 );
+ i_audio = 1;
+ }
+ if( i_audio > 0 /*&& i_audio_nb > 0*/ )
+ {
+ if( config_GetIntVariable( AOUT_SPDIF_VAR ) ||
+ ( config_GetIntVariable( INPUT_AUDIO_VAR ) ==
+ REQUESTED_AC3 ) )
+ {
+ int i_ac3 = i_audio;
+ while( ( p_input->stream.pp_es[i_ac3]->i_type !=
+ AC3_AUDIO_ES ) && ( i_ac3 <=
+ p_dvd->p_ifo->vts.manager_inf.i_audio_nb ) )
+ {
+ i_ac3++;
+ }
+ if( p_input->stream.pp_es[i_ac3]->i_type == AC3_AUDIO_ES )
+ {
+ input_SelectES( p_input,
+ p_input->stream.pp_es[i_ac3] );
+ }
+ }
+ else
+ {
+ input_SelectES( p_input,
+ p_input->stream.pp_es[i_audio] );
+ }
+ }
+ }
+
+ /* Select subtitle */
+ if( p_main->b_video )
+ {
+ /* for spu, default is none */
+ i_spu = config_GetIntVariable( INPUT_SUBTITLE_VAR );
+ if( i_spu < 0 /*|| i_spu > i_spu_nb*/ )
+ {
+ config_PutIntVariable( INPUT_SUBTITLE_VAR, 0 );
+ i_spu = 0;
+ }
+ if( i_spu > 0 /* && i_spu_nb > 0*/ )
+ {
+ i_spu += p_dvd->p_ifo->vts.manager_inf.i_audio_nb;
+ input_SelectES( p_input, p_input->stream.pp_es[i_spu] );
+ }
+ }
+}
projects / vlc / blobdiff