Skip to content

V
vlc
Commit 05010656 authored by Stéphane Borel's avatar Stéphane Borel
Browse files
Options

-Change in the code to detect beginning of movie. It is much better now 

but still fails with some DVD for which the movie is not the first
Program.

As a consequence some DVD that worked before don't work anymore.

-Beginning of ideas to handle chapters and ES selection
parent c3b1800a
Hide whitespace changes
Inline Side-by-side
Showing with 336 additions and 143 deletions
include/input_ext-intf.h
View file @ 05010656
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* control the pace of reading. * control the pace of reading.
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: input_ext-intf.h,v 1.20 2001/02/16 06:37:09 sam Exp $ * $Id: input_ext-intf.h,v 1.21 2001/02/19 03:12:26 stef Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -154,6 +154,16 @@ typedef struct stream_descriptor_s ...@@ -154,6 +154,16 @@ typedef struct stream_descriptor_s
off_t i_seek; /* next requested location (changed off_t i_seek; /* next requested location (changed
* by the interface thread */ * by the interface thread */
/* For DVD streams: */
int i_title_nb;
int * pi_chapter; /* Number of chapter for each title */
char ** ppsz_audio; /* Audio language names */
char ** ppsz_spu; /* Sub-pictures names */
int i_title; /* selected title */
int i_chapter; /* selected chapter */
int i_audio; /* selected audio stream */
int i_spu; /* selected spu */
/* New status and rate requested by the interface */ /* New status and rate requested by the interface */
int i_new_status, i_new_rate; int i_new_status, i_new_rate;
vlc_cond_t stream_wait; /* interface -> input in case of a vlc_cond_t stream_wait; /* interface -> input in case of a
......
plugins/dvd/dvd_ifo.c
View file @ 05010656
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_ifo.c: Functions for ifo parsing * dvd_ifo.c: Functions for ifo parsing
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_ifo.c,v 1.9 2001/02/18 01:42:05 stef Exp $ * $Id: dvd_ifo.c,v 1.10 2001/02/19 03:12:26 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -345,7 +345,7 @@ static pgc_t ReadPGC( ifo_t* p_ifo ) ...@@ -345,7 +345,7 @@ static pgc_t ReadPGC( ifo_t* p_ifo )
p_ifo->i_pos = lseek( p_ifo->i_fd, i_start p_ifo->i_pos = lseek( p_ifo->i_fd, i_start
+ pgc.i_cell_pos_inf_sbyte, SEEK_SET ); + pgc.i_cell_pos_inf_sbyte, SEEK_SET );
pgc.p_cell_pos_inf = malloc( pgc.i_cell_nb *sizeof(cell_pos_inf_t) ); pgc.p_cell_pos_inf = malloc( pgc.i_cell_nb *sizeof(cell_pos_inf_t) );
if( pgc.p_cell_play_inf == NULL ) if( pgc.p_cell_pos_inf == NULL )
{ {
intf_ErrMsg( "Out of memory" ); intf_ErrMsg( "Out of memory" );
p_ifo->b_error = 1; p_ifo->b_error = 1;
......
plugins/dvd/input_dvd.c
View file @ 05010656
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.13 2001/02/18 01:42:05 stef Exp $ * $Id: input_dvd.c,v 1.14 2001/02/19 03:12:26 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -73,6 +73,165 @@ ...@@ -73,6 +73,165 @@
#include "modules.h" #include "modules.h"
/*****************************************************************************
* Local tables
*****************************************************************************/
static struct
{
char p_code[3];
char p_lang_long[20];
} lang_tbl[] =
{
/* The ISO 639 language codes.
* Language names with * prefix are not spelled in their own language
*/
{" ", "Not Specified"},
{"aa", "*Afar"},
{"ab", "*Abkhazian"},
{"af", "*Afrikaans"},
{"am", "*Amharic"},
{"ar", "*Arabic"},
{"as", "*Assamese"},
{"ay", "*Aymara"},
{"az", "*Azerbaijani"},
{"ba", "*Bashkir"},
{"be", "*Byelorussian"},
{"bg", "*Bulgarian"},
{"bh", "*Bihari"},
{"bi", "*Bislama"},
{"bn", "*Bengali; Bangla"},
{"bo", "*Tibetan"},
{"br", "*Breton"},
{"ca", "*Catalan"},
{"co", "*Corsican"},
{"cs", "*Czech(Ceske)"},
{"cy", "*Welsh"},
{"da", "Dansk"},
{"de", "Deutsch"},
{"dz", "*Bhutani"},
{"el", "*Greek"},
{"en", "English"},
{"eo", "*Esperanto"},
{"es", "Espanol"},
{"et", "*Estonian"},
{"eu", "*Basque"},
{"fa", "*Persian"},
{"fi", "Suomi"},
{"fj", "*Fiji"},
{"fo", "*Faroese"},
{"fr", "Francais"},
{"fy", "*Frisian"},
{"ga", "*Irish"},
{"gd", "*Scots Gaelic"},
{"gl", "*Galician"},
{"gn", "*Guarani"},
{"gu", "*Gujarati"},
{"ha", "*Hausa"},
{"he", "*Hebrew"}, // formerly iw
{"hi", "*Hindi"},
{"hr", "Hrvatski"}, // Croatian
{"hu", "Magyar"},
{"hy", "*Armenian"},
{"ia", "*Interlingua"},
{"id", "*Indonesian"}, // formerly in
{"ie", "*Interlingue"},
{"ik", "*Inupiak"},
{"in", "*Indonesian"}, // replaced by id
{"is", "Islenska"},
{"it", "Italiano"},
{"iu", "*Inuktitut"},
{"iw", "*Hebrew"}, // replaced by he
{"ja", "*Japanese"},
{"ji", "*Yiddish"}, // replaced by yi
{"jw", "*Javanese"},
{"ka", "*Georgian"},
{"kk", "*Kazakh"},
{"kl", "*Greenlandic"},
{"km", "*Cambodian"},
{"kn", "*Kannada"},
{"ko", "*Korean"},
{"ks", "*Kashmiri"},
{"ku", "*Kurdish"},
{"ky", "*Kirghiz"},
{"la", "*Latin"},
{"ln", "*Lingala"},
{"lo", "*Laothian"},
{"lt", "*Lithuanian"},
{"lv", "*Latvian, Lettish"},
{"mg", "*Malagasy"},
{"mi", "*Maori"},
{"mk", "*Macedonian"},
{"ml", "*Malayalam"},
{"mn", "*Mongolian"},
{"mo", "*Moldavian"},
{"mr", "*Marathi"},
{"ms", "*Malay"},
{"mt", "*Maltese"},
{"my", "*Burmese"},
{"na", "*Nauru"},
{"ne", "*Nepali"},
{"nl", "Nederlands"},
{"no", "Norsk"},
{"oc", "*Occitan"},
{"om", "*(Afan) Oromo"},
{"or", "*Oriya"},
{"pa", "*Punjabi"},
{"pl", "*Polish"},
{"ps", "*Pashto, Pushto"},
{"pt", "Portugues"},
{"qu", "*Quechua"},
{"rm", "*Rhaeto-Romance"},
{"rn", "*Kirundi"},
{"ro", "*Romanian"},
{"ru", "*Russian"},
{"rw", "*Kinyarwanda"},
{"sa", "*Sanskrit"},
{"sd", "*Sindhi"},
{"sg", "*Sangho"},
{"sh", "*Serbo-Croatian"},
{"si", "*Sinhalese"},
{"sk", "*Slovak"},
{"sl", "*Slovenian"},
{"sm", "*Samoan"},
{"sn", "*Shona"},
{"so", "*Somali"},
{"sq", "*Albanian"},
{"sr", "*Serbian"},
{"ss", "*Siswati"},
{"st", "*Sesotho"},
{"su", "*Sundanese"},
{"sv", "Svenska"},
{"sw", "*Swahili"},
{"ta", "*Tamil"},
{"te", "*Telugu"},
{"tg", "*Tajik"},
{"th", "*Thai"},
{"ti", "*Tigrinya"},
{"tk", "*Turkmen"},
{"tl", "*Tagalog"},
{"tn", "*Setswana"},
{"to", "*Tonga"},
{"tr", "*Turkish"},
{"ts", "*Tsonga"},
{"tt", "*Tatar"},
{"tw", "*Twi"},
{"ug", "*Uighur"},
{"uk", "*Ukrainian"},
{"ur", "*Urdu"},
{"uz", "*Uzbek"},
{"vi", "*Vietnamese"},
{"vo", "*Volapuk"},
{"wo", "*Wolof"},
{"xh", "*Xhosa"},
{"yi", "*Yiddish"}, // formerly ji
{"yo", "*Yoruba"},
{"za", "*Zhuang"},
{"zh", "*Chinese"},
{"zu", "*Zulu"},
{"\0", ""}
};
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
...@@ -107,6 +266,25 @@ void input_getfunctions( function_list_t * p_function_list ) ...@@ -107,6 +266,25 @@ void input_getfunctions( function_list_t * p_function_list )
#undef input #undef input
} }
/*
* Local tools to decode some data in ifo
*/
/*****************************************************************************
* Language: gives the long language name from the two-letters ISO-639 code
*****************************************************************************/
static char * Language( char * p_code )
{
int i = 0;
while( !memcmp( lang_tbl[i].p_code, p_code, 2 ) && lang_tbl[i].p_lang_long )
{
i++;
}
return lang_tbl[i].p_lang_long;
}
/* /*
* Data reading functions * Data reading functions
*/ */
...@@ -160,147 +338,50 @@ static int DVDCheckCSS( input_thread_t * p_input ) ...@@ -160,147 +338,50 @@ static int DVDCheckCSS( input_thread_t * p_input )
} }
/***************************************************************************** /*****************************************************************************
* DVDSetRegion: initialize input data for title x, chapter y. It should * DVDSetRegion: initialize input data for title x, chapter y.
* be called for each user navigation request. * It should be called for each user navigation request, and to change
*****************************************************************************/ * audio or sub-picture streams.
static int DVDSetRegion( int i_title, int i_chapter ) * ---
{ * Take care that i_title and i_chapter start from 0.
return 0;
}
/*****************************************************************************
* DVDInit: initializes DVD structures
*****************************************************************************/ *****************************************************************************/
static void DVDInit( input_thread_t * p_input ) static int DVDSetRegionParameters( input_thread_t * p_input,
int i_title, int i_chapter,
int i_audio, int i_spu )
{ {
thread_dvd_data_t * p_method; thread_dvd_data_t * p_method;
off_t i_start; off_t i_start;
off_t i_size; off_t i_size;
int i_cell, i_cell_1, i_start_cell, i_end_cell; pgc_t * p_pgc;
int i_start_cell;
if( (p_method = malloc( sizeof(thread_dvd_data_t) )) == NULL ) int i_end_cell;
{ int i_index;
intf_ErrMsg( "Out of memory" ); int i_cell;
p_input->b_error = 1;
return;
}
p_input->p_plugin_data = (void *)p_method;
p_input->p_method_data = NULL;
p_method->i_fd = p_input->i_handle;
/* FIXME: read several packets once */
p_method->i_read_once = 1;
p_method->b_encrypted = DVDCheckCSS( p_input );
lseek( p_input->i_handle, 0, SEEK_SET ); p_method = (thread_dvd_data_t*)p_input->p_plugin_data;
/* Reading structures initialisation */ /* Set selected title start and size */
input_NetlistInit( p_input, 4096, 4096, DVD_LB_SIZE, p_input->stream.i_title = i_title;
p_method->i_read_once );
/* Ifo initialisation */ p_pgc = &p_method->ifo.p_vts[i_title].pgci_ti.p_srp[0].pgc;
p_method->ifo = IfoInit( p_input->i_handle );
/* FIXME: kludge */ /* Find cell index in Program chain */
p_method->i_title = p_method->ifo.vmg.ptt_srpt.p_tts[0].i_tts_nb; i_index = p_pgc->prg_map.pi_entry_cell[i_chapter] - 1;
/* CSS initialisation */ /* Search for cell_index in cell adress_table */
if( p_method->b_encrypted ) i_cell = 0;
while( p_pgc->p_cell_pos_inf[i_index].i_vob_id >
p_method->ifo.p_vts[i_title].c_adt.p_cell_inf[i_cell].i_vob_id )
{ {
i_cell++;
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
p_method->css = CSSInit( p_input->i_handle );
if( ( p_input->b_error = p_method->css.b_error ) )
{
intf_ErrMsg( "CSS fatal error" );
return;
}
#else
intf_ErrMsg( "Unscrambling not supported" );
p_input->b_error = 1;
return;
#endif
} }
while( p_pgc->p_cell_pos_inf[i_index].i_cell_id >
/* Ifo structures reading */ p_method->ifo.p_vts[i_title].c_adt.p_cell_inf[i_cell].i_cell_id )
IfoRead( &(p_method->ifo) );
intf_WarnMsg( 3, "Ifo: Initialized" );
/* CSS title keys decryption */
if( p_method->b_encrypted )
{ {
i_cell++;
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
int i;
p_method->css.i_title_nb = p_method->ifo.vmg.mat.i_tts_nb;
if( (p_method->css.p_title_key =
malloc( p_method->css.i_title_nb *sizeof(title_key_t) ) ) == NULL )
{
intf_ErrMsg( "Out of memory" );
p_input->b_error = 1;
return;
}
for( i=0 ; i<p_method->css.i_title_nb ; i++ )
{
p_method->css.p_title_key[i].i =
p_method->ifo.p_vts[i].i_pos +
p_method->ifo.p_vts[i].mat.i_tt_vobs_ssector * DVD_LB_SIZE;
}
CSSGetKeys( &(p_method->css) );
intf_WarnMsg( 3, "CSS: initialized" );
#else
intf_ErrMsg( "Unscrambling not supported" );
p_input->b_error = 1;
return;
#endif
} }
i_start_cell = i_cell;
/* FIXME: Kludge beginning and end of the stream in vts_01_1.vob */ i_end_cell = i_start_cell + p_pgc->i_cell_nb - 1;
/* Determines which vob contains the movie */
i_cell = 0;
i_cell_1 = 0;
i_start_cell = 0;
i_end_cell = 0;
/* Loop on the number of vobs */
while( p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_cell].i_vob_id <=
p_method->ifo.p_vts[p_method->i_title].c_adt.i_vob_nb )
{
i_cell_1 = i_cell;
/* Loop to find the number of cells in the vob */
do
{
i_cell++;
if( i_cell >= p_method->ifo.p_vts[p_method->i_title].c_adt.i_cell_nb )
{
break;
}
}
while( p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_cell-1].i_cell_id <
p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_cell].i_cell_id );
if( p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_cell-1].i_cell_id >
p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_end_cell].i_cell_id )
{
i_start_cell = i_cell_1;
i_end_cell = i_cell - 1;
}
}
/* The preceding does not work with all DVD, so we give the
* last cell of the title as end */
i_end_cell = p_method->ifo.p_vts[p_method->i_title].c_adt.i_cell_nb - 1;
intf_WarnMsg( 2, "DVD: Start cell: %d End Cell: %d", intf_WarnMsg( 2, "DVD: Start cell: %d End Cell: %d",
i_start_cell, i_end_cell ); i_start_cell, i_end_cell );
...@@ -309,25 +390,20 @@ static void DVDInit( input_thread_t * p_input ) ...@@ -309,25 +390,20 @@ static void DVDInit( input_thread_t * p_input )
p_method->i_end_cell = i_end_cell; p_method->i_end_cell = i_end_cell;
/* start is : beginning of vts + offset to vobs + offset to vob x */ /* start is : beginning of vts + offset to vobs + offset to vob x */
i_start = p_method->ifo.p_vts[p_method->i_title].i_pos + DVD_LB_SIZE * i_start = p_method->ifo.p_vts[i_title].i_pos + DVD_LB_SIZE *
( p_method->ifo.p_vts[p_method->i_title].mat.i_tt_vobs_ssector + ( p_method->ifo.p_vts[i_title].mat.i_tt_vobs_ssector +
p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_start_cell].i_ssector ); p_method->ifo.p_vts[i_title].c_adt.p_cell_inf[i_start_cell].i_ssector );
p_method->i_start_byte = i_start; p_method->i_start_byte = i_start;
i_start = lseek( p_input->i_handle, i_start, SEEK_SET ); i_start = lseek( p_input->i_handle, i_start, SEEK_SET );
intf_WarnMsg( 3, "DVD: VOBstart at: %lld", i_start ); intf_WarnMsg( 3, "DVD: VOBstart at: %lld", i_start );
i_size = (off_t) i_size = (off_t)
( p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_end_cell].i_esector - ( p_method->ifo.p_vts[i_title].c_adt.p_cell_inf[i_end_cell].i_esector -
p_method->ifo.p_vts[p_method->i_title].c_adt.p_cell_inf[i_start_cell].i_ssector + 1 ) p_method->ifo.p_vts[i_title].c_adt.p_cell_inf[i_start_cell].i_ssector + 1 )
*DVD_LB_SIZE; *DVD_LB_SIZE;
intf_WarnMsg( 3, "DVD: stream size: %lld", i_size ); intf_WarnMsg( 3, "DVD: stream size: %lld", i_size );
/* Initialize ES structures */
input_InitStream( p_input, sizeof( stream_ps_data_t ) );
input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
if( p_input->stream.b_seekable ) if( p_input->stream.b_seekable )
{ {
stream_ps_data_t * p_demux_data = stream_ps_data_t * p_demux_data =
...@@ -467,7 +543,115 @@ static void DVDInit( input_thread_t * p_input ) ...@@ -467,7 +543,115 @@ static void DVDInit( input_thread_t * p_input )
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
} }
return 0;
}
/*****************************************************************************
* DVDInit: initializes DVD structures
*****************************************************************************/
static void DVDInit( input_thread_t * p_input )
{
thread_dvd_data_t * p_method;
if( (p_method = malloc( sizeof(thread_dvd_data_t) )) == NULL )
{
intf_ErrMsg( "Out of memory" );
p_input->b_error = 1;
return;
}
p_input->p_plugin_data = (void *)p_method;
p_input->p_method_data = NULL;
p_method->i_fd = p_input->i_handle;
/* FIXME: read several packets once */
p_method->i_read_once = 1;
p_method->b_encrypted = DVDCheckCSS( p_input );
lseek( p_input->i_handle, 0, SEEK_SET );
/* Reading structures initialisation */
input_NetlistInit( p_input, 4096, 4096, DVD_LB_SIZE,
p_method->i_read_once );
/* Ifo initialisation */
p_method->ifo = IfoInit( p_input->i_handle );
/* CSS initialisation */
if( p_method->b_encrypted )
{
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
p_method->css = CSSInit( p_input->i_handle );
if( ( p_input->b_error = p_method->css.b_error ) )
{
intf_ErrMsg( "CSS fatal error" );
return;
}
#else
intf_ErrMsg( "Unscrambling not supported" );
p_input->b_error = 1;
return;
#endif
}
/* Ifo structures reading */
IfoRead( &(p_method->ifo) );
intf_WarnMsg( 3, "Ifo: Initialized" );
/* CSS title keys decryption */
if( p_method->b_encrypted )
{
#if defined( HAVE_SYS_DVDIO_H ) || defined( LINUX_DVD )
int i;
p_method->css.i_title_nb = p_method->ifo.vmg.mat.i_tts_nb;
if( (p_method->css.p_title_key =
malloc( p_method->css.i_title_nb *sizeof(title_key_t) ) ) == NULL )
{
intf_ErrMsg( "Out of memory" );
p_input->b_error = 1;
return;
}
for( i=0 ; i<p_method->css.i_title_nb ; i++ )
{
p_method->css.p_title_key[i].i =
p_method->ifo.p_vts[i].i_pos +
p_method->ifo.p_vts[i].mat.i_tt_vobs_ssector * DVD_LB_SIZE;
}
CSSGetKeys( &(p_method->css) );
intf_WarnMsg( 3, "CSS: initialized" );
#else
intf_ErrMsg( "Unscrambling not supported" );
p_input->b_error = 1;
return;
#endif
}
/* Initialize ES structures */
input_InitStream( p_input, sizeof( stream_ps_data_t ) );
input_AddProgram( p_input, 0, sizeof( stream_ps_data_t ) );
/* Set stream data */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.i_title_nb = p_method->ifo.vmg.mat.i_tts_nb;
vlc_mutex_unlock( &p_input->stream.stream_lock );
/* By default, set all parameters to 0 */
/* FIXME: wrong kludge to get title nb */
DVDSetRegionParameters( p_input,
p_method->ifo.vmg.ptt_srpt.p_tts[0].i_tts_nb - 1,
0, 0, 0 );
return;
} }
/***************************************************************************** /*****************************************************************************
...@@ -522,7 +706,7 @@ static int DVDRead( input_thread_t * p_input, ...@@ -522,7 +706,7 @@ static int DVDRead( input_thread_t * p_input,
for( i=0 ; i<p_method->i_read_once ; i++ ) for( i=0 ; i<p_method->i_read_once ; i++ )
{ {
CSSDescrambleSector( CSSDescrambleSector(
p_method->css.p_title_key[p_method->i_title].key, p_method->css.p_title_key[p_input->stream.i_title].key,
p_vec[i].iov_base ); p_vec[i].iov_base );
((u8*)(p_vec[i].iov_base))[0x14] &= 0x8F; ((u8*)(p_vec[i].iov_base))[0x14] &= 0x8F;
} }
......
plugins/dvd/input_dvd.h
View file @ 05010656
...@@ -34,7 +34,6 @@ typedef struct thread_dvd_data_s ...@@ -34,7 +34,6 @@ typedef struct thread_dvd_data_s
int i_fd; // File descriptor of device int i_fd; // File descriptor of device
boolean_t b_encrypted; // CSS encryption boolean_t b_encrypted; // CSS encryption
int i_read_once; // NB of bytes read by DVDRead int i_read_once; // NB of bytes read by DVDRead
int i_title; // Current Title
int i_start_byte; int i_start_byte;
int i_start_cell; int i_start_cell;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment