Skip to content

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

-completely changed title and chapter initialization. Now we have real 

title units.

-Fixed size for a majority of DVD.
parent 87dc702b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 302 additions and 190 deletions
plugins/dvd/dvd_css.c
View file @ dc0df7c2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_css.c: Functions for DVD authentification and unscrambling * dvd_css.c: Functions for DVD authentification and unscrambling
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_css.c,v 1.16 2001/03/02 13:47:01 sam Exp $ * $Id: dvd_css.c,v 1.17 2001/03/03 07:07:01 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "defs.h" #include "defs.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <string.h> #include <string.h>
#include <fcntl.h> #include <fcntl.h>
...@@ -100,9 +101,9 @@ int CSSTest( int i_fd ) ...@@ -100,9 +101,9 @@ int CSSTest( int i_fd )
* Since we don't need the disc key to find the title key, we just run the * Since we don't need the disc key to find the title key, we just run the
* basic unavoidable commands to authenticate device and disc. * basic unavoidable commands to authenticate device and disc.
*****************************************************************************/ *****************************************************************************/
css_t CSSInit( int i_fd ) css_t * CSSInit( int i_fd )
{ {
css_t css; css_t * p_css;
#ifdef HAVE_CSS #ifdef HAVE_CSS
/* structures defined in cdrom.h or dvdio.h */ /* structures defined in cdrom.h or dvdio.h */
...@@ -112,8 +113,13 @@ css_t CSSInit( int i_fd ) ...@@ -112,8 +113,13 @@ css_t CSSInit( int i_fd )
int i_error = -1; int i_error = -1;
int i; int i;
css.i_fd = i_fd; p_css = malloc( sizeof(css_t) );
css.b_error = 0; if( p_css == NULL )
{
return NULL;
}
p_css->i_fd = i_fd;
memset( &auth_info, 0, sizeof(auth_info) ); memset( &auth_info, 0, sizeof(auth_info) );
...@@ -121,9 +127,10 @@ css_t CSSInit( int i_fd ) ...@@ -121,9 +127,10 @@ css_t CSSInit( int i_fd )
switch( CSSGetASF( i_fd ) ) switch( CSSGetASF( i_fd ) )
{ {
case -1: case -1:
css.b_error = 1; free( p_css );
return NULL;
case 1: case 1:
return css; return p_css;
case 0: case 0:
intf_WarnMsg( 3, "css info: authenticating" ); intf_WarnMsg( 3, "css info: authenticating" );
} }
...@@ -151,14 +158,14 @@ css_t CSSInit( int i_fd ) ...@@ -151,14 +158,14 @@ css_t CSSInit( int i_fd )
/* Unable to authenticate without AGID */ /* Unable to authenticate without AGID */
if( i_error == -1 ) if( i_error == -1 )
{ {
css.b_error = 1;
intf_ErrMsg( "css error: could not get AGID" ); intf_ErrMsg( "css error: could not get AGID" );
return css; free( p_css );
return NULL;
} }
for( i = 0 ; i < 10; ++i ) for( i = 0 ; i < 10; ++i )
{ {
css.disc.pi_challenge[i] = i; p_css->disc.pi_challenge[i] = i;
} }
/* Send AGID to host */ /* Send AGID to host */
...@@ -167,43 +174,43 @@ css_t CSSInit( int i_fd ) ...@@ -167,43 +174,43 @@ css_t CSSInit( int i_fd )
/* Get challenge from host */ /* Get challenge from host */
for( i = 0 ; i < 10 ; ++i ) for( i = 0 ; i < 10 ; ++i )
{ {
auth_info.hsc.chal[9-i] = css.disc.pi_challenge[i]; auth_info.hsc.chal[9-i] = p_css->disc.pi_challenge[i];
} }
/* Returning data, let LU change state */ /* Returning data, let LU change state */
css.i_agid = auth_info.lsa.agid; p_css->i_agid = auth_info.lsa.agid;
/* Send challenge to LU */ /* Send challenge to LU */
if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info )<0 ) if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info )<0 )
{ {
intf_ErrMsg( "css error: failed sending challenge to LU" ); intf_ErrMsg( "css error: failed sending challenge to LU" );
css.b_error = 1; free( p_css );
return css; return NULL;
} }
/* Get key1 from LU */ /* Get key1 from LU */
if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0) if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0)
{ {
intf_ErrMsg( "css error: failed getting key1 from LU" ); intf_ErrMsg( "css error: failed getting key1 from LU" );
css.b_error = 1; free( p_css );
return css; return NULL;
} }
/* Send key1 to host */ /* Send key1 to host */
for( i = 0 ; i < KEY_SIZE ; i++ ) for( i = 0 ; i < KEY_SIZE ; i++ )
{ {
css.disc.pi_key1[i] = auth_info.lsk.key[4-i]; p_css->disc.pi_key1[i] = auth_info.lsk.key[4-i];
} }
for( i = 0 ; i < 32 ; ++i ) for( i = 0 ; i < 32 ; ++i )
{ {
CSSCryptKey( 0, i, css.disc.pi_challenge, CSSCryptKey( 0, i, p_css->disc.pi_challenge,
css.disc.pi_key_check ); p_css->disc.pi_key_check );
if( memcmp( css.disc.pi_key_check, if( memcmp( p_css->disc.pi_key_check,
css.disc.pi_key1, KEY_SIZE ) == 0 ) p_css->disc.pi_key1, KEY_SIZE ) == 0 )
{ {
intf_WarnMsg( 3, "css info: drive authentic, using variant %d", i); intf_WarnMsg( 3, "css info: drive authentic, using variant %d", i);
css.disc.i_varient = i; p_css->disc.i_varient = i;
auth_info.type = DVD_LU_SEND_CHALLENGE; auth_info.type = DVD_LU_SEND_CHALLENGE;
break; break;
} }
...@@ -213,32 +220,32 @@ css_t CSSInit( int i_fd ) ...@@ -213,32 +220,32 @@ css_t CSSInit( int i_fd )
{ {
intf_ErrMsg( "css error: drive would not authenticate" ); intf_ErrMsg( "css error: drive would not authenticate" );
auth_info.type = DVD_AUTH_FAILURE; auth_info.type = DVD_AUTH_FAILURE;
css.b_error = 1; free( p_css );
return css; return NULL;
} }
/* Get challenge from LU */ /* Get challenge from LU */
if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0 ) if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0 )
{ {
intf_ErrMsg( "css error: failed getting challenge from LU" ); intf_ErrMsg( "css error: failed getting challenge from LU" );
css.b_error = 1; free( p_css );
return css; return NULL;
} }
/* Send challenge to host */ /* Send challenge to host */
for( i = 0 ; i < 10 ; ++i ) for( i = 0 ; i < 10 ; ++i )
{ {
css.disc.pi_challenge[i] = auth_info.hsc.chal[9-i]; p_css->disc.pi_challenge[i] = auth_info.hsc.chal[9-i];
} }
CSSCryptKey( 1, css.disc.i_varient, css.disc.pi_challenge, CSSCryptKey( 1, p_css->disc.i_varient, p_css->disc.pi_challenge,
css.disc.pi_key2 ); p_css->disc.pi_key2 );
auth_info.type = DVD_HOST_SEND_KEY2; auth_info.type = DVD_HOST_SEND_KEY2;
/* Get key2 from host */ /* Get key2 from host */
for( i = 0 ; i < KEY_SIZE ; ++i ) for( i = 0 ; i < KEY_SIZE ; ++i )
{ {
auth_info.hsk.key[4-i] = css.disc.pi_key2[i]; auth_info.hsk.key[4-i] = p_css->disc.pi_key2[i];
} }
/* Returning data, let LU change state */ /* Returning data, let LU change state */
...@@ -246,7 +253,8 @@ css_t CSSInit( int i_fd ) ...@@ -246,7 +253,8 @@ css_t CSSInit( int i_fd )
if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0 ) if( dvd_ioctl( i_fd, DVD_AUTH, &auth_info ) < 0 )
{ {
intf_ErrMsg( "css error: failed sending key2 to LU (expected)" ); intf_ErrMsg( "css error: failed sending key2 to LU (expected)" );
return css; free( p_css );
return NULL;
} }
if( auth_info.type == DVD_AUTH_ESTABLISHED ) if( auth_info.type == DVD_AUTH_ESTABLISHED )
...@@ -255,71 +263,83 @@ css_t CSSInit( int i_fd ) ...@@ -255,71 +263,83 @@ css_t CSSInit( int i_fd )
} }
else if( auth_info.type == DVD_AUTH_FAILURE ) else if( auth_info.type == DVD_AUTH_FAILURE )
{ {
css.b_error = 1;
intf_ErrMsg( "css error: DVD authentication failed" ); intf_ErrMsg( "css error: DVD authentication failed" );
free( p_css );
return NULL;
} }
memcpy( css.disc.pi_challenge, css.disc.pi_key1, KEY_SIZE ); memcpy( p_css->disc.pi_challenge, p_css->disc.pi_key1, KEY_SIZE );
memcpy( css.disc.pi_challenge+KEY_SIZE, css.disc.pi_key2, KEY_SIZE ); memcpy( p_css->disc.pi_challenge+KEY_SIZE, p_css->disc.pi_key2, KEY_SIZE );
CSSCryptKey( 2, css.disc.i_varient, CSSCryptKey( 2, p_css->disc.i_varient,
css.disc.pi_challenge, p_css->disc.pi_challenge,
css.disc.pi_key_check ); p_css->disc.pi_key_check );
intf_WarnMsg( 1, "css info: received Session Key" ); intf_WarnMsg( 1, "css info: received Session Key" );
if( css.i_agid < 0 ) if( p_css->i_agid < 0 )
{ {
css.b_error = 1; free( p_css );
return css; return NULL;
} }
/* Test authentication success */ /* Test authentication success */
switch( CSSGetASF( i_fd ) ) switch( CSSGetASF( i_fd ) )
{ {
case -1: case -1:
css.b_error = 1; free( p_css );
return NULL;
case 1: case 1:
return css; return p_css;
case 0: case 0:
intf_WarnMsg( 3, "css info: getting disc key" ); intf_WarnMsg( 3, "css info: getting disc key" );
} }
/* Get encrypted disc key */ /* Get encrypted disc key */
dvd.type = DVD_STRUCT_DISCKEY; dvd.type = DVD_STRUCT_DISCKEY;
dvd.disckey.agid = css.i_agid; dvd.disckey.agid = p_css->i_agid;
memset( dvd.disckey.value, 0, 2048 ); memset( dvd.disckey.value, 0, 2048 );
if( dvd_ioctl( i_fd, DVD_READ_STRUCT, &dvd ) < 0 ) if( dvd_ioctl( i_fd, DVD_READ_STRUCT, &dvd ) < 0 )
{ {
intf_ErrMsg( "css error: could not read Disc Key" ); intf_ErrMsg( "css error: could not read Disc Key" );
css.b_error = 1; free( p_css );
return css; return NULL;
} }
#if 1 #if 1
/* Unencrypt disc key using bus key */ /* Unencrypt disc key using bus key */
for( i = 0 ; i < sizeof(dvd.disckey.value) ; i++ ) for( i = 0 ; i < sizeof(dvd.disckey.value) ; i++ )
{ {
dvd.disckey.value[i] ^= css.disc.pi_key_check[4 - (i % KEY_SIZE)]; dvd.disckey.value[i] ^= p_css->disc.pi_key_check[4 - (i % KEY_SIZE)];
} }
memcpy( css.disc.pi_key_check, dvd.disckey.value, 2048 ); memcpy( p_css->disc.pi_key_check, dvd.disckey.value, 2048 );
#endif #endif
/* Test authentication success */ /* Test authentication success */
switch( CSSGetASF( i_fd ) ) switch( CSSGetASF( i_fd ) )
{ {
case -1: case -1:
case 0: case 0:
css.b_error = 1; free( p_css );
return NULL;
case 1: case 1:
return css; return p_css;
} }
#else /* HAVE_CSS */ #else /* HAVE_CSS */
intf_ErrMsg( "css error: CSS decryption is disabled in this module" ); intf_ErrMsg( "css error: CSS decryption is disabled in this module" );
css.i_fd = i_fd; p_css = NULL;
css.b_error = 1;
#endif /* HAVE_CSS */ #endif /* HAVE_CSS */
return css; return p_css;
}
/*****************************************************************************
* CSSEnd : frees css structure
*****************************************************************************/
void CSSEnd( css_t * p_css )
{
#ifdef HAVE_CSS
free( p_css );
#endif
} }
/***************************************************************************** /*****************************************************************************
...@@ -722,9 +742,6 @@ static void CSSCryptKey( int i_key_type, int i_varient, ...@@ -722,9 +742,6 @@ static void CSSCryptKey( int i_key_type, int i_varient,
i_lfsr1_o = ( ( i_lfsr1 >> 16 ) ^ ( i_lfsr1 >> 2 ) ) & 1; i_lfsr1_o = ( ( i_lfsr1 >> 16 ) ^ ( i_lfsr1 >> 2 ) ) & 1;
i_lfsr1 = ( i_lfsr1 << 1 ) | i_lfsr1_o; i_lfsr1 = ( i_lfsr1 << 1 ) | i_lfsr1_o;
#define BIT0(x) ((x) & 1)
#define BIT1(x) (((x) >> 1) & 1)
i_combined = !i_lfsr1_o + i_carry + !i_lfsr0_o; i_combined = !i_lfsr1_o + i_carry + !i_lfsr0_o;
/* taking bit 1 */ /* taking bit 1 */
i_carry = ( i_combined >> 1 ) & 1; i_carry = ( i_combined >> 1 ) & 1;
......
plugins/dvd/dvd_css.h
View file @ dc0df7c2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_css.h: Structures for DVD authentification and unscrambling * dvd_css.h: Structures for DVD authentification and unscrambling
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_css.h,v 1.4 2001/02/20 02:53:13 stef Exp $ * $Id: dvd_css.h,v 1.5 2001/03/03 07:07:01 stef Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -48,7 +48,6 @@ typedef struct title_key_s ...@@ -48,7 +48,6 @@ typedef struct title_key_s
typedef struct css_s typedef struct css_s
{ {
int i_fd; int i_fd;
boolean_t b_error;
int i_agid; int i_agid;
disc_t disc; disc_t disc;
u8 pi_disc_key[2048]; u8 pi_disc_key[2048];
......
plugins/dvd/dvd_netlist.c
View file @ dc0df7c2
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* will only be given back to netlist when refcount is zero. * will only be given back to netlist when refcount is zero.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: dvd_netlist.c,v 1.1 2001/03/02 03:32:46 stef Exp $ * $Id: dvd_netlist.c,v 1.2 2001/03/03 07:07:01 stef Exp $
* *
* Authors: Henri Fallon <henri@videolan.org> * Authors: Henri Fallon <henri@videolan.org>
* Stphane Borel <stef@videolan.org> * Stphane Borel <stef@videolan.org>
...@@ -64,23 +64,21 @@ ...@@ -64,23 +64,21 @@
* *
* Warning: i_nb_iovec, i_nb_data, i_nb_pes have to be 2^x * Warning: i_nb_iovec, i_nb_data, i_nb_pes have to be 2^x
*****************************************************************************/ *****************************************************************************/
int DVDNetlistInit( input_thread_t * p_input, dvd_netlist_t * DVDNetlistInit( int i_nb_iovec, int i_nb_data, int i_nb_pes,
int i_nb_iovec, int i_nb_data, int i_nb_pes,
size_t i_buffer_size, int i_read_once ) size_t i_buffer_size, int i_read_once )
{ {
unsigned int i_loop; unsigned int i_loop;
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
/* First we allocate and initialise our netlist struct */ /* First we allocate and initialise our netlist struct */
p_input->p_method_data = malloc(sizeof(netlist_t)); p_netlist = malloc( sizeof(dvd_netlist_t) );
if ( p_input->p_method_data == NULL ) if ( p_netlist == NULL )
{ {
intf_ErrMsg("Unable to malloc the DVD netlist struct"); intf_ErrMsg("Unable to malloc the DVD netlist struct");
return (-1); free( p_netlist );
return NULL;
} }
p_netlist = (netlist_t *) p_input->p_method_data;
/* Nb of packets read once by input */ /* Nb of packets read once by input */
p_netlist->i_read_once = i_read_once; p_netlist->i_read_once = i_read_once;
...@@ -89,7 +87,9 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -89,7 +87,9 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->p_buffers == NULL ) if ( p_netlist->p_buffers == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (1)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (1)");
return (-1); free( p_netlist->p_buffers );
free( p_netlist );
return NULL;
} }
/* table of pointers to data packets */ /* table of pointers to data packets */
...@@ -97,7 +97,10 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -97,7 +97,10 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->p_data == NULL ) if ( p_netlist->p_data == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (2)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (2)");
return (-1); free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist );
return NULL;
} }
/* table of pointer to PES packets */ /* table of pointer to PES packets */
...@@ -105,7 +108,11 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -105,7 +108,11 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->p_pes == NULL ) if ( p_netlist->p_pes == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (3)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (3)");
return (-1); free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist->p_pes );
free( p_netlist );
return NULL;
} }
/* allocate the FIFOs : tables of free pointers */ /* allocate the FIFOs : tables of free pointers */
...@@ -114,12 +121,25 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -114,12 +121,25 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->pp_free_data == NULL ) if ( p_netlist->pp_free_data == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (4)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (4)");
free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist->p_pes );
free( p_netlist->pp_free_data );
free( p_netlist );
return NULL;
} }
p_netlist->pp_free_pes = p_netlist->pp_free_pes =
malloc( i_nb_pes *sizeof(pes_packet_t *) ); malloc( i_nb_pes *sizeof(pes_packet_t *) );
if ( p_netlist->pp_free_pes == NULL ) if ( p_netlist->pp_free_pes == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (5)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (5)");
free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist->p_pes );
free( p_netlist->pp_free_data );
free( p_netlist->pp_free_pes );
free( p_netlist );
return NULL;
} }
p_netlist->p_free_iovec = p_netlist->p_free_iovec =
...@@ -127,6 +147,14 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -127,6 +147,14 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->p_free_iovec == NULL ) if ( p_netlist->p_free_iovec == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (6)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (6)");
free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist->p_pes );
free( p_netlist->pp_free_data );
free( p_netlist->pp_free_pes );
free( p_netlist->p_free_iovec );
free( p_netlist );
return NULL;
} }
/* table for reference counter of iovecs */ /* table for reference counter of iovecs */
...@@ -134,7 +162,15 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -134,7 +162,15 @@ int DVDNetlistInit( input_thread_t * p_input,
if ( p_netlist->pi_refcount == NULL ) if ( p_netlist->pi_refcount == NULL )
{ {
intf_ErrMsg ("Unable to malloc in DVD netlist initialization (7)"); intf_ErrMsg ("Unable to malloc in DVD netlist initialization (7)");
return (-1); free( p_netlist->p_buffers );
free( p_netlist->p_data );
free( p_netlist->p_pes );
free( p_netlist->pp_free_data );
free( p_netlist->pp_free_pes );
free( p_netlist->p_free_iovec );
free( p_netlist->pi_refcount );
free( p_netlist );
return NULL;
} }
/* Fill the data FIFO */ /* Fill the data FIFO */
...@@ -183,7 +219,7 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -183,7 +219,7 @@ int DVDNetlistInit( input_thread_t * p_input,
p_netlist->i_nb_pes = i_nb_pes - 1; p_netlist->i_nb_pes = i_nb_pes - 1;
p_netlist->i_buffer_size = i_buffer_size; p_netlist->i_buffer_size = i_buffer_size;
return (0); /* Everything went all right */ return p_netlist; /* Everything went all right */
} }
/***************************************************************************** /*****************************************************************************
...@@ -195,10 +231,10 @@ int DVDNetlistInit( input_thread_t * p_input, ...@@ -195,10 +231,10 @@ int DVDNetlistInit( input_thread_t * p_input,
*****************************************************************************/ *****************************************************************************/
struct iovec * DVDGetiovec( void * p_method_data ) struct iovec * DVDGetiovec( void * p_method_data )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
/* cast */ /* cast */
p_netlist = ( netlist_t * ) p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
/* check */ /* check */
if( ( if( (
...@@ -236,11 +272,11 @@ struct iovec * DVDGetiovec( void * p_method_data ) ...@@ -236,11 +272,11 @@ struct iovec * DVDGetiovec( void * p_method_data )
void DVDMviovec( void * p_method_data, int i_nb_iovec, void DVDMviovec( void * p_method_data, int i_nb_iovec,
struct data_packet_s ** pp_data ) struct data_packet_s ** pp_data )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
unsigned int i_loop = 0; unsigned int i_loop = 0;
/* cast */ /* cast */
p_netlist = (netlist_t *)p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
/* lock */ /* lock */
vlc_mutex_lock( &p_netlist->lock ); vlc_mutex_lock( &p_netlist->lock );
...@@ -275,11 +311,11 @@ void DVDMviovec( void * p_method_data, int i_nb_iovec, ...@@ -275,11 +311,11 @@ void DVDMviovec( void * p_method_data, int i_nb_iovec,
*****************************************************************************/ *****************************************************************************/
struct data_packet_s * DVDNewPtr( void * p_method_data ) struct data_packet_s * DVDNewPtr( void * p_method_data )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
struct data_packet_s * p_return; struct data_packet_s * p_return;
/* cast */ /* cast */
p_netlist = ( netlist_t * ) p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
#ifdef DEBUG #ifdef DEBUG
if( i_buffer_size > p_netlist->i_buffer_size ) if( i_buffer_size > p_netlist->i_buffer_size )
...@@ -318,11 +354,11 @@ struct data_packet_s * DVDNewPtr( void * p_method_data ) ...@@ -318,11 +354,11 @@ struct data_packet_s * DVDNewPtr( void * p_method_data )
struct data_packet_s * DVDNewPacket( void * p_method_data, struct data_packet_s * DVDNewPacket( void * p_method_data,
size_t i_buffer_size ) size_t i_buffer_size )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
struct data_packet_s * p_packet; struct data_packet_s * p_packet;
/* cast */ /* cast */
p_netlist = (netlist_t *)p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
/* lock */ /* lock */
vlc_mutex_lock( &p_netlist->lock ); vlc_mutex_lock( &p_netlist->lock );
...@@ -371,11 +407,11 @@ struct data_packet_s * DVDNewPacket( void * p_method_data, ...@@ -371,11 +407,11 @@ struct data_packet_s * DVDNewPacket( void * p_method_data,
*****************************************************************************/ *****************************************************************************/
struct pes_packet_s * DVDNewPES( void * p_method_data ) struct pes_packet_s * DVDNewPES( void * p_method_data )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
pes_packet_t * p_return; pes_packet_t * p_return;
/* cast */ /* cast */
p_netlist = (netlist_t *) p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
/* lock */ /* lock */
vlc_mutex_lock ( &p_netlist->lock ); vlc_mutex_lock ( &p_netlist->lock );
...@@ -410,10 +446,10 @@ struct pes_packet_s * DVDNewPES( void * p_method_data ) ...@@ -410,10 +446,10 @@ struct pes_packet_s * DVDNewPES( void * p_method_data )
*****************************************************************************/ *****************************************************************************/
void DVDDeletePacket( void * p_method_data, data_packet_t * p_data ) void DVDDeletePacket( void * p_method_data, data_packet_t * p_data )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
/* cast */ /* cast */
p_netlist = (netlist_t *) p_method_data; p_netlist = (dvd_netlist_t *) p_method_data;
/* lock */ /* lock */
vlc_mutex_lock ( &p_netlist->lock ); vlc_mutex_lock ( &p_netlist->lock );
...@@ -450,11 +486,12 @@ void DVDDeletePacket( void * p_method_data, data_packet_t * p_data ) ...@@ -450,11 +486,12 @@ void DVDDeletePacket( void * p_method_data, data_packet_t * p_data )
*****************************************************************************/ *****************************************************************************/
void DVDDeletePES( void * p_method_data, pes_packet_t * p_pes ) void DVDDeletePES( void * p_method_data, pes_packet_t * p_pes )
{ {
netlist_t * p_netlist; dvd_netlist_t * p_netlist;
data_packet_t * p_current_packet,* p_next_packet; data_packet_t * p_current_packet;
data_packet_t * p_next_packet;
/* cast */ /* cast */
p_netlist = (netlist_t *)p_method_data; p_netlist = (dvd_netlist_t *)p_method_data;
/* lock */ /* lock */
vlc_mutex_lock ( &p_netlist->lock ); vlc_mutex_lock ( &p_netlist->lock );
...@@ -502,24 +539,19 @@ void DVDDeletePES( void * p_method_data, pes_packet_t * p_pes ) ...@@ -502,24 +539,19 @@ void DVDDeletePES( void * p_method_data, pes_packet_t * p_pes )
/***************************************************************************** /*****************************************************************************
* DVDNetlistEnd: frees all allocated structures * DVDNetlistEnd: frees all allocated structures
*****************************************************************************/ *****************************************************************************/
void DVDNetlistEnd( input_thread_t * p_input) void DVDNetlistEnd( dvd_netlist_t * p_netlist )
{ {
netlist_t * p_netlist;
/* cast */
p_netlist = ( netlist_t * ) p_input->p_method_data;
/* destroy the mutex lock */ /* destroy the mutex lock */
vlc_mutex_destroy (&p_netlist->lock); vlc_mutex_destroy( &p_netlist->lock );
/* free the FIFO, the buffer, and the netlist structure */ /* free the FIFO, the buffer, and the netlist structure */
free (p_netlist->pp_free_data); free( p_netlist->pp_free_data );
free (p_netlist->pp_free_pes); free( p_netlist->pp_free_pes );
free (p_netlist->pi_refcount); free( p_netlist->pi_refcount );
free (p_netlist->p_pes); free( p_netlist->p_pes );
free (p_netlist->p_data); free( p_netlist->p_data );
free (p_netlist->p_buffers); free( p_netlist->p_buffers );
/* free the netlist */ /* free the netlist */
free (p_netlist); free( p_netlist );
} }
plugins/dvd/dvd_netlist.h
View file @ dc0df7c2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_netlist.h: Specific netlist structures for DVD packets * dvd_netlist.h: Specific netlist structures for DVD packets
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: dvd_netlist.h,v 1.1 2001/03/02 03:32:46 stef Exp $ * $Id: dvd_netlist.h,v 1.2 2001/03/03 07:07:01 stef Exp $
* *
* Authors: Henri Fallon <henri@videolan.org> * Authors: Henri Fallon <henri@videolan.org>
* Stphane Borel <stef@videolan.org> * Stphane Borel <stef@videolan.org>
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
/***************************************************************************** /*****************************************************************************
* netlist_t: structure to manage a netlist * netlist_t: structure to manage a netlist
*****************************************************************************/ *****************************************************************************/
typedef struct netlist_s typedef struct dvd_netlist_s
{ {
vlc_mutex_t lock; vlc_mutex_t lock;
...@@ -57,14 +57,12 @@ typedef struct netlist_s ...@@ -57,14 +57,12 @@ typedef struct netlist_s
/* Nb of packets read once */ /* Nb of packets read once */
unsigned int i_read_once; unsigned int i_read_once;
} netlist_t; } dvd_netlist_t;
/***************************************************************************** /*****************************************************************************
* Prototypes * Prototypes
*****************************************************************************/ *****************************************************************************/
int DVDNetlistInit( struct input_thread_s *, struct dvd_netlist_s * DVDNetlistInit( int , int, int, size_t, int );
int , int, int, size_t, int );
struct iovec * DVDGetiovec( void * p_method_data ); struct iovec * DVDGetiovec( void * p_method_data );
void DVDMviovec( void * , int, struct data_packet_s **); void DVDMviovec( void * , int, struct data_packet_s **);
struct data_packet_s * DVDNewPtr( void * ); struct data_packet_s * DVDNewPtr( void * );
...@@ -72,4 +70,4 @@ struct data_packet_s * DVDNewPacket( void *, size_t ); ...@@ -72,4 +70,4 @@ struct data_packet_s * DVDNewPacket( void *, size_t );
struct pes_packet_s * DVDNewPES( void * ); struct pes_packet_s * DVDNewPES( void * );
void DVDDeletePacket( void *, struct data_packet_s * ); void DVDDeletePacket( void *, struct data_packet_s * );
void DVDDeletePES( void *, struct pes_packet_s * ); void DVDDeletePES( void *, struct pes_packet_s * );
void DVDNetlistEnd( struct input_thread_s * ); void DVDNetlistEnd( struct dvd_netlist_s * );
plugins/dvd/input_dvd.c
View file @ dc0df7c2
This diff is collapsed.
plugins/dvd/input_dvd.h
View file @ dc0df7c2
...@@ -37,12 +37,17 @@ typedef struct thread_dvd_data_s ...@@ -37,12 +37,17 @@ typedef struct thread_dvd_data_s
int i_block_once; // Nb of block read once by int i_block_once; // Nb of block read once by
// readv // readv
/* Navigation information */
int i_title;
int i_vts_title;
int i_chapter_nb; int i_chapter_nb;
off_t i_start; off_t i_start;
off_t i_size; off_t i_size;
int i_end_cell;
/* Scrambling Information */ /* Scrambling Information */
struct css_s css; struct css_s * p_css;
/* Structure that contains all information of the DVD */ /* Structure that contains all information of the DVD */
struct ifo_s ifo; struct ifo_s ifo;
...@@ -52,16 +57,17 @@ typedef struct thread_dvd_data_s ...@@ -52,16 +57,17 @@ typedef struct thread_dvd_data_s
/***************************************************************************** /*****************************************************************************
* Prototypes in dvd_ifo.c * Prototypes in dvd_ifo.c
*****************************************************************************/ *****************************************************************************/
struct ifo_s IfoInit( int ); struct ifo_s IfoInit ( int );
int IfoReadVTS( struct ifo_s * ); int IfoReadVTS ( struct ifo_s * );
void IfoRead( struct ifo_s * ); void IfoRead ( struct ifo_s * );
void IfoEnd( ifo_t * ); void IfoEnd ( ifo_t * );
/***************************************************************************** /*****************************************************************************
* Prototypes in dvd_css.c * Prototypes in dvd_css.c
*****************************************************************************/ *****************************************************************************/
int CSSTest ( int ); int CSSTest ( int );
struct css_s CSSInit ( int ); struct css_s * CSSInit ( int );
void CSSEnd ( struct css_s * );
int CSSGetKey ( struct css_s * ); int CSSGetKey ( struct css_s * );
int CSSDescrambleSector( u8 * , u8 * ); int CSSDescrambleSector ( u8 * , u8 * );
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