Skip to content

V
vlc-1.1
Commit 7a174310 authored by Stéphane Borel's avatar Stéphane Borel
Browse files
Options

-defining TRACE_DVDCSS in config.h displays libdvdcss debug message. 

-libdvdcss error messages are reported in input_dvd.c.
-vlc verbosity also enables more error messages from libdvdcss.
parent 9a3c67ba
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 23 deletions
extras/libdvdcss/css.c
View file @ 7a174310
......@@ -2,7 +2,7 @@
* css.c: Functions for DVD authentification and unscrambling
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: css.c,v 1.12 2001/10/16 10:46:24 stef Exp $
* $Id: css.c,v 1.13 2001/10/16 16:51:28 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
* Hkan Hjort <d95hjort@dtek.chalmers.se>
......@@ -335,6 +335,7 @@ int CSSGetDiscKey( dvdcss_handle dvdcss )
case DVDCSS_DISC:
/* Crack Disc key to be able to use it */
_dvdcss_debug( dvdcss, "cracking disc key with key hash" );
_dvdcss_debug( dvdcss, "building 64MB table ... this will take some time" );
CSSDiscCrack( dvdcss->css.disc.p_disc_key );
break;
......@@ -369,6 +370,8 @@ int CSSGetTitleKey( dvdcss_handle dvdcss, int i_pos )
int i_best_plen;
int i_best_p;
_dvdcss_debug( dvdcss, "cracking title key ... this may take some time" );
for( i = 0 ; i < KEY_SIZE ; i++ )
{
p_key[i] = 0;
......@@ -459,6 +462,8 @@ int CSSGetTitleKey( dvdcss_handle dvdcss, int i_pos )
* so we can read the title key and decrypt it.
*/
_dvdcss_debug( dvdcss, "decrypting title key with disc key" );
/* We need to authenticate again for every key
* (to get a new session key ?) */
CSSAuth( dvdcss );
......@@ -885,6 +890,7 @@ static int CSSDiscCrack( u8 * p_disc_key )
* Prepare tables for hash reversal
*/
/* initialize lookup tables for k[1] */
K1table = malloc( 65536 * K1TABLEWIDTH );
memset( K1table, 0 , 65536 * K1TABLEWIDTH );
......@@ -903,10 +909,12 @@ static int CSSDiscCrack( u8 * p_disc_key )
tmp3 = j ^ tmp2 ^ i; /* C[1] */
tmp4 = K1table[ K1TABLEWIDTH * ( 256 * j + tmp3 ) ]; /* count of entries here */
tmp4++;
/*
if( tmp4 == K1TABLEWIDTH )
{
// _dvdcss_debug( dvdcss, "Table disaster %d", tmp4 );
fprintf( stderr, "Table disaster %d", tmp4 );
}
*/
if( tmp4 < K1TABLEWIDTH )
{
K1table[ K1TABLEWIDTH * ( 256 * j + tmp3 ) + tmp4 ] = i;
......@@ -925,13 +933,14 @@ static int CSSDiscCrack( u8 * p_disc_key )
tmp3 = 0;
fprintf( stderr, "initializing the big table" );
for( i = 0 ; i < 16777216 ; i++ )
{
/*
if( ( i & 0x07ffff ) == 0 )
{
printf( "#" );
fflush( stdout );
fprintf( stderr, "#" );
}
*/
tmp = (( i + i ) & 0x1fffff0 ) | 0x8 | ( i & 0x7 );
......
extras/libdvdcss/libdvdcss.c
View file @ 7a174310
......@@ -2,7 +2,7 @@
* libdvdcss.c: DVD reading library.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: libdvdcss.c,v 1.17 2001/10/14 03:26:20 stef Exp $
* $Id: libdvdcss.c,v 1.18 2001/10/16 16:51:28 stef Exp $
*
* Authors: Stphane Borel <stef@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -178,7 +178,10 @@ extern int dvdcss_seek ( dvdcss_handle dvdcss, int i_blocks, int i_flags )
|| ( i_flags & DVDCSS_SEEK_INI ) )
{
/* check the title key */
dvdcss_title( dvdcss, i_blocks );
if( dvdcss_title( dvdcss, i_blocks ) )
{
return -1;
}
}
return _dvdcss_seek( dvdcss, i_blocks );
......
include/config.h.in
View file @ 7a174310
......@@ -60,6 +60,7 @@
* useful to track a bug */
//#define TRACE_INTF
//#define TRACE_INPUT
//#define TRACE_DVDCSS
//#define TRACE_AUDIO
#define TRACE_VOUT
#define TRACE_VPAR
......
plugins/dvd/input_dvd.c
View file @ 7a174310
......@@ -10,7 +10,7 @@
* -dvd_udf to find files
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.90 2001/10/15 13:33:00 stef Exp $
* $Id: input_dvd.c,v 1.91 2001/10/16 16:51:28 stef Exp $
*
* Author: Stphane Borel <stef@via.ecp.fr>
*
......@@ -199,7 +199,12 @@ static void DVDInit( input_thread_t * p_input )
p_dvd->dvdhandle = (dvdcss_handle) p_input->i_handle;
dvdcss_seek( p_dvd->dvdhandle, 0, DVDCSS_NOFLAGS );
if( dvdcss_seek( p_dvd->dvdhandle, 0, DVDCSS_NOFLAGS ) < 0 )
{
intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
p_input->b_error = 1;
return;
}
/* We read DVD_BLOCK_READ_ONCE in each loop, so the input will receive
* DVD_DATA_READ_ONCE at most */
......@@ -306,6 +311,7 @@ static void DVDInit( input_thread_t * p_input )
static void DVDOpen( struct input_thread_s *p_input )
{
dvdcss_handle dvdhandle;
int i_flags;
vlc_mutex_lock( &p_input->stream.stream_lock );
......@@ -319,21 +325,28 @@ static void DVDOpen( struct input_thread_s *p_input )
vlc_mutex_unlock( &p_input->stream.stream_lock );
/* Error messages from libdvdcss only in verbose mode */
i_flags = p_main->i_warning_level ? DVDCSS_NOFLAGS : DVDCSS_INIT_QUIET;
/* Debug message from libdvdcss selected from config.h #define */
#ifdef TRACE_DVDCSS
i_flags |= DVDCSS_INIT_DEBUG;
#endif
/* XXX: put this shit in an access plugin */
if( strlen( p_input->p_source ) > 4
&& !strncasecmp( p_input->p_source, "dvd:", 4 ) )
{
dvdhandle = dvdcss_open( p_input->p_source + 4,
DVDCSS_INIT_QUIET );
dvdhandle = dvdcss_open( p_input->p_source + 4, i_flags );
}
else
{
dvdhandle = dvdcss_open( p_input->p_source,
DVDCSS_INIT_QUIET );
dvdhandle = dvdcss_open( p_input->p_source, i_flags );
}
if( dvdhandle == NULL )
{
intf_ErrMsg( "dvd error: dvdcss can't open device" );
p_input->b_error = 1;
return;
}
......@@ -483,7 +496,11 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
* It is only useful for title cracking method. Methods using the decrypted
* disc key are fast enough to check the key at each seek
*/
dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI );
if( dvdcss_seek( p_dvd->dvdhandle, p_dvd->i_start, DVDCSS_SEEK_INI ) < 0 )
{
intf_ErrMsg( "dvd error: %s", dvdcss_error( p_dvd->dvdhandle ) );
return -1;
}
p_dvd->i_size -= p_dvd->i_sector + 1;
......@@ -831,9 +848,13 @@ static int DVDRead( input_thread_t * p_input,
}
/* Position the fd pointer on the right address */
i_sector = dvdcss_seek( p_dvd->dvdhandle,
p_dvd->i_title_start + p_dvd->i_sector,
DVDCSS_SEEK_MPEG );
if( ( i_sector = 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 ) );
return -1;
}
/* update chapter : it will be easier when we have navigation
* ES support */
......@@ -994,6 +1015,7 @@ static int DVDRewind( input_thread_t * p_input )
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;
......@@ -1084,11 +1106,17 @@ static void DVDSeek( input_thread_t * p_input, off_t i_off )
p_dvd->i_chapter = i_chapter;
p_input->stream.p_selected_area->i_part = 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;
}
p_input->stream.p_selected_area->i_tell =
LB2OFF ( dvdcss_seek( p_dvd->dvdhandle,
p_dvd->i_title_start + p_dvd->i_sector,
DVDCSS_SEEK_MPEG ) )
- p_input->stream.p_selected_area->i_start;
LB2OFF ( i_block ) - p_input->stream.p_selected_area->i_start;
intf_WarnMsg( 7, "Program Cell: %d Cell: %d Chapter: %d",
p_dvd->i_prg_cell, p_dvd->i_cell, p_dvd->i_chapter );
......@@ -1218,9 +1246,13 @@ static int DVDChapterSelect( thread_dvd_data_t * p_dvd, int i_chapter )
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,
DVDCSS_SEEK_MPEG );
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;
......
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