From d0d245e84c31767cca7584cdbbf7624139d527b4 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 15 Aug 2007 11:57:30 +0000 Subject: Sync libdvdread with version 0.9.5 (cosmetic changes). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24070 b3059339-0415-0410-9bf9-f77b7e298cf2 --- dvdread/bswap.h | 35 +- dvdread/dvd_input.c | 41 +- dvdread/dvd_input.h | 1 + dvdread/dvd_reader.c | 1302 ++++++++++++++++++++++---------------------- dvdread/dvd_reader.h | 15 +- dvdread/dvd_udf.c | 767 +++++++++++++------------- dvdread/dvd_udf.h | 7 +- dvdread/dvdread_internal.h | 1 + dvdread/ifo_print.c | 217 ++++---- dvdread/ifo_print.h | 1 + dvdread/ifo_read.c | 185 +++---- dvdread/ifo_read.h | 1 + dvdread/ifo_types.h | 1 + dvdread/md5.c | 93 ++-- dvdread/md5.h | 25 +- dvdread/nav_print.c | 47 +- dvdread/nav_print.h | 1 + dvdread/nav_read.c | 45 +- dvdread/nav_read.h | 1 + dvdread/nav_types.h | 5 +- 20 files changed, 1406 insertions(+), 1385 deletions(-) diff --git a/dvdread/bswap.h b/dvdread/bswap.h index a5296b82cd..15846aed65 100644 --- a/dvdread/bswap.h +++ b/dvdread/bswap.h @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 2; indent-tabs-mode: nil -*- */ #ifndef BSWAP_H_INCLUDED #define BSWAP_H_INCLUDED @@ -126,23 +127,23 @@ inline static unsigned long long int bswap_64(unsigned long long int x) */ #elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__BEOS__) || defined(__INTERIX) || defined(__CYGWIN__) -#define B2N_16(x) \ - x = ((((x) & 0xff00) >> 8) | \ - (((x) & 0x00ff) << 8)) -#define B2N_32(x) \ - x = ((((x) & 0xff000000) >> 24) | \ - (((x) & 0x00ff0000) >> 8) | \ - (((x) & 0x0000ff00) << 8) | \ - (((x) & 0x000000ff) << 24)) -#define B2N_64(x) \ - x = ((((x) & 0xff00000000000000) >> 56) | \ - (((x) & 0x00ff000000000000) >> 40) | \ - (((x) & 0x0000ff0000000000) >> 24) | \ - (((x) & 0x000000ff00000000) >> 8) | \ - (((x) & 0x00000000ff000000) << 8) | \ - (((x) & 0x0000000000ff0000) << 24) | \ - (((x) & 0x000000000000ff00) << 40) | \ - (((x) & 0x00000000000000ff) << 56)) +#define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) +#define B2N_32(x) \ + x = ((((x) & 0xff000000) >> 24) | \ + (((x) & 0x00ff0000) >> 8) | \ + (((x) & 0x0000ff00) << 8) | \ + (((x) & 0x000000ff) << 24)) +#define B2N_64(x) \ + x = ((((x) & 0xff00000000000000) >> 56) | \ + (((x) & 0x00ff000000000000) >> 40) | \ + (((x) & 0x0000ff0000000000) >> 24) | \ + (((x) & 0x000000ff00000000) >> 8) | \ + (((x) & 0x00000000ff000000) << 8) | \ + (((x) & 0x0000000000ff0000) << 24) | \ + (((x) & 0x000000000000ff00) << 40) | \ + (((x) & 0x00000000000000ff) << 56)) #else diff --git a/dvdread/dvd_input.c b/dvdread/dvd_input.c index dcd5307862..fa2406f234 100644 --- a/dvdread/dvd_input.c +++ b/dvdread/dvd_input.c @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 2; indent-tabs-mode: nil -*- */ /* * Copyright (C) 2002 Samuel Hocevar , * Håkan Hjort @@ -212,7 +213,7 @@ static int file_seek(dvd_input_t dev, int blocks) pos = lseek(dev->fd, pos, SEEK_SET); if(pos < 0) { - return pos; + return pos; } /* assert pos % DVD_VIDEO_LB_LEN == 0 */ return (int) (pos / DVD_VIDEO_LB_LEN); @@ -234,7 +235,7 @@ static int file_read(dvd_input_t dev, void *buffer, int blocks, int flags) size_t len; ssize_t ret; unsigned char *buf = buffer; - + len = (size_t)blocks * DVD_VIDEO_LB_LEN; while(len > 0) { @@ -250,7 +251,7 @@ static int file_read(dvd_input_t dev, void *buffer, int blocks, int flags) if(ret == 0) { /* Nothing more to read. Return the whole blocks, if any, that we got. - and adjust the file possition back to the previous block boundary. */ + and adjust the file possition back to the previous block boundary. */ size_t bytes = (size_t)blocks * DVD_VIDEO_LB_LEN - len; off_t over_read = -(bytes % DVD_VIDEO_LB_LEN); /*off_t pos =*/ lseek(dev->fd, over_read, SEEK_CUR); @@ -326,7 +327,7 @@ int dvdinput_setup(void) } verbose = get_verbose(); - + #ifdef HAVE_DVDCSS_DVDCSS_H /* linking to libdvdcss */ dvdcss_library = &dvdcss_library; /* Give it some value != NULL */ @@ -336,7 +337,7 @@ int dvdinput_setup(void) #else dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY); - + if(dvdcss_library != NULL) { #if defined(__OpenBSD__) && !defined(__ELF__) #define U_S "_" @@ -360,37 +361,37 @@ int dvdinput_setup(void) if(dlsym(dvdcss_library, U_S "dvdcss_crack")) { if(verbose >= 0) { - fprintf(stderr, - "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" - "libdvdread: You should get the latest version from " - "http://www.videolan.org/\n" ); + fprintf(stderr, + "libdvdread: Old (pre-0.0.2) version of libdvdcss found.\n" + "libdvdread: You should get the latest version from " + "http://www.videolan.org/\n" ); } dlclose(dvdcss_library); dvdcss_library = NULL; } else if(!DVDcss_open || !DVDcss_close || !DVDcss_title || !DVDcss_seek - || !DVDcss_read || !DVDcss_error || !dvdcss_version) { + || !DVDcss_read || !DVDcss_error || !dvdcss_version) { if(verbose >= 0) { - fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " - "this shouldn't happen !\n"); + fprintf(stderr, "libdvdread: Missing symbols in libdvdcss.so.2, " + "this shouldn't happen !\n"); } dlclose(dvdcss_library); dvdcss_library = NULL; } } #endif /* HAVE_DVDCSS_DVDCSS_H */ - + dvdcss_library_init = 1; if(dvdcss_library) { /* - char *psz_method = getenv( "DVDCSS_METHOD" ); - char *psz_verbose = getenv( "DVDCSS_VERBOSE" ); - fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); - fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); + char *psz_method = getenv( "DVDCSS_METHOD" ); + char *psz_verbose = getenv( "DVDCSS_VERBOSE" ); + fprintf(stderr, "DVDCSS_METHOD %s\n", psz_method); + fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); */ if(verbose >= 1) { - fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", - *dvdcss_version); + fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", + *dvdcss_version); } /* libdvdcss wrapper functions */ dvdinput_open = css_open; @@ -403,7 +404,7 @@ int dvdinput_setup(void) } else { if(verbose >= 1) { - fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"); + fprintf(stderr, "libdvdread: Encrypted DVD support unavailable.\n"); } /* libdvdcss replacement functions */ dvdinput_open = file_open; diff --git a/dvdread/dvd_input.h b/dvdread/dvd_input.h index 0f05c97952..607619e2d0 100644 --- a/dvdread/dvd_input.h +++ b/dvdread/dvd_input.h @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 2; indent-tabs-mode: nil -*- */ #ifndef DVD_INPUT_H_INCLUDED #define DVD_INPUT_H_INCLUDED diff --git a/dvdread/dvd_reader.c b/dvdread/dvd_reader.c index 92d202b8d9..4ba75e9a4e 100644 --- a/dvdread/dvd_reader.c +++ b/dvdread/dvd_reader.c @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 2; indent-tabs-mode: nil -*- */ /* * Copyright (C) 2001, 2002, 2003 Billy Biggs , * Håkan Hjort , @@ -36,7 +37,7 @@ #include #include -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__)|| defined(__DARWIN__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) || defined(__DragonFly__) #define SYS_BSD 1 #endif @@ -70,23 +71,23 @@ static void gettimeofday(struct timeval* t,void* timezone){ #define DEFAULT_UDF_CACHE_LEVEL 0 struct dvd_reader_s { - /* Basic information. */ - int isImageFile; + /* Basic information. */ + int isImageFile; - /* Hack for keeping track of the css status. - * 0: no css, 1: perhaps (need init of keys), 2: have done init */ - int css_state; - int css_title; /* Last title that we have called dvdinpute_title for. */ + /* Hack for keeping track of the css status. + * 0: no css, 1: perhaps (need init of keys), 2: have done init */ + int css_state; + int css_title; /* Last title that we have called dvdinpute_title for. */ - /* Information required for an image file. */ - dvd_input_t dev; + /* Information required for an image file. */ + dvd_input_t dev; - /* Information required for a directory path drive. */ - char *path_root; + /* Information required for a directory path drive. */ + char *path_root; - /* Filesystem cache */ - int udfcache_level; /* 0 - turned off, 1 - on */ - void *udfcache; + /* Filesystem cache */ + int udfcache_level; /* 0 - turned off, 1 - on */ + void *udfcache; /* block aligned malloc */ void *align; @@ -96,22 +97,22 @@ struct dvd_reader_s { }; struct dvd_file_s { - /* Basic information. */ - dvd_reader_t *dvd; + /* Basic information. */ + dvd_reader_t *dvd; - /* Hack for selecting the right css title. */ - int css_title; + /* Hack for selecting the right css title. */ + int css_title; - /* Information required for an image file. */ - uint32_t lb_start; - uint32_t seek_pos; + /* Information required for an image file. */ + uint32_t lb_start; + uint32_t seek_pos; - /* Information required for a directory path drive. */ - size_t title_sizes[ 9 ]; - dvd_input_t title_devs[ 9 ]; + /* Information required for a directory path drive. */ + size_t title_sizes[ 9 ]; + dvd_input_t title_devs[ 9 ]; - /* Calculated at open-time, size in blocks. */ - ssize_t filesize; + /* Calculated at open-time, size in blocks. */ + ssize_t filesize; }; @@ -214,84 +215,84 @@ static int gettimeofday( struct timeval *tv, void *tz ) /* Loop over all titles and call dvdcss_title to crack the keys. */ static int initAllCSSKeys( dvd_reader_t *dvd ) { - struct timeval all_s, all_e; - struct timeval t_s, t_e; - char filename[ MAX_UDF_FILE_NAME_LEN ]; - uint32_t start, len; - int title; - - char *nokeys_str = getenv("DVDREAD_NOKEYS"); - if(nokeys_str != NULL) - return 0; + struct timeval all_s, all_e; + struct timeval t_s, t_e; + char filename[ MAX_UDF_FILE_NAME_LEN ]; + uint32_t start, len; + int title; + + char *nokeys_str = getenv("DVDREAD_NOKEYS"); + if(nokeys_str != NULL) + return 0; if(dvd->verbose >= 1) { fprintf( stderr, "\n" ); fprintf( stderr, "libdvdread: Attempting to retrieve all CSS keys\n" ); fprintf( stderr, "libdvdread: This can take a _long_ time, " - "please be patient\n\n" ); + "please be patient\n\n" ); } - gettimeofday(&all_s, NULL); - - for( title = 0; title < 100; title++ ) { - gettimeofday( &t_s, NULL ); - if( title == 0 ) { - sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" ); - } else { - sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, 0 ); - } - start = UDFFindFile( dvd, filename, &len ); - if( start != 0 && len != 0 ) { - /* Perform CSS key cracking for this title. */ + gettimeofday(&all_s, NULL); + + for( title = 0; title < 100; title++ ) { + gettimeofday( &t_s, NULL ); + if( title == 0 ) { + sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" ); + } else { + sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, 0 ); + } + start = UDFFindFile( dvd, filename, &len ); + if( start != 0 && len != 0 ) { + /* Perform CSS key cracking for this title. */ if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n", - filename, start ); + fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n", + filename, start ); } - if( dvdinput_title( dvd->dev, (int)start ) < 0 ) { + if( dvdinput_title( dvd->dev, (int)start ) < 0 ) { if(dvd->verbose >= 0) { - fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)\n", filename, start); - } + fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)\n", filename, start); + } } - gettimeofday( &t_e, NULL ); + gettimeofday( &t_e, NULL ); if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Elapsed time %ld\n", - (long int) t_e.tv_sec - t_s.tv_sec ); - } + fprintf( stderr, "libdvdread: Elapsed time %ld\n", + (long int) t_e.tv_sec - t_s.tv_sec ); + } } - - if( title == 0 ) continue; - - gettimeofday( &t_s, NULL ); - sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, 1 ); - start = UDFFindFile( dvd, filename, &len ); - if( start == 0 || len == 0 ) break; - - /* Perform CSS key cracking for this title. */ + + if( title == 0 ) continue; + + gettimeofday( &t_s, NULL ); + sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, 1 ); + start = UDFFindFile( dvd, filename, &len ); + if( start == 0 || len == 0 ) break; + + /* Perform CSS key cracking for this title. */ if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n", - filename, start ); + fprintf( stderr, "libdvdread: Get key for %s at 0x%08x\n", + filename, start ); } - if( dvdinput_title( dvd->dev, (int)start ) < 0 ) { + if( dvdinput_title( dvd->dev, (int)start ) < 0 ) { if(dvd->verbose >= 0) { - fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)!!\n", filename, start); - } + fprintf( stderr, "libdvdread: Error cracking CSS key for %s (0x%08x)!!\n", filename, start); + } } - gettimeofday( &t_e, NULL ); + gettimeofday( &t_e, NULL ); if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Elapsed time %ld\n", - (long int) t_e.tv_sec - t_s.tv_sec ); + fprintf( stderr, "libdvdread: Elapsed time %ld\n", + (long int) t_e.tv_sec - t_s.tv_sec ); } } - title--; + title--; if(dvd->verbose >= 1) { fprintf( stderr, "libdvdread: Found %d VTS's\n", title ); } - gettimeofday(&all_e, NULL); + gettimeofday(&all_e, NULL); if(dvd->verbose >= 1) { fprintf( stderr, "libdvdread: Elapsed time %ld\n", - (long int) all_e.tv_sec - all_s.tv_sec ); + (long int) all_e.tv_sec - all_s.tv_sec ); } - return 0; + return 0; } @@ -303,22 +304,22 @@ static int initAllCSSKeys( dvd_reader_t *dvd ) */ static dvd_reader_t *DVDOpenImageFile( const char *location, int have_css ) { - dvd_reader_t *dvd; - dvd_input_t dev; + dvd_reader_t *dvd; + dvd_input_t dev; int verbose; verbose = get_verbose(); - - dev = dvdinput_open( location ); - if( !dev ) { + + dev = dvdinput_open( location ); + if( !dev ) { if(verbose >= 1) { fprintf( stderr, "libdvdread: Can't open '%s' for reading: %s\n", location, strerror(errno)); } return NULL; - } + } - dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); + dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); if( !dvd ) { int tmp_errno = errno; dvdinput_close(dev); @@ -326,24 +327,24 @@ static dvd_reader_t *DVDOpenImageFile( const char *location, int have_css ) return NULL; } dvd->verbose = verbose; - dvd->isImageFile = 1; - dvd->dev = dev; + dvd->isImageFile = 1; + dvd->dev = dev; dvd->path_root = NULL; - dvd->udfcache_level = DEFAULT_UDF_CACHE_LEVEL; - dvd->udfcache = NULL; + dvd->udfcache_level = DEFAULT_UDF_CACHE_LEVEL; + dvd->udfcache = NULL; dvd->align = NULL; - if( have_css ) { - /* Only if DVDCSS_METHOD = title, a bit if it's disc or if - * DVDCSS_METHOD = key but region missmatch. Unfortunaly we - * don't have that information. */ - - dvd->css_state = 1; /* Need key init. */ - } - dvd->css_title = 0; + if( have_css ) { + /* Only if DVDCSS_METHOD = title, a bit if it's disc or if + * DVDCSS_METHOD = key but region missmatch. Unfortunaly we + * don't have that information. */ + dvd->css_state = 1; /* Need key init. */ + } + dvd->css_title = 0; + /* sanity check, is it a valid UDF image, can we find the root dir */ if(!UDFFindFile(dvd, "/", NULL)) { dvdinput_close(dvd->dev); @@ -358,34 +359,34 @@ static dvd_reader_t *DVDOpenImageFile( const char *location, int have_css ) free(dvd); return NULL; } - return dvd; + return dvd; } static dvd_reader_t *DVDOpenPath( const char *path_root ) { - dvd_reader_t *dvd; + dvd_reader_t *dvd; - dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); + dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); if( !dvd ) { return NULL; } dvd->verbose = get_verbose(); - dvd->isImageFile = 0; - dvd->dev = 0; - dvd->path_root = strdup( path_root ); + dvd->isImageFile = 0; + dvd->dev = 0; + dvd->path_root = strdup( path_root ); if(!dvd->path_root) { free(dvd); return 0; } - dvd->udfcache_level = DEFAULT_UDF_CACHE_LEVEL; - dvd->udfcache = NULL; - + dvd->udfcache_level = DEFAULT_UDF_CACHE_LEVEL; + dvd->udfcache = NULL; + dvd->align = NULL; - dvd->css_state = 0; /* Only used in the UDF path */ - dvd->css_title = 0; /* Only matters in the UDF path */ + dvd->css_state = 0; /* Only used in the UDF path */ + dvd->css_title = 0; /* Only matters in the UDF path */ - return dvd; + return dvd; } #if defined(__sun) @@ -394,19 +395,19 @@ static dvd_reader_t *DVDOpenPath( const char *path_root ) /vol/rdsk/ */ static char *sun_block2char( const char *path ) { - char *new_path; + char *new_path; - /* Must contain "/dsk/" */ - if( !strstr( path, "/dsk/" ) ) return (char *) strdup( path ); + /* Must contain "/dsk/" */ + if( !strstr( path, "/dsk/" ) ) return (char *) strdup( path ); - /* Replace "/dsk/" with "/rdsk/" */ - new_path = malloc( strlen(path) + 2 ); - strcpy( new_path, path ); - strcpy( strstr( new_path, "/dsk/" ), "" ); - strcat( new_path, "/rdsk/" ); - strcat( new_path, strstr( path, "/dsk/" ) + strlen( "/dsk/" ) ); + /* Replace "/dsk/" with "/rdsk/" */ + new_path = malloc( strlen(path) + 2 ); + strcpy( new_path, path ); + strcpy( strstr( new_path, "/dsk/" ), "" ); + strcat( new_path, "/rdsk/" ); + strcat( new_path, strstr( path, "/dsk/" ) + strlen( "/dsk/" ) ); - return new_path; + return new_path; } #endif @@ -423,26 +424,27 @@ static char *bsd_block2char( const char *path ) } #else { - char *new_path; + char *new_path; - /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ - if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) - return (char *) strdup( path ); + /* If it doesn't start with "/dev/" or does start with "/dev/r" exit */ + if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) + return (char *) strdup( path ); - /* Replace "/dev/" with "/dev/r" */ - new_path = malloc( strlen(path) + 2 ); - strcpy( new_path, "/dev/r" ); - strcat( new_path, path + strlen( "/dev/" ) ); + /* Replace "/dev/" with "/dev/r" */ + new_path = malloc( strlen(path) + 2 ); + strcpy( new_path, "/dev/r" ); + strcat( new_path, path + strlen( "/dev/" ) ); - return new_path; + return new_path; } #endif /* __FreeBSD__ */ #endif + dvd_reader_t *DVDOpen( const char *path ) { - struct stat fileinfo; - int ret, have_css; + struct stat fileinfo; + int ret, have_css; char *dev_name = NULL; int internal_errno = 0; int verbose; @@ -455,65 +457,65 @@ dvd_reader_t *DVDOpen( const char *path ) verbose = get_verbose(); #ifdef WIN32 - /* Stat doesn't work on devices under mingwin/cygwin. */ - if( path[0] && path[1] == ':' && path[2] == '\0' ) + /* Stat doesn't work on devices under mingwin/cygwin. */ + if( path[0] && path[1] == ':' && path[2] == '\0' ) { - /* Don't try to stat the file */ - fileinfo.st_mode = S_IFBLK; + /* Don't try to stat the file */ + fileinfo.st_mode = S_IFBLK; } - else + else #endif { - ret = stat( path, &fileinfo ); - if( ret < 0 ) { + ret = stat( path, &fileinfo ); + if( ret < 0 ) { int tmp_errno = errno; - /* If we can't stat the file, give up */ + /* If we can't stat the file, give up */ if(verbose >= 1) { fprintf( stderr, "libdvdread: Can't stat '%s': %s\n", path, strerror(errno)); } errno = tmp_errno; return NULL; - } + } } - /* Try to open libdvdcss or fall back to standard functions */ - have_css = dvdinput_setup(); + /* Try to open libdvdcss or fall back to standard functions */ + have_css = dvdinput_setup(); - /* First check if this is a block/char device or a file*/ - if( S_ISBLK( fileinfo.st_mode ) || - S_ISCHR( fileinfo.st_mode ) || - S_ISREG( fileinfo.st_mode ) ) { + /* First check if this is a block/char device or a file*/ + if( S_ISBLK( fileinfo.st_mode ) || + S_ISCHR( fileinfo.st_mode ) || + S_ISREG( fileinfo.st_mode ) ) { - /** - * Block devices and regular files are assumed to be DVD-Video images. - */ + /** + * Block devices and regular files are assumed to be DVD-Video images. + */ #if defined(__sun) - return DVDOpenImageFile( sun_block2char( path ), have_css ); + return DVDOpenImageFile( sun_block2char( path ), have_css ); #elif defined(SYS_BSD) - return DVDOpenImageFile( bsd_block2char( path ), have_css ); + return DVDOpenImageFile( bsd_block2char( path ), have_css ); #else - return DVDOpenImageFile( path, have_css ); + return DVDOpenImageFile( path, have_css ); #endif - } else if( S_ISDIR( fileinfo.st_mode ) ) { - dvd_reader_t *auth_drive = 0; - char *path_copy; + } else if( S_ISDIR( fileinfo.st_mode ) ) { + dvd_reader_t *auth_drive = 0; + char *path_copy; #if defined(SYS_BSD) - struct fstab* fe; + struct fstab* fe; #elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__) - FILE *mntfile; + FILE *mntfile; #endif - /* XXX: We should scream real loud here. */ - if( !(path_copy = strdup( path ) ) ) return 0; + /* XXX: We should scream real loud here. */ + if( !(path_copy = strdup( path ) ) ) return 0; #ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */ - /* Resolve any symlinks and get the absolut dir name. */ - { - char *new_path; + /* Resolve any symlinks and get the absolut dir name. */ + { + char *new_path; char *current_path; - + current_path = malloc(PATH_MAX); if(current_path) { if(!getcwd(current_path, PATH_MAX)) { @@ -522,7 +524,7 @@ dvd_reader_t *DVDOpen( const char *path ) } } if(current_path) { - chdir( path_copy ); + chdir( path_copy ); new_path = malloc(PATH_MAX); if(new_path) { if(!getcwd(new_path, PATH_MAX )) { @@ -533,147 +535,147 @@ dvd_reader_t *DVDOpen( const char *path ) chdir(current_path); free(current_path); - if( new_path ) { - free( path_copy ); - path_copy = new_path; - } - } - } + if( new_path ) { + free( path_copy ); + path_copy = new_path; + } + } + } #endif - - /** - * If we're being asked to open a directory, check if that directory - * is the mountpoint for a DVD-ROM which we can use instead. - */ + + /** + * If we're being asked to open a directory, check if that directory + * is the mountpoint for a DVD-ROM which we can use instead. + */ - if( strlen( path_copy ) > 1 ) { + if( strlen( path_copy ) > 1 ) { if( path_copy[ strlen( path_copy ) - 1 ] == '/' ) { - path_copy[ strlen( path_copy ) - 1 ] = '\0'; - } + path_copy[ strlen( path_copy ) - 1 ] = '\0'; + } } if( strlen( path_copy ) >= 9 ) { - if( !strcasecmp( &(path_copy[ strlen( path_copy ) - 9 ]), - "/video_ts" ) ) { - path_copy[ strlen( path_copy ) - 9 ] = '\0'; + if( !strcasecmp( &(path_copy[ strlen( path_copy ) - 9 ]), + "/video_ts" ) ) { + path_copy[ strlen( path_copy ) - 9 ] = '\0'; if(path_copy[0] == '\0') { path_copy[0] = '/'; path_copy[1] = '\0'; } - } - } + } + } #if defined(SYS_BSD) - if( ( fe = getfsfile( path_copy ) ) ) { - dev_name = bsd_block2char( fe->fs_spec ); + if( ( fe = getfsfile( path_copy ) ) ) { + dev_name = bsd_block2char( fe->fs_spec ); if(verbose >= 1) { - fprintf( stderr, - "libdvdread: Attempting to use device %s" + fprintf( stderr, + "libdvdread: Attempting to use device %s" " mounted on %s%s\n", - dev_name, + dev_name, fe->fs_file, have_css ? " for CSS authentication" : ""); } - auth_drive = DVDOpenImageFile( dev_name, have_css ); + auth_drive = DVDOpenImageFile( dev_name, have_css ); if(!auth_drive) { internal_errno = errno; } - } + } #elif defined(__sun) - mntfile = fopen( MNTTAB, "r" ); - if( mntfile ) { - struct mnttab mp; - int res; - - while( ( res = getmntent( mntfile, &mp ) ) != -1 ) { - if( res == 0 && !strcmp( mp.mnt_mountp, path_copy ) ) { - dev_name = sun_block2char( mp.mnt_special ); + mntfile = fopen( MNTTAB, "r" ); + if( mntfile ) { + struct mnttab mp; + int res; + + while( ( res = getmntent( mntfile, &mp ) ) != -1 ) { + if( res == 0 && !strcmp( mp.mnt_mountp, path_copy ) ) { + dev_name = sun_block2char( mp.mnt_special ); if(verbose >= 1) { - fprintf( stderr, - "libdvdread: Attempting to use device %s" + fprintf( stderr, + "libdvdread: Attempting to use device %s" " mounted on %s%s\n", - dev_name, + dev_name, mp.mnt_mountp, have_css ? " for CSS authentication" : ""); } - auth_drive = DVDOpenImageFile( dev_name, have_css ); + auth_drive = DVDOpenImageFile( dev_name, have_css ); if(!auth_drive) { internal_errno = errno; } - break; - } - } - fclose( mntfile ); - } + break; + } + } + fclose( mntfile ); + } #elif defined(__linux__) || defined(__CYGWIN__) - mntfile = fopen( MOUNTED, "r" ); - if( mntfile ) { - struct mntent *me; + mntfile = fopen( MOUNTED, "r" ); + if( mntfile ) { + struct mntent *me; - while( ( me = getmntent( mntfile ) ) ) { - if( !strcmp( me->mnt_dir, path_copy ) ) { + while( ( me = getmntent( mntfile ) ) ) { + if( !strcmp( me->mnt_dir, path_copy ) ) { if(verbose >= 1) { - fprintf( stderr, - "libdvdread: Attempting to use device %s" + fprintf( stderr, + "libdvdread: Attempting to use device %s" " mounted on %s%s\n", - me->mnt_fsname, + me->mnt_fsname, me->mnt_dir, have_css ? " for CSS authentication" : ""); } - auth_drive = DVDOpenImageFile( me->mnt_fsname, have_css ); + auth_drive = DVDOpenImageFile( me->mnt_fsname, have_css ); if(!auth_drive) { internal_errno = errno; } - dev_name = strdup(me->mnt_fsname); - break; - } - } - fclose( mntfile ); - } -#elif defined(__MINGW32__) - dev_name = strdup(path); - auth_drive = DVDOpenImageFile( path, have_css ); + dev_name = strdup(me->mnt_fsname); + break; + } + } + fclose( mntfile ); + } +#elif defined(__MINGW32__) + dev_name = strdup(path); + auth_drive = DVDOpenImageFile( path, have_css ); #endif - if( !dev_name ) { + if( !dev_name ) { if(verbose >= 1) { - fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); + fprintf( stderr, "libdvdread: Couldn't find device name.\n" ); } - } else if( !auth_drive ) { + } else if( !auth_drive ) { if(verbose >= 1) { fprintf( stderr, "libdvdread: Device %s inaccessible%s: %s\n", dev_name, have_css ? ", CSS authentication not available" : "", strerror(internal_errno)); } - } + } - free( dev_name ); - free( path_copy ); + free( dev_name ); + free( path_copy ); - /** - * If we've opened a drive, just use that. - */ + /** + * If we've opened a drive, just use that. + */ if( auth_drive ) { return auth_drive; } - /** - * Otherwise, we now try to open the directory tree instead. - */ - return DVDOpenPath( path ); - } + /** + * Otherwise, we now try to open the directory tree instead. + */ + return DVDOpenPath( path ); + } - /* If it's none of the above, screw it. */ + /* If it's none of the above, screw it. */ if(verbose >= 1) { fprintf( stderr, "libdvdread: Could not open %s\n", path ); } - return 0; + return 0; } void DVDClose( dvd_reader_t *dvd ) { - if( dvd ) { - if( dvd->dev ) dvdinput_close( dvd->dev ); - if( dvd->path_root ) free( dvd->path_root ); + if( dvd ) { + if( dvd->dev ) dvdinput_close( dvd->dev ); + if( dvd->path_root ) free( dvd->path_root ); if( dvd->udfcache ) FreeUDFCache( dvd, dvd->udfcache ); if(dvd->align) { if(dvd->verbose >= 0) { @@ -681,8 +683,8 @@ void DVDClose( dvd_reader_t *dvd ) } } dvdinput_free(); - free( dvd ); - } + free( dvd ); + } } void DVDInit(void) @@ -700,22 +702,22 @@ void DVDFinish(void) */ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, char *filename ) { - uint32_t start, len; - dvd_file_t *dvd_file; - - start = UDFFindFile( dvd, filename, &len ); - if( !start ) return 0; - - dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; - dvd_file->dvd = dvd; - dvd_file->lb_start = start; - dvd_file->seek_pos = 0; - memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); - memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); - dvd_file->filesize = len / DVD_VIDEO_LB_LEN; - - return dvd_file; + uint32_t start, len; + dvd_file_t *dvd_file; + + start = UDFFindFile( dvd, filename, &len ); + if( !start ) return 0; + + dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); + if( !dvd_file ) return 0; + dvd_file->dvd = dvd; + dvd_file->lb_start = start; + dvd_file->seek_pos = 0; + memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); + memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); + dvd_file->filesize = len / DVD_VIDEO_LB_LEN; + + return dvd_file; } /** @@ -726,54 +728,54 @@ static dvd_file_t *DVDOpenFileUDF( dvd_reader_t *dvd, char *filename ) */ static int findDirFile( const char *path, const char *file, char *filename ) { - DIR *dir; - struct dirent *ent; + DIR *dir; + struct dirent *ent; - dir = opendir( path ); - if( !dir ) return -2; + dir = opendir( path ); + if( !dir ) return -2; - while( ( ent = readdir( dir ) ) != NULL ) { - if( !strcasecmp( ent->d_name, file ) ) { - sprintf( filename, "%s%s%s", path, - ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), - ent->d_name ); + while( ( ent = readdir( dir ) ) != NULL ) { + if( !strcasecmp( ent->d_name, file ) ) { + sprintf( filename, "%s%s%s", path, + ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), + ent->d_name ); closedir(dir); - return 0; - } + return 0; } + } closedir(dir); - return -1; + return -1; } static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename ) { - char video_path[ PATH_MAX + 1 ]; - const char *nodirfile; - int ret; + char video_path[ PATH_MAX + 1 ]; + const char *nodirfile; + int ret; - /* Strip off the directory for our search */ - if( !strncasecmp( "/VIDEO_TS/", file, 10 ) ) { - nodirfile = &(file[ 10 ]); - } else { - nodirfile = file; - } + /* Strip off the directory for our search */ + if( !strncasecmp( "/VIDEO_TS/", file, 10 ) ) { + nodirfile = &(file[ 10 ]); + } else { + nodirfile = file; + } - ret = findDirFile( dvd->path_root, nodirfile, filename ); + ret = findDirFile( dvd->path_root, nodirfile, filename ); + if( ret < 0 ) { + /* Try also with adding the path, just in case. */ + sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root ); + ret = findDirFile( video_path, nodirfile, filename ); if( ret < 0 ) { - /* Try also with adding the path, just in case. */ - sprintf( video_path, "%s/VIDEO_TS/", dvd->path_root ); - ret = findDirFile( video_path, nodirfile, filename ); - if( ret < 0 ) { - /* Try with the path, but in lower case. */ - sprintf( video_path, "%s/video_ts/", dvd->path_root ); - ret = findDirFile( video_path, nodirfile, filename ); - if( ret < 0 ) { - return 0; - } - } + /* Try with the path, but in lower case. */ + sprintf( video_path, "%s/video_ts/", dvd->path_root ); + ret = findDirFile( video_path, nodirfile, filename ); + if( ret < 0 ) { + return 0; + } } + } - return 1; + return 1; } /** @@ -781,241 +783,241 @@ static int findDVDFile( dvd_reader_t *dvd, const char *file, char *filename ) */ static dvd_file_t *DVDOpenFilePath( dvd_reader_t *dvd, char *filename ) { - char full_path[ PATH_MAX + 1 ]; - dvd_file_t *dvd_file; - struct stat fileinfo; - dvd_input_t dev; - - /* Get the full path of the file. */ - if( !findDVDFile( dvd, filename, full_path ) ) return 0; - - dev = dvdinput_open( full_path ); - if( !dev ) return 0; - - dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; - dvd_file->dvd = dvd; - dvd_file->lb_start = 0; - dvd_file->seek_pos = 0; - memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); - memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); - dvd_file->filesize = 0; - - if( stat( full_path, &fileinfo ) < 0 ) { + char full_path[ PATH_MAX + 1 ]; + dvd_file_t *dvd_file; + struct stat fileinfo; + dvd_input_t dev; + + /* Get the full path of the file. */ + if( !findDVDFile( dvd, filename, full_path ) ) return 0; + + dev = dvdinput_open( full_path ); + if( !dev ) return 0; + + dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); + if( !dvd_file ) return 0; + dvd_file->dvd = dvd; + dvd_file->lb_start = 0; + dvd_file->seek_pos = 0; + memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); + memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); + dvd_file->filesize = 0; + + if( stat( full_path, &fileinfo ) < 0 ) { if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); - } - free( dvd_file ); - return 0; + fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); } - dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; - dvd_file->title_devs[ 0 ] = dev; - dvd_file->filesize = dvd_file->title_sizes[ 0 ]; + free( dvd_file ); + return 0; + } + dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; + dvd_file->title_devs[ 0 ] = dev; + dvd_file->filesize = dvd_file->title_sizes[ 0 ]; - return dvd_file; + return dvd_file; } static dvd_file_t *DVDOpenVOBUDF( dvd_reader_t *dvd, int title, int menu ) { - char filename[ MAX_UDF_FILE_NAME_LEN ]; - uint32_t start, len; - dvd_file_t *dvd_file; + char filename[ MAX_UDF_FILE_NAME_LEN ]; + uint32_t start, len; + dvd_file_t *dvd_file; - if( title == 0 ) { - sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" ); - } else { - sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); - } - start = UDFFindFile( dvd, filename, &len ); - if( start == 0 ) return 0; - - dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; - dvd_file->dvd = dvd; - /*Hack*/ dvd_file->css_title = title << 1 | menu; - dvd_file->lb_start = start; - dvd_file->seek_pos = 0; - memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); - memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); - dvd_file->filesize = len / DVD_VIDEO_LB_LEN; - - /* Calculate the complete file size for every file in the VOBS */ - if( !menu ) { - int cur; - - for( cur = 2; cur < 10; cur++ ) { - sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur ); - if( !UDFFindFile( dvd, filename, &len ) ) break; - dvd_file->filesize += len / DVD_VIDEO_LB_LEN; - } + if( title == 0 ) { + sprintf( filename, "/VIDEO_TS/VIDEO_TS.VOB" ); + } else { + sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); + } + start = UDFFindFile( dvd, filename, &len ); + if( start == 0 ) return 0; + + dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); + if( !dvd_file ) return 0; + dvd_file->dvd = dvd; + /*Hack*/ dvd_file->css_title = title << 1 | menu; + dvd_file->lb_start = start; + dvd_file->seek_pos = 0; + memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); + memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); + dvd_file->filesize = len / DVD_VIDEO_LB_LEN; + + /* Calculate the complete file size for every file in the VOBS */ + if( !menu ) { + int cur; + + for( cur = 2; cur < 10; cur++ ) { + sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, cur ); + if( !UDFFindFile( dvd, filename, &len ) ) break; + dvd_file->filesize += len / DVD_VIDEO_LB_LEN; } + } - if( dvd->css_state == 1 /* Need key init */ ) { -// initAllCSSKeys( dvd ); -// dvd->css_state = 2; - } - /* - if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) { + if( dvd->css_state == 1 /* Need key init */ ) { +// initAllCSSKeys( dvd ); +// dvd->css_state = 2; + } + /* + if( dvdinput_title( dvd_file->dvd->dev, (int)start ) < 0 ) { fprintf( stderr, "libdvdread: Error cracking CSS key for %s\n", - filename ); - } - */ + filename ); + } + */ - return dvd_file; + return dvd_file; } static dvd_file_t *DVDOpenVOBPath( dvd_reader_t *dvd, int title, int menu ) { - char filename[ MAX_UDF_FILE_NAME_LEN ]; - char full_path[ PATH_MAX + 1 ]; - struct stat fileinfo; - dvd_file_t *dvd_file; - int i; - - dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; - dvd_file->dvd = dvd; - /*Hack*/ dvd_file->css_title = title << 1 | menu; - dvd_file->lb_start = 0; - dvd_file->seek_pos = 0; - memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); - memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); - dvd_file->filesize = 0; + char filename[ MAX_UDF_FILE_NAME_LEN ]; + char full_path[ PATH_MAX + 1 ]; + struct stat fileinfo; + dvd_file_t *dvd_file; + int i; + + dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); + if( !dvd_file ) return 0; + dvd_file->dvd = dvd; + /*Hack*/ dvd_file->css_title = title << 1 | menu; + dvd_file->lb_start = 0; + dvd_file->seek_pos = 0; + memset( dvd_file->title_sizes, 0, sizeof( dvd_file->title_sizes ) ); + memset( dvd_file->title_devs, 0, sizeof( dvd_file->title_devs ) ); + dvd_file->filesize = 0; - if( menu ) { - dvd_input_t dev; + if( menu ) { + dvd_input_t dev; - if( title == 0 ) { - sprintf( filename, "VIDEO_TS.VOB" ); - } else { - sprintf( filename, "VTS_%02i_0.VOB", title ); - } - if( !findDVDFile( dvd, filename, full_path ) ) { - free( dvd_file ); - return 0; - } + if( title == 0 ) { + sprintf( filename, "VIDEO_TS.VOB" ); + } else { + sprintf( filename, "VTS_%02i_0.VOB", title ); + } + if( !findDVDFile( dvd, filename, full_path ) ) { + free( dvd_file ); + return 0; + } - dev = dvdinput_open( full_path ); - if( dev == NULL ) { - free( dvd_file ); - return 0; - } + dev = dvdinput_open( full_path ); + if( dev == NULL ) { + free( dvd_file ); + return 0; + } - if( stat( full_path, &fileinfo ) < 0 ) { + if( stat( full_path, &fileinfo ) < 0 ) { if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); + fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); } - free( dvd_file ); - return 0; - } - dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; - dvd_file->title_devs[ 0 ] = dev; - dvdinput_title( dvd_file->title_devs[0], 0); - dvd_file->filesize = dvd_file->title_sizes[ 0 ]; + free( dvd_file ); + return 0; + } + dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; + dvd_file->title_devs[ 0 ] = dev; + dvdinput_title( dvd_file->title_devs[0], 0); + dvd_file->filesize = dvd_file->title_sizes[ 0 ]; - } else { - for( i = 0; i < 9; ++i ) { + } else { + for( i = 0; i < 9; ++i ) { - sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); - if( !findDVDFile( dvd, filename, full_path ) ) { - break; - } + sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); + if( !findDVDFile( dvd, filename, full_path ) ) { + break; + } - if( stat( full_path, &fileinfo ) < 0 ) { + if( stat( full_path, &fileinfo ) < 0 ) { if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); + fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); } - break; - } + break; + } - dvd_file->title_sizes[ i ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; - dvd_file->title_devs[ i ] = dvdinput_open( full_path ); - dvdinput_title( dvd_file->title_devs[ i ], 0 ); - dvd_file->filesize += dvd_file->title_sizes[ i ]; - } - if( !dvd_file->title_devs[ 0 ] ) { - free( dvd_file ); - return 0; - } + dvd_file->title_sizes[ i ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; + dvd_file->title_devs[ i ] = dvdinput_open( full_path ); + dvdinput_title( dvd_file->title_devs[ i ], 0 ); + dvd_file->filesize += dvd_file->title_sizes[ i ]; + } + if( !dvd_file->title_devs[ 0 ] ) { + free( dvd_file ); + return 0; } + } - return dvd_file; + return dvd_file; } dvd_file_t *DVDOpenFile( dvd_reader_t *dvd, int titlenum, - dvd_read_domain_t domain ) + dvd_read_domain_t domain ) { - char filename[ MAX_UDF_FILE_NAME_LEN ]; + char filename[ MAX_UDF_FILE_NAME_LEN ]; - /* Check arguments. */ + /* Check arguments. */ if( dvd == NULL || titlenum < 0 ) { errno = EINVAL; - return NULL; + return NULL; } - switch( domain ) { - case DVD_READ_INFO_FILE: - if( titlenum == 0 ) { - sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" ); - } else { - sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum ); - } - break; - case DVD_READ_INFO_BACKUP_FILE: - if( titlenum == 0 ) { - sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" ); - } else { - sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum ); - } - break; - case DVD_READ_MENU_VOBS: - if( dvd->isImageFile ) { - return DVDOpenVOBUDF( dvd, titlenum, 1 ); - } else { - return DVDOpenVOBPath( dvd, titlenum, 1 ); - } - break; - case DVD_READ_TITLE_VOBS: - if( titlenum == 0 ) return 0; - if( dvd->isImageFile ) { - return DVDOpenVOBUDF( dvd, titlenum, 0 ); - } else { - return DVDOpenVOBPath( dvd, titlenum, 0 ); - } - break; - default: - if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: Invalid domain for file open.\n" ); + switch( domain ) { + case DVD_READ_INFO_FILE: + if( titlenum == 0 ) { + sprintf( filename, "/VIDEO_TS/VIDEO_TS.IFO" ); + } else { + sprintf( filename, "/VIDEO_TS/VTS_%02i_0.IFO", titlenum ); } - errno = EINVAL; - return NULL; + break; + case DVD_READ_INFO_BACKUP_FILE: + if( titlenum == 0 ) { + sprintf( filename, "/VIDEO_TS/VIDEO_TS.BUP" ); + } else { + sprintf( filename, "/VIDEO_TS/VTS_%02i_0.BUP", titlenum ); } - + break; + case DVD_READ_MENU_VOBS: + if( dvd->isImageFile ) { + return DVDOpenVOBUDF( dvd, titlenum, 1 ); + } else { + return DVDOpenVOBPath( dvd, titlenum, 1 ); + } + break; + case DVD_READ_TITLE_VOBS: + if( titlenum == 0 ) return 0; if( dvd->isImageFile ) { - return DVDOpenFileUDF( dvd, filename ); + return DVDOpenVOBUDF( dvd, titlenum, 0 ); } else { - return DVDOpenFilePath( dvd, filename ); + return DVDOpenVOBPath( dvd, titlenum, 0 ); } + break; + default: + if(dvd->verbose >= 1) { + fprintf( stderr, "libdvdread: Invalid domain for file open.\n" ); + } + errno = EINVAL; + return NULL; + } + + if( dvd->isImageFile ) { + return DVDOpenFileUDF( dvd, filename ); + } else { + return DVDOpenFilePath( dvd, filename ); + } } void DVDCloseFile( dvd_file_t *dvd_file ) { - int i; - - if( dvd_file ) { - if( dvd_file->dvd->isImageFile ) { - ; - } else { - for( i = 0; i < 9; ++i ) { - if( dvd_file->title_devs[ i ] ) { - dvdinput_close( dvd_file->title_devs[i] ); - } - } - } + int i; - free( dvd_file ); - dvd_file = 0; + if( dvd_file ) { + if( dvd_file->dvd->isImageFile ) { + ; + } else { + for( i = 0; i < 9; ++i ) { + if( dvd_file->title_devs[ i ] ) { + dvdinput_close( dvd_file->title_devs[i] ); + } + } } + + free( dvd_file ); + dvd_file = 0; + } } /** @@ -1033,30 +1035,30 @@ void DVDCloseFile( dvd_file_t *dvd_file ) * @param return Returns number of blocks read on success, negative on error */ int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, - size_t block_count, unsigned char *data, - int encrypted ) + size_t block_count, unsigned char *data, + int encrypted ) { - int ret; + int ret; - if( !device->dev ) { + if( !device->dev ) { if(device->verbose >= 1) { - fprintf( stderr, "libdvdread: Fatal error in block read.\n" ); + fprintf( stderr, "libdvdread: Fatal error in block read.\n" ); } - return 0; - } + return 0; + } - ret = dvdinput_seek( device->dev, (int) lb_number ); - if( ret != (int) lb_number ) { + ret = dvdinput_seek( device->dev, (int) lb_number ); + if( ret != (int) lb_number ) { if(device->verbose >= 1) { fprintf( stderr, "libdvdread: UDFReadBlocksRaw: Can't seek to block %u\n", lb_number ); } - return 0; - } + return 0; + } - return dvdinput_read( device->dev, (char *) data, - (int) block_count, encrypted ); + return dvdinput_read( device->dev, (char *) data, + (int) block_count, encrypted ); } /** @@ -1074,11 +1076,11 @@ int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, * @return Returns the number of blocks read on success or a negative error. */ static int DVDReadBlocksUDF( dvd_file_t *dvd_file, uint32_t offset, - size_t block_count, unsigned char *data, - int encrypted ) + size_t block_count, unsigned char *data, + int encrypted ) { - return UDFReadBlocksRaw( dvd_file->dvd, dvd_file->lb_start + offset, - block_count, data, encrypted ); + return UDFReadBlocksRaw( dvd_file->dvd, dvd_file->lb_start + offset, + block_count, data, encrypted ); } /** @@ -1095,123 +1097,123 @@ static int DVDReadBlocksUDF( dvd_file_t *dvd_file, uint32_t offset, * @return Returns number of blocks read on success, negative on error. */ static int DVDReadBlocksPath( dvd_file_t *dvd_file, unsigned int offset, - size_t block_count, unsigned char *data, - int encrypted ) + size_t block_count, unsigned char *data, + int encrypted ) { - int i; - int ret, ret2, off; - - ret = 0; - ret2 = 0; - for( i = 0; i < 9; ++i ) { - if( !dvd_file->title_sizes[ i ] ) return 0; /* Past end of file */ - - if( offset < dvd_file->title_sizes[ i ] ) { - if( ( offset + block_count ) <= dvd_file->title_sizes[ i ] ) { - off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset ); - if( off < 0 || off != (int)offset ) { + int i; + int ret, ret2, off; + + ret = 0; + ret2 = 0; + for( i = 0; i < 9; ++i ) { + if( !dvd_file->title_sizes[ i ] ) return 0; /* Past end of file */ + + if( offset < dvd_file->title_sizes[ i ] ) { + if( ( offset + block_count ) <= dvd_file->title_sizes[ i ] ) { + off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset ); + if( off < 0 || off != (int)offset ) { if(dvd_file->dvd->verbose >= 1) { fprintf( stderr, "libdvdread: DVDReadBlocksPath1: Can't seek to block %d\n", - offset ); + offset ); } - return off < 0 ? off : 0; - } - ret = dvdinput_read( dvd_file->title_devs[ i ], data, - (int)block_count, encrypted ); - break; - } else { - size_t part1_size = dvd_file->title_sizes[ i ] - offset; - /* FIXME: Really needs to be a while loop. - * (This is only true if you try and read >1GB at a time) */ - - /* Read part 1 */ - off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset ); - if( off < 0 || off != (int)offset ) { + return off < 0 ? off : 0; + } + ret = dvdinput_read( dvd_file->title_devs[ i ], data, + (int)block_count, encrypted ); + break; + } else { + size_t part1_size = dvd_file->title_sizes[ i ] - offset; + /* FIXME: Really needs to be a while loop. + * (This is only true if you try and read >1GB at a time) */ + + /* Read part 1 */ + off = dvdinput_seek( dvd_file->title_devs[ i ], (int)offset ); + if( off < 0 || off != (int)offset ) { if(dvd_file->dvd->verbose >= 1) { fprintf( stderr, "libdvdread: DVDReadBlocksPath2: Can't seek to block %d\n", - offset ); + offset ); } - return off < 0 ? off : 0; - } - ret = dvdinput_read( dvd_file->title_devs[ i ], data, - (int)part1_size, encrypted ); - if( ret < 0 ) return ret; - /* FIXME: This is wrong if i is the last file in the set. - * also error from this read will not show in ret. */ - - /* Does the next part exist? If not then return now. */ - if( !dvd_file->title_devs[ i + 1 ] ) return ret; - - /* Read part 2 */ - off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 ); - if( off < 0 || off != 0 ) { + return off < 0 ? off : 0; + } + ret = dvdinput_read( dvd_file->title_devs[ i ], data, + (int)part1_size, encrypted ); + if( ret < 0 ) return ret; + /* FIXME: This is wrong if i is the last file in the set. + * also error from this read will not show in ret. */ + + /* Does the next part exist? If not then return now. */ + if( !dvd_file->title_devs[ i + 1 ] ) return ret; + + /* Read part 2 */ + off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 ); + if( off < 0 || off != 0 ) { if(dvd_file->dvd->verbose >= 1) { fprintf( stderr, "libdvdread: DVDReadBlocksPath3: Can't seek to block %d\n", 0 ); } - return off < 0 ? off : 0; - } - ret2 = dvdinput_read( dvd_file->title_devs[ i + 1 ], - data + ( part1_size - * (int64_t)DVD_VIDEO_LB_LEN ), - (int)(block_count - part1_size), - encrypted ); - if( ret2 < 0 ) return ret2; - break; - } - } else { - offset -= dvd_file->title_sizes[ i ]; + return off < 0 ? off : 0; } + ret2 = dvdinput_read( dvd_file->title_devs[ i + 1 ], + data + ( part1_size + * (int64_t)DVD_VIDEO_LB_LEN ), + (int)(block_count - part1_size), + encrypted ); + if( ret2 < 0 ) return ret2; + break; + } + } else { + offset -= dvd_file->title_sizes[ i ]; } + } - return ret + ret2; + return ret + ret2; } /** * This is broken reading more than 2Gb at a time if ssize_t is 32-bit. */ ssize_t DVDReadBlocks( dvd_file_t *dvd_file, int offset, - size_t block_count, unsigned char *data ) + size_t block_count, unsigned char *data ) { - int ret; - - /* Check arguments. */ - if( dvd_file == NULL || offset < 0 || data == NULL ) - return -1; + int ret; - /* Hack, and it will still fail for multiple opens in a threaded app ! */ - if( dvd_file->dvd->css_title != dvd_file->css_title ) { - dvd_file->dvd->css_title = dvd_file->css_title; - if( dvd_file->dvd->isImageFile ) { - dvdinput_title( dvd_file->dvd->dev, (int)dvd_file->lb_start ); - } - /* Here each vobu has it's own dvdcss handle, so no need to update - else { - dvdinput_title( dvd_file->title_devs[ 0 ], (int)dvd_file->lb_start ); - }*/ - } + /* Check arguments. */ + if( dvd_file == NULL || offset < 0 || data == NULL ) + return -1; + /* Hack, and it will still fail for multiple opens in a threaded app ! */ + if( dvd_file->dvd->css_title != dvd_file->css_title ) { + dvd_file->dvd->css_title = dvd_file->css_title; if( dvd_file->dvd->isImageFile ) { - ret = DVDReadBlocksUDF( dvd_file, (uint32_t)offset, - block_count, data, DVDINPUT_READ_DECRYPT ); - } else { - ret = DVDReadBlocksPath( dvd_file, (unsigned int)offset, - block_count, data, DVDINPUT_READ_DECRYPT ); - } + dvdinput_title( dvd_file->dvd->dev, (int)dvd_file->lb_start ); + } + /* Here each vobu has it's own dvdcss handle, so no need to update + else { + dvdinput_title( dvd_file->title_devs[ 0 ], (int)dvd_file->lb_start ); + }*/ + } + + if( dvd_file->dvd->isImageFile ) { + ret = DVDReadBlocksUDF( dvd_file, (uint32_t)offset, + block_count, data, DVDINPUT_READ_DECRYPT ); + } else { + ret = DVDReadBlocksPath( dvd_file, (unsigned int)offset, + block_count, data, DVDINPUT_READ_DECRYPT ); + } - return (ssize_t)ret; + return (ssize_t)ret; } int DVDFileSeek( dvd_file_t *dvd_file, int offset ) { - /* Check arguments. */ - if( dvd_file == NULL || offset < 0 ) - return -1; + /* Check arguments. */ + if( dvd_file == NULL || offset < 0 ) + return -1; - if( offset > dvd_file->filesize * DVD_VIDEO_LB_LEN ) { - return -1; - } - dvd_file->seek_pos = (uint32_t) offset; - return offset; + if( offset > dvd_file->filesize * DVD_VIDEO_LB_LEN ) { + return -1; + } + dvd_file->seek_pos = (uint32_t) offset; + return offset; } #ifndef HAVE_UINTPTR_T @@ -1226,122 +1228,122 @@ ssize_t DVDReadBytes( dvd_file_t *dvd_file, void *data, size_t byte_size ) { unsigned char *secbuf_start; unsigned char *secbuf; //must be aligned to 2048-bytes for raw/O_DIRECT - unsigned int numsec, seek_sector, seek_byte; - int ret; + unsigned int numsec, seek_sector, seek_byte; + int ret; - /* Check arguments. */ + /* Check arguments. */ if( dvd_file == NULL || data == NULL ) { errno = EINVAL; - return -1; + return -1; } - seek_sector = dvd_file->seek_pos / DVD_VIDEO_LB_LEN; - seek_byte = dvd_file->seek_pos % DVD_VIDEO_LB_LEN; + seek_sector = dvd_file->seek_pos / DVD_VIDEO_LB_LEN; + seek_byte = dvd_file->seek_pos % DVD_VIDEO_LB_LEN; + + numsec = ( ( seek_byte + byte_size ) / DVD_VIDEO_LB_LEN ) + + ( ( ( seek_byte + byte_size ) % DVD_VIDEO_LB_LEN ) ? 1 : 0 ); - numsec = ( ( seek_byte + byte_size ) / DVD_VIDEO_LB_LEN ) + - ( ( ( seek_byte + byte_size ) % DVD_VIDEO_LB_LEN ) ? 1 : 0 ); - /* must align to 2048 bytes if we are reading from raw/O_DIRECT */ secbuf_start = (unsigned char *) malloc( (numsec+1) * DVD_VIDEO_LB_LEN ); if( !secbuf_start ) { /* errno will be set to ENOMEM by malloc */ return -1; - } - + } + secbuf = DVD_ALIGN(secbuf_start); - if( dvd_file->dvd->isImageFile ) { - ret = DVDReadBlocksUDF( dvd_file, (uint32_t) seek_sector, - (size_t) numsec, secbuf, DVDINPUT_NOFLAGS ); - } else { - ret = DVDReadBlocksPath( dvd_file, seek_sector, - (size_t) numsec, secbuf, DVDINPUT_NOFLAGS ); - } + if( dvd_file->dvd->isImageFile ) { + ret = DVDReadBlocksUDF( dvd_file, (uint32_t) seek_sector, + (size_t) numsec, secbuf, DVDINPUT_NOFLAGS ); + } else { + ret = DVDReadBlocksPath( dvd_file, seek_sector, + (size_t) numsec, secbuf, DVDINPUT_NOFLAGS ); + } - if( ret != (int) numsec ) { + if( ret != (int) numsec ) { free( secbuf_start ); - return ret < 0 ? ret : 0; - } + return ret < 0 ? ret : 0; + } - memcpy( data, &(secbuf[ seek_byte ]), byte_size ); + memcpy( data, &(secbuf[ seek_byte ]), byte_size ); free( secbuf_start ); - dvd_file->seek_pos += byte_size; - return byte_size; + dvd_file->seek_pos += byte_size; + return byte_size; } ssize_t DVDFileSize( dvd_file_t *dvd_file ) { - /* Check arguments. */ - if( dvd_file == NULL ) - return -1; + /* Check arguments. */ + if( dvd_file == NULL ) + return -1; - return dvd_file->filesize; + return dvd_file->filesize; } int DVDDiscID( dvd_reader_t *dvd, unsigned char *discid ) { - struct md5_ctx ctx; - int title; + struct md5_ctx ctx; + int title; int nr_of_files = 0; int tmp_errno; int nofiles_errno = ENOENT; - /* Check arguments. */ + /* Check arguments. */ if( dvd == NULL || discid == NULL ) { errno = EINVAL; return -1; } - /* Go through the first 10 IFO:s, in order, - * and md5sum them, i.e VIDEO_TS.IFO and VTS_0?_0.IFO */ - md5_init_ctx( &ctx ); - for( title = 0; title < 10; title++ ) { - dvd_file_t *dvd_file = DVDOpenFile( dvd, title, DVD_READ_INFO_FILE ); - if( dvd_file != NULL ) { - ssize_t bytes_read; - size_t file_size = dvd_file->filesize * DVD_VIDEO_LB_LEN; - char *buffer = malloc( file_size ); - + /* Go through the first 10 IFO:s, in order, + * and md5sum them, i.e VIDEO_TS.IFO and VTS_0?_0.IFO */ + md5_init_ctx( &ctx ); + for( title = 0; title < 10; title++ ) { + dvd_file_t *dvd_file = DVDOpenFile( dvd, title, DVD_READ_INFO_FILE ); + if( dvd_file != NULL ) { + ssize_t bytes_read; + size_t file_size = dvd_file->filesize * DVD_VIDEO_LB_LEN; + char *buffer = malloc( file_size ); + nr_of_files++; - if( buffer == NULL ) { + if( buffer == NULL ) { /* errno will be set to ENOMEM by malloc */ - return -1; - } + return -1; + } - bytes_read = DVDReadBytes( dvd_file, buffer, file_size ); - if( bytes_read != file_size ) { + bytes_read = DVDReadBytes( dvd_file, buffer, file_size ); + if( bytes_read != file_size ) { tmp_errno = errno; if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: DVDDiscId read returned %d bytes" + fprintf( stderr, "libdvdread: DVDDiscId read returned %d bytes" ", wanted %d\n", (int)bytes_read, (int)file_size ); } free(buffer); - DVDCloseFile( dvd_file ); + DVDCloseFile( dvd_file ); errno = tmp_errno; - return -1; - } - - md5_process_bytes( buffer, file_size, &ctx ); - - DVDCloseFile( dvd_file ); - free( buffer ); + return -1; + } + + md5_process_bytes( buffer, file_size, &ctx ); + + DVDCloseFile( dvd_file ); + free( buffer ); } else { if(errno != ENOENT) { nofiles_errno = errno; } - } } - md5_finish_ctx( &ctx, discid ); + } + md5_finish_ctx( &ctx, discid ); if(nr_of_files == 0) { errno = nofiles_errno; return -1; } - return 0; + return 0; } int DVDISOVolumeInfo( dvd_reader_t *dvd, - char *volid, unsigned int volid_size, - unsigned char *volsetid, unsigned int volsetid_size ) + char *volid, unsigned int volid_size, + unsigned char *volsetid, unsigned int volsetid_size ) { unsigned char *buffer; /* must be aligned to 2048 for raw/O_DIRECT */ unsigned char *buffer_start; @@ -1369,8 +1371,8 @@ int DVDISOVolumeInfo( dvd_reader_t *dvd, ret = UDFReadBlocksRaw( dvd, 16, 1, buffer, 0 ); if( ret != 1 ) { if(dvd->verbose >= 1) { - fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to " - "read ISO9660 Primary Volume Descriptor!\n" ); + fprintf( stderr, "libdvdread: DVDISOVolumeInfo, failed to " + "read ISO9660 Primary Volume Descriptor!\n" ); } free(buffer_start); return -1; @@ -1380,7 +1382,7 @@ int DVDISOVolumeInfo( dvd_reader_t *dvd, unsigned int n; for(n = 0; n < 32; n++) { if(buffer[40+n] == 0x20) { - break; + break; } } @@ -1405,8 +1407,8 @@ int DVDISOVolumeInfo( dvd_reader_t *dvd, int DVDUDFVolumeInfo( dvd_reader_t *dvd, - char *volid, unsigned int volid_size, - unsigned char *volsetid, unsigned int volsetid_size ) + char *volid, unsigned int volid_size, + unsigned char *volsetid, unsigned int volsetid_size ) { int ret; /* Check arguments. */ diff --git a/dvdread/dvd_reader.h b/dvdread/dvd_reader.h index 25b0370279..84b8bb0aee 100644 --- a/dvdread/dvd_reader.h +++ b/dvdread/dvd_reader.h @@ -1,3 +1,4 @@ +/* -*- c-basic-offset: 2; indent-tabs-mode: nil -*- */ #ifndef DVD_READER_H_INCLUDED #define DVD_READER_H_INCLUDED @@ -140,8 +141,8 @@ typedef enum { DVD_READ_INFO_BACKUP_FILE, /**< VIDEO_TS.BUP or VTS_XX_0.BUP (title) */ DVD_READ_MENU_VOBS, /**< VIDEO_TS.VOB or VTS_XX_0.VOB (title) */ DVD_READ_TITLE_VOBS /**< VTS_XX_[1-9].VOB (title). All files in - the title set are opened and read as a - single file. */ + the title set are opened and read as a + single file. */ } dvd_read_domain_t; /** @@ -214,7 +215,7 @@ int DVDFileSeek( dvd_file_t *, int ); * bytes_read = DVDReadBytes(dvd_file, data, bytes); */ ssize_t DVDReadBytes( dvd_file_t *, void *, size_t ); - + /** * Returns the file size in blocks. * @@ -224,7 +225,7 @@ ssize_t DVDReadBytes( dvd_file_t *, void *, size_t ); * blocks = DVDFileSize(dvd_file); */ ssize_t DVDFileSize( dvd_file_t * ); - + /** * Get a unique 128 bit disc ID. * This is the MD5 sum