April 2009 - DVDnav-discuss - lists.mplayerhq.hu

[PATCH 0/6] catch up to 0.9.6 and a couple of extras
by Erik Hovland 10 Oct '11

10 Oct '11

In an attempt to work towards getting Jorgen's patches in, I have taken on the task of catching up the mplayer tree of libdvdread to 0.9.6. Next will be 0.9.7. But I figured that I can submit that in its own chunk. This patch set also includes some cosmetic fixes as well as a potential memory leak fix and a check of a few system calls. Enjoy E --- Erik Hovland (6): 0.9.6 included a few items to improve the sofware on the *BSD Add in DVDFileStat Add the version function DVDVersion(). The version should be bumped to at least 5. But I am going to go to 6 on this one. Make cosmetic changes to files. Some system calls that report errors are not being checked. msvc/include/pthreads/pthread.h | 6 - msvc/include/sys/time.h | 2 msvc/include/unistd.h | 4 - src/bitreader.c | 2 src/dvd_input.c | 2 src/dvd_reader.c | 258 ++++++++++++++++++++++++++++++++++++--- src/dvd_udf.c | 4 - src/dvdread/dvd_reader.h | 47 ++++++- src/dvdread/ifo_types.h | 2 src/dvdread/nav_types.h | 8 + src/ifo_print.c | 22 ++- src/md5.c | 4 - src/nav_print.c | 2 13 files changed, 302 insertions(+), 61 deletions(-) -- Signature

7 34

[PATCH] UDF2.50 part 1
by Jorgen Lundman 06 Oct '11

06 Oct '11

Separated RAR support, as it is the most questionble change in the old patch. Told emacs to never use tabs too, so it should be cleaner. Add UDF2.50 logic, which includes BD5ISO, and HD-DVD support. Support non-DVD style access. (File iteration, and reading). Diffed against svn 1153. This patch includes: 1. Add ExtFinfo (262) support 2. Add FileType (250) re-direct support 3. DVDOpendir/DVDReaddir/DVDClosedir/DVDOpenFile for UDF access. 4. dvdread-1.9.7 stat methods for obtaining VOB data and sizes 5. AD chaining, instead of assuming files will always fit in 1 AD group. 6. dvd_udf API uses "UDF_FILE" type instead of "starting block number". 7. Separate struct AD and struct FileAD instead of ugly 64->32 bit work. 8. Minor memory clearing problems, and memory leaks. Lund -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home) -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home) -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home)

6 35

"libdvdread: Invalid main menu IFO" on ppc
by Dominik 'Rathann' Mierzejewski 05 Mar '10

05 Mar '10

I've just received a bug report: === Opened by W. Michael Petullo on 2008-04-15 04:11 EST [reply] Description of problem: I have been unable to play DVD's with gstreamer-plugins-ugly-0.10.7-1.lvn9.ppc when it is built against libdvdread-4.1.1-6.fc9.ppc. I rebuilt gstreamer-plugins-ugly against the older libdvdread-0.9.7-3.fc8 and it worked fine. I receive an error that states, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO)." Here is an example: > gst-launch dvdreadsrc device=/dev/hdc ! dvddemux name=dvd dvd. ! mpeg2dec ! queue ! ffmpegcolorspace ! xvimagesink dvd. ! a52dec ! audioconvert ! audioresample ! queue ! osssink Setting pipeline to PAUSED ... No accelerated IMDCT transform found libdvdread: Using libdvdcss version 1.2.9 for DVD access libdvdread: Invalid main menu IFO (VIDEO_TS.IFO). ERROR: Pipeline doesn't want to pause. ERROR: from element /pipeline0/dvdreadsrc0: Could not open DVD Additional debug info: dvdreadsrc.c(236): gst_dvd_read_src_start (): /pipeline0/dvdreadsrc0: ifoOpen() failed: File exists Setting pipeline to NULL ... FREEING pipeline ... [...] === https://bugzilla.redhat.com/show_bug.cgi?id=442508 Regards, R. -- Fedora contributor http://fedoraproject.org/wiki/DominikMierzejewski Livna contributor http://rpm.livna.org MPlayer developer http://mplayerhq.hu "Faith manages." -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"

3 20

[patch] libdvdread: use goto to clean up DVDOpen and remove config.h includes
by Erik Hovland 28 Apr '09

28 Apr '09

Two patches. One is a clean up of the patch I originally sent about checking the return value of open. This still checks the return value of open but implements the goto that was suggest by other members of the list. Also, I have a patch which removes config.h where it isn't necessary. Thanks E -- Erik Hovland erik(a)hovland.org http://hovland.org/

2 1

r1172 - in trunk/libdvdread/src: bitreader.c dvd_input.c dvd_reader.c dvd_udf.c md5.c nav_print.c
by nicodvb 28 Apr '09

28 Apr '09

Author: nicodvb Date: Tue Apr 28 15:26:33 2009 New Revision: 1172 Log: removed unnecessary config.h; patch by Erik Hovland Modified: trunk/libdvdread/src/bitreader.c trunk/libdvdread/src/dvd_input.c trunk/libdvdread/src/dvd_reader.c trunk/libdvdread/src/dvd_udf.c trunk/libdvdread/src/md5.c trunk/libdvdread/src/nav_print.c Modified: trunk/libdvdread/src/bitreader.c ============================================================================== --- trunk/libdvdread/src/bitreader.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/bitreader.c Tue Apr 28 15:26:33 2009 (r1172) @@ -18,8 +18,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/libdvdread/src/dvd_input.c ============================================================================== --- trunk/libdvdread/src/dvd_input.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/dvd_input.c Tue Apr 28 15:26:33 2009 (r1172) @@ -19,8 +19,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <fcntl.h> Modified: trunk/libdvdread/src/dvd_reader.c ============================================================================== --- trunk/libdvdread/src/dvd_reader.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/dvd_reader.c Tue Apr 28 15:26:33 2009 (r1172) @@ -20,8 +20,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> /* For the timing of dvdcss_title crack. */ Modified: trunk/libdvdread/src/dvd_udf.c ============================================================================== --- trunk/libdvdread/src/dvd_udf.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/dvd_udf.c Tue Apr 28 15:26:33 2009 (r1172) @@ -28,8 +28,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <stdio.h> #include <stdlib.h> #include <string.h> Modified: trunk/libdvdread/src/md5.c ============================================================================== --- trunk/libdvdread/src/md5.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/md5.c Tue Apr 28 15:26:33 2009 (r1172) @@ -20,10 +20,6 @@ /* Written by Ulrich Drepper <drepper(a)gnu.ai.mit.edu>, 1995. */ -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <sys/types.h> #include <stdlib.h> Modified: trunk/libdvdread/src/nav_print.c ============================================================================== --- trunk/libdvdread/src/nav_print.c Tue Apr 28 15:19:51 2009 (r1171) +++ trunk/libdvdread/src/nav_print.c Tue Apr 28 15:26:33 2009 (r1172) @@ -23,8 +23,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - #include <stdio.h> #include <inttypes.h>

1 0

r1171 - trunk/libdvdread/src/dvd_reader.c
by nicodvb 28 Apr '09

28 Apr '09

Author: nicodvb Date: Tue Apr 28 15:19:51 2009 New Revision: 1171 Log: modified DVDOpen() to use a unified DVDOpen_error label; patch by Erik Hovland Modified: trunk/libdvdread/src/dvd_reader.c Modified: trunk/libdvdread/src/dvd_reader.c ============================================================================== --- trunk/libdvdread/src/dvd_reader.c Sat Apr 25 17:50:42 2009 (r1170) +++ trunk/libdvdread/src/dvd_reader.c Tue Apr 28 15:19:51 2009 (r1171) @@ -330,21 +330,21 @@ static char *bsd_block2char( const char dvd_reader_t *DVDOpen( const char *ppath ) { struct stat fileinfo; - int ret, have_css; + int ret, have_css, retval, cdir = 0; dvd_reader_t *ret_val = NULL; char *dev_name = NULL; - char *path; + char *path = NULL, *new_path = NULL, *path_copy = NULL; #ifdef _MSC_VER int len; #endif if( ppath == NULL ) - return 0; + goto DVDOpen_error; path = strdup(ppath); if( path == NULL ) - return 0; + goto DVDOpen_error; /* Try to open libdvdcss or fall back to standard functions */ have_css = dvdinput_setup(); @@ -374,8 +374,7 @@ dvd_reader_t *DVDOpen( const char *ppath /* If we can't stat the file, give up */ fprintf( stderr, "libdvdread: Can't stat %s\n", path ); perror(""); - free(path); - return NULL; + goto DVDOpen_error; } /* First check if this is a block/char device or a file*/ @@ -399,7 +398,6 @@ dvd_reader_t *DVDOpen( const char *ppath } else if( S_ISDIR( fileinfo.st_mode ) ) { dvd_reader_t *auth_drive = 0; - char *path_copy; #if defined(SYS_BSD) struct fstab* fe; #elif defined(__sun) || defined(__linux__) @@ -407,31 +405,33 @@ dvd_reader_t *DVDOpen( const char *ppath #endif /* XXX: We should scream real loud here. */ - if( !(path_copy = strdup( path ) ) ) { - free(path); - return NULL; - } + if( !(path_copy = strdup( path ) ) ) + goto DVDOpen_error; #ifndef WIN32 /* don't have fchdir, and getcwd( NULL, ... ) is strange */ /* Also WIN32 does not have symlinks, so we don't need this bit of code. */ /* Resolve any symlinks and get the absolute dir name. */ { - char *new_path; - int cdir = open( ".", O_RDONLY ); - - if( cdir >= 0 ) { - chdir( path_copy ); + if( ( cdir = open( ".", O_RDONLY ) ) >= 0 ) { + if( chdir( path_copy ) == -1 ) { + goto DVDOpen_error; + } new_path = malloc(PATH_MAX+1); if(!new_path) { - free(path); - return NULL; + goto DVDOpen_error; } - getcwd(new_path, PATH_MAX ); - fchdir( cdir ); + if( getcwd( new_path, PATH_MAX ) == NULL ) { + goto DVDOpen_error; + } + retval = fchdir( cdir ); close( cdir ); - free( path_copy ); - path_copy = new_path; + cdir = -1; + if( retval == -1 ) { + goto DVDOpen_error; + } + path_copy = new_path; + new_path = NULL; } } #endif @@ -527,7 +527,9 @@ dvd_reader_t *DVDOpen( const char *ppath #endif free( dev_name ); + dev_name = NULL; free( path_copy ); + path_copy = NULL; /** * If we've opened a drive, just use that. @@ -544,9 +546,17 @@ dvd_reader_t *DVDOpen( const char *ppath return ret_val; } +DVDOpen_error: /* If it's none of the above, screw it. */ fprintf( stderr, "libdvdread: Could not open %s\n", path ); + if( path != NULL ) free( path ); + if ( path_copy != NULL ) + free( path_copy ); + if ( cdir >= 0 ) + close( cdir ); + if ( new_path != NULL ) + free( new_path ); return NULL; }

1 0

[patch] a few bugs found in dvdread and dvdnav
by John Stebbins 25 Apr '09

25 Apr '09

Patches attached. 1. UDVGetVolumeIdentifier fails. UDFGetVolumeIdentifier calls UDFGetPVD calls UDFGetDescriptor which fails because bufsize is to small (8 bytes). The error is in the call. if(!UDFGetDescriptor( device, 1, pvd_buf, sizeof(pvd_buf))) sizeof(pvd_buf) gives the size of the pointer and not what it points at. It should be: if(!UDFGetDescriptor( device, 1, pvd_buf, DVD_VIDEO_LB_LEN)) 2. libdvdread builds incorrectly on os x (darwin) dvd_reader.c uses the define __DARWIN__ to enable darwin specific code, but it is never defined anywhere. 3. Conversion of disk names to raw disk names incorrect. On darwin and other bsd based systems, dvd_reader.c converts regular device names to raw device names. e.g. "/dev/disk4" -> "/dev/rdisk4" The test that determines if the conversion needs to be done is broken. It is fixed in libdvdread version 0.9.7. 4. libdvdread on mingw fails reading at 2G boundary. largefile support. 5. dvdnav_reset deadlock on vm_lock. dvdnav_reset takes the lock, then latter calls dvdnav_clear which tries to take the lock again. dead. the unlock that is immediately after dvdnav_clear should be moved to before it. diff -Naur libdvdread.orig/configure.ac libdvdread/configure.ac --- libdvdread.orig/configure.ac 2009-01-08 17:57:10.000000000 -0500 +++ libdvdread/configure.ac 2009-04-24 01:50:56.000000000 -0400 @@ -145,6 +145,9 @@ *cygwin*) LDFLAGS="-no-undefined $LDFLAGS" ;; + *darwin*) + AC_DEFINE(__DARWIN__, 1, Have Mac OS X system) + ;; *os2*) LDFLAGS="-no-undefined -Zbin-files $LDFLAGS" ;; diff -Naur libdvdread.orig/src/dvd_reader.c libdvdread/src/dvd_reader.c --- libdvdread.orig/src/dvd_reader.c 2009-03-13 21:28:21.000000000 -0400 +++ libdvdread/src/dvd_reader.c 2009-04-24 01:35:43.000000000 -0400 @@ -314,7 +314,7 @@ 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 ) ) + if( strncmp( path, "/dev/", 5 ) || !strncmp( path, "/dev/r", 6 ) ) return (char *) strdup( path ); /* Replace "/dev/" with "/dev/r" */ diff -Naur libdvdread.orig/src/dvd_input.h libdvdread/src/dvd_input.h --- libdvdread.orig/src/dvd_input.h 2008-10-03 13:11:30.000000000 -0700 +++ libdvdread/src/dvd_input.h 2009-04-23 13:47:04.000000000 -0700 @@ -29,6 +29,24 @@ #define DVDINPUT_READ_DECRYPT (1 << 0) +#if defined( __MINGW32__ ) +# undef lseek +# define lseek _lseeki64 +# undef fseeko +# define fseeko fseeko64 +# undef ftello +# define ftello ftello64 +# define flockfile(...) +# define funlockfile(...) +# define getc_unlocked getc +# undef off_t +# define off_t off64_t +# undef stat +# define stat _stati64 +# define fstat _fstati64 +# define wstat _wstati64 +#endif + typedef struct dvd_input_s *dvd_input_t; /** diff -Naur libdvdread.orig/src/dvd_udf.c libdvdread/src/dvd_udf.c --- libdvdread.orig/src/dvd_udf.c 2009-01-08 14:57:10.000000000 -0800 +++ libdvdread/src/dvd_udf.c 2009-04-23 13:36:08.000000000 -0700 @@ -928,7 +928,7 @@ if(GetUDFCache(device, PVDCache, 0, pvd)) return 1; - if(!UDFGetDescriptor( device, 1, pvd_buf, sizeof(pvd_buf))) + if(!UDFGetDescriptor( device, 1, pvd_buf, DVD_VIDEO_LB_LEN)) return 0; memcpy(pvd->VolumeIdentifier, &pvd_buf[24], 32); diff -Naur libdvdnav.orig/src/dvdnav.c libdvdnav/src/dvdnav.c --- libdvdnav.orig/src/dvdnav.c 2009-03-13 18:28:22.000000000 -0700 +++ libdvdnav/src/dvdnav.c 2009-04-24 19:52:52.000000000 -0700 @@ -178,9 +178,9 @@ #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n"); #endif + pthread_mutex_unlock(&this->vm_lock); result = dvdnav_clear(this); - pthread_mutex_unlock(&this->vm_lock); return result; }

3 2

r1170 - trunk/libdvdread/src/dvd_reader.c
by diego 25 Apr '09

25 Apr '09

Author: diego Date: Sat Apr 25 17:50:42 2009 New Revision: 1170 Log: Use __APPLE__ instead of __DARWIN__ in preprocessor check. __DARWIN__ is not defined (by default) on Mac OS X and __APPLE__ is used in other places throughout the code. Modified: trunk/libdvdread/src/dvd_reader.c Modified: trunk/libdvdread/src/dvd_reader.c ============================================================================== --- trunk/libdvdread/src/dvd_reader.c Wed Apr 22 09:40:57 2009 (r1169) +++ trunk/libdvdread/src/dvd_reader.c Sat Apr 25 17:50:42 2009 (r1170) @@ -53,7 +53,7 @@ static inline int _private_gettimeofday( #define lseek64 _lseeki64 #endif -#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__DARWIN__) +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__bsdi__) || defined(__APPLE__) #define SYS_BSD 1 #endif

1 0

Re: [DVDnav-discuss] [patch] resend ifo struct pointer could be leaked
by Erik Hovland 22 Apr '09

22 Apr '09

----- Original message ----- > On Wednesday 22 April 2009 04:01:24 Erik Hovland wrote: > > Just a resend of a patch I sent to the list earlier in the year. > > > > Thanks > > > > E > > > thanks, > committed. Didn't I already propose you an svn account in the past? You did. I have been too timid to follow through. But I will now. Thanks for the commit. E

3 2

[patch] resend ifo struct pointer could be leaked
by Erik Hovland 22 Apr '09

22 Apr '09

Just a resend of a patch I sent to the list earlier in the year. Thanks E -- Erik Hovland erik(a)hovland.org http://hovland.org/

2 1