December 2007 - DVDnav-discuss - lists.mplayerhq.hu

DVDREAD_USE_DIRECT: is it of any use?
by Nico Sabbi 31 Dec '07

31 Dec '07

Hi, you may have noticed my recent commits to dvdread following the very messy cvslog of ogle. Let alone the tediousness of the review, I'm wondering if the implementation of DVDREAD_USE_DIRECT brings any actual advantage, also considering that it can't be used with encrypted discs. I'll welcome any opinion on the subject. Nico

1 1

r989 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 19:17:34 2007 New Revision: 989 Log: in DVDOpen(), if path_copy ends up being an empty string transform it to /; part of ogle-1778 fixed by me Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 19:17:34 2007 @@ -447,6 +447,11 @@ dvd_reader_t *DVDOpen( const char *ppath 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 ) ) ) {

1 0

r988 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 19:08:06 2007 New Revision: 988 Log: malloc() a buffer large enough before calling getcwd() - part of ogle-1778 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 19:08:06 2007 @@ -418,13 +418,16 @@ dvd_reader_t *DVDOpen( const char *ppath if( cdir >= 0 ) { chdir( path_copy ); - new_path = getcwd( NULL, PATH_MAX ); + new_path = malloc(PATH_MAX+1); + if(!new_path) { + free(path); + return NULL; + } + getcwd(new_path, PATH_MAX ); fchdir( cdir ); close( cdir ); - if( new_path ) { free( path_copy ); path_copy = new_path; - } } } #endif

1 0

r987 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 18:56:30 2007 New Revision: 987 Log: fix potential memleak, part of ogle-1778 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 18:56:30 2007 @@ -263,6 +263,10 @@ static dvd_reader_t *DVDOpenPath( const 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;

1 0

r986 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 18:48:08 2007 New Revision: 986 Log: more 0->NULL changes, part of ogle-1778 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 18:48:08 2007 @@ -237,7 +237,7 @@ static dvd_reader_t *DVDOpenImageFile( c } dvd->isImageFile = 1; dvd->dev = dev; - dvd->path_root = 0; + dvd->path_root = NULL; dvd->udfcache_level = DEFAULT_UDF_CACHE_LEVEL; dvd->udfcache = NULL; @@ -324,7 +324,7 @@ dvd_reader_t *DVDOpen( const char *ppath int ret; int have_css; dvd_reader_t *ret_val = NULL; - char *dev_name = 0; + char *dev_name = NULL; char *path; #ifdef _MSC_VER

1 0

r985 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 18:44:05 2007 New Revision: 985 Log: call dvdinput_close() after having successfully opened it but before exiting in case of errors; part of ogle-1778 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 18:44:05 2007 @@ -231,7 +231,10 @@ static dvd_reader_t *DVDOpenImageFile( c } dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); - if( !dvd ) return NULL; + if( !dvd ) { + dvdinput_close(dev); + return NULL; + } dvd->isImageFile = 1; dvd->dev = dev; dvd->path_root = 0; @@ -653,6 +656,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_ dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); if( !dvd_file ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" ); + dvdinput_close(dev); return NULL; } dvd_file->dvd = dvd; @@ -762,6 +766,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r if( stat( full_path, &fileinfo ) < 0 ) { fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); + dvdinput_close(dev); free( dvd_file ); return NULL; }

1 0

r984 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 31 Dec '07

31 Dec '07

Author: nicodvb Date: Mon Dec 31 18:25:55 2007 New Revision: 984 Log: more 0->NULL in functions returning pointers Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Mon Dec 31 18:25:55 2007 @@ -227,11 +227,11 @@ static dvd_reader_t *DVDOpenImageFile( c dev = dvdinput_open( location ); if( !dev ) { fprintf( stderr, "libdvdread: Can't open %s for reading\n", location ); - return 0; + return NULL; } dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); - if( !dvd ) return 0; + if( !dvd ) return NULL; dvd->isImageFile = 1; dvd->dev = dev; dvd->path_root = 0; @@ -256,7 +256,7 @@ static dvd_reader_t *DVDOpenPath( const dvd_reader_t *dvd; dvd = (dvd_reader_t *) malloc( sizeof( dvd_reader_t ) ); - if( !dvd ) return 0; + if( !dvd ) return NULL; dvd->isImageFile = 0; dvd->dev = 0; dvd->path_root = strdup( path_root ); @@ -364,7 +364,7 @@ dvd_reader_t *DVDOpen( const char *ppath fprintf( stderr, "libdvdread: Can't stat %s\n", path ); perror(""); free(path); - return 0; + return NULL; } /* First check if this is a block/char device or a file*/ @@ -398,7 +398,7 @@ dvd_reader_t *DVDOpen( const char *ppath /* XXX: We should scream real loud here. */ if( !(path_copy = strdup( path ) ) ) { free(path); - return 0; + return NULL; } #ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */ @@ -527,7 +527,7 @@ dvd_reader_t *DVDOpen( const char *ppath /* If it's none of the above, screw it. */ fprintf( stderr, "libdvdread: Could not open %s\n", path ); free( path ); - return 0; + return NULL; } void DVDClose( dvd_reader_t *dvd ) @@ -551,13 +551,13 @@ static dvd_file_t *DVDOpenFileUDF( dvd_r start = UDFFindFile( dvd, filename, &len ); if( !start ) { fprintf( stderr, "libdvdnav:DVDOpenFileUDF:UDFFindFile %s failed\n", filename ); - return 0; + return NULL; } dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); if( !dvd_file ) { fprintf( stderr, "libdvdnav:DVDOpenFileUDF:malloc failed\n" ); - return 0; + return NULL; } dvd_file->dvd = dvd; dvd_file->lb_start = start; @@ -641,19 +641,19 @@ static dvd_file_t *DVDOpenFilePath( dvd_ /* Get the full path of the file. */ if( !findDVDFile( dvd, filename, full_path ) ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:findDVDFile %s failed\n", filename ); - return 0; + return NULL; } dev = dvdinput_open( full_path ); if( !dev ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvdinput_open %s failed\n", full_path ); - return 0; + return NULL; } dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); if( !dvd_file ) { fprintf( stderr, "libdvdnav:DVDOpenFilePath:dvd_file malloc failed\n" ); - return 0; + return NULL; } dvd_file->dvd = dvd; dvd_file->lb_start = 0; @@ -665,7 +665,7 @@ static dvd_file_t *DVDOpenFilePath( dvd_ if( stat( full_path, &fileinfo ) < 0 ) { fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); free( dvd_file ); - return 0; + return NULL; } dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; dvd_file->title_devs[ 0 ] = dev; @@ -686,10 +686,10 @@ static dvd_file_t *DVDOpenVOBUDF( dvd_re sprintf( filename, "/VIDEO_TS/VTS_%02d_%d.VOB", title, menu ? 0 : 1 ); } start = UDFFindFile( dvd, filename, &len ); - if( start == 0 ) return 0; + if( start == 0 ) return NULL; dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; + if( !dvd_file ) return NULL; dvd_file->dvd = dvd; /*Hack*/ dvd_file->css_title = title << 1 | menu; dvd_file->lb_start = start; @@ -732,7 +732,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r int i; dvd_file = (dvd_file_t *) malloc( sizeof( dvd_file_t ) ); - if( !dvd_file ) return 0; + if( !dvd_file ) return NULL; dvd_file->dvd = dvd; /*Hack*/ dvd_file->css_title = title << 1 | menu; dvd_file->lb_start = 0; @@ -751,19 +751,19 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r } if( !findDVDFile( dvd, filename, full_path ) ) { free( dvd_file ); - return 0; + return NULL; } dev = dvdinput_open( full_path ); if( dev == NULL ) { free( dvd_file ); - return 0; + return NULL; } if( stat( full_path, &fileinfo ) < 0 ) { fprintf( stderr, "libdvdread: Can't stat() %s.\n", filename ); free( dvd_file ); - return 0; + return NULL; } dvd_file->title_sizes[ 0 ] = fileinfo.st_size / DVD_VIDEO_LB_LEN; dvd_file->title_devs[ 0 ] = dev; @@ -790,7 +790,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r } if( !dvd_file->title_devs[ 0 ] ) { free( dvd_file ); - return 0; + return NULL; } }

1 0

r983 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 30 Dec '07

30 Dec '07

Author: nicodvb Date: Sun Dec 30 15:29:20 2007 New Revision: 983 Log: fail DVDDiscID if no ifo files are found. ogle-1766 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Sun Dec 30 15:29:20 2007 @@ -1079,6 +1079,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsign { struct md5_ctx ctx; int title; + int nr_of_files = 0; /* Check arguments. */ if( dvd == NULL || discid == NULL ) @@ -1113,9 +1114,12 @@ int DVDDiscID( dvd_reader_t *dvd, unsign DVDCloseFile( dvd_file ); free( buffer_base ); + nr_of_files++; } } md5_finish_ctx( &ctx, discid ); + if(!nr_of_files) + return -1; return 0; }

1 0

r982 - trunk/libdvdnav/src/dvdread/ifo_read.c
by nicodvb 30 Dec '07

30 Dec '07

Author: nicodvb Date: Sun Dec 30 15:22:32 2007 New Revision: 982 Log: fix various memleaks, part of ogle-1764 Modified: trunk/libdvdnav/src/dvdread/ifo_read.c Modified: trunk/libdvdnav/src/dvdread/ifo_read.c ============================================================================== --- trunk/libdvdnav/src/dvdread/ifo_read.c (original) +++ trunk/libdvdnav/src/dvdread/ifo_read.c Sun Dec 30 15:22:32 2007 @@ -257,6 +257,7 @@ void ifoClose(ifo_handle_t *ifofile) { ifoFree_FP_PGC(ifofile); ifoFree_PGCIT(ifofile); ifoFree_VTS_PTT_SRPT(ifofile); + ifoFree_VTS_TMAPT(ifofile); if(ifofile->vmgi_mat) free(ifofile->vmgi_mat); @@ -1643,7 +1644,7 @@ static int ifoRead_PGCIT_internal(ifo_ha ifoFree_PGC(pgcit->pgci_srp[j].pgc); free(pgcit->pgci_srp[j].pgc); } - return 0; + goto fail; } if(!ifoRead_PGC(ifofile, pgcit->pgci_srp[i].pgc, offset + pgcit->pgci_srp[i].pgc_start_byte)) { @@ -1652,12 +1653,15 @@ static int ifoRead_PGCIT_internal(ifo_ha ifoFree_PGC(pgcit->pgci_srp[j].pgc); free(pgcit->pgci_srp[j].pgc); } - free(pgcit->pgci_srp); - return 0; + goto fail; } } return 1; +fail: + free(pgcit->pgci_srp); + pgcit->pgci_srp = NULL; + return 0; } static void ifoFree_PGCIT_internal(pgcit_t *pgcit) {

1 0

r981 - trunk/libdvdnav/src/dvdread/ifo_read.c
by nicodvb 30 Dec '07

30 Dec '07

Author: nicodvb Date: Sun Dec 30 15:08:25 2007 New Revision: 981 Log: functions returning pointers should return NULL, not 0. part of ogle-1764 Modified: trunk/libdvdnav/src/dvdread/ifo_read.c Modified: trunk/libdvdnav/src/dvdread/ifo_read.c ============================================================================== --- trunk/libdvdnav/src/dvdread/ifo_read.c (original) +++ trunk/libdvdnav/src/dvdread/ifo_read.c Sun Dec 30 15:08:25 2007 @@ -99,7 +99,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); if(!ifofile) - return 0; + return NULL; memset(ifofile, 0, sizeof(ifo_handle_t)); @@ -113,7 +113,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, fprintf(stderr, "libdvdread: Can't open file VIDEO_TS.IFO.\n"); } free(ifofile); - return 0; + return NULL; } /* First check if this is a VMGI file. */ @@ -123,7 +123,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, if(!ifoRead_FP_PGC(ifofile) || !ifoRead_TT_SRPT(ifofile)) { fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); ifoClose(ifofile); - return 0; + return NULL; } ifoRead_PGCI_UT(ifofile); @@ -133,7 +133,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, if(!ifoRead_VTS_ATRT(ifofile)) { fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); ifoClose(ifofile); - return 0; + return NULL; } ifoRead_TXTDT_MGI(ifofile); @@ -149,7 +149,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, fprintf(stderr, "libdvdread: Invalid title IFO (VTS_%02d_0.IFO).\n", title); ifoClose(ifofile); - return 0; + return NULL; } @@ -162,7 +162,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, fprintf(stderr, "libdvdread: Invalid title IFO (VTS_%02d_0.IFO).\n", title); ifoClose(ifofile); - return 0; + return NULL; } return ifofile; @@ -175,7 +175,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, fprintf(stderr, "libdvdread: Invalid IFO for VMGM (VIDEO_TS.IFO).\n"); } ifoClose(ifofile); - return 0; + return NULL; } @@ -184,7 +184,7 @@ ifo_handle_t *ifoOpenVMGI(dvd_reader_t * ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); if(!ifofile) - return 0; + return NULL; memset(ifofile, 0, sizeof(ifo_handle_t)); @@ -194,7 +194,7 @@ ifo_handle_t *ifoOpenVMGI(dvd_reader_t * if(!ifofile->file) { fprintf(stderr, "libdvdread: Can't open file VIDEO_TS.IFO.\n"); free(ifofile); - return 0; + return NULL; } if(ifoRead_VMG(ifofile)) @@ -202,7 +202,7 @@ ifo_handle_t *ifoOpenVMGI(dvd_reader_t * fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); ifoClose(ifofile); - return 0; + return NULL; } @@ -211,14 +211,14 @@ ifo_handle_t *ifoOpenVTSI(dvd_reader_t * ifofile = (ifo_handle_t *)malloc(sizeof(ifo_handle_t)); if(!ifofile) - return 0; + return NULL; memset(ifofile, 0, sizeof(ifo_handle_t)); if(title <= 0 || title > 99) { fprintf(stderr, "libdvdread: ifoOpenVTSI invalid title (%d).\n", title); free(ifofile); - return 0; + return NULL; } ifofile->file = DVDOpenFile(dvd, title, DVD_READ_INFO_FILE); @@ -227,7 +227,7 @@ ifo_handle_t *ifoOpenVTSI(dvd_reader_t * if(!ifofile->file) { fprintf(stderr, "libdvdread: Can't open file VTS_%02d_0.IFO.\n", title); free(ifofile); - return 0; + return NULL; } ifoRead_VTS(ifofile); @@ -237,7 +237,7 @@ ifo_handle_t *ifoOpenVTSI(dvd_reader_t * fprintf(stderr, "libdvdread: Invalid IFO for title %d (VTS_%02d_0.IFO).\n", title, title); ifoClose(ifofile); - return 0; + return NULL; }

1 0