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

"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

r1015 - in trunk/libdvdnav: Makefile misc/dvdread-config.sh
by nicodvb 13 Jul '08

13 Jul '08

Author: nicodvb Date: Sat Apr 19 22:18:35 2008 New Revision: 1015 Log: added dvdread-config. Hopefully I didn't make a mess with svn cp Added: trunk/libdvdnav/misc/dvdread-config.sh - copied, changed from r1001, /trunk/libdvdnav/misc/dvdnav-config2.sh Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Sat Apr 19 22:18:35 2008 @@ -60,13 +60,13 @@ DVDREAD_DEPS= ${DVDREAD_OBJS:%.o=%.d} BUILDDEPS = Makefile config.mak ifeq ($(BUILD_SHARED),yes) -all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config -install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config +all: $(SHLIB) $(MINI_SHLIB) $(DVDREAD_SHLIB) dvdnav-config dvdread-config +install: $(SHLIB) $(DVDREAD_SHLIB) install-shared install-dvdnav-config install-dvdread-config endif ifeq ($(BUILD_STATIC),yes) -all: $(LIB) $(DVDREAD_LIB) dvdnav-config -install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config +all: $(LIB) $(DVDREAD_LIB) dvdnav-config dvdread-config +install: $(LIB) $(DVDREAD_LIB) install-static install-dvdnav-config install-dvdread-config endif install: install-headers @@ -188,6 +188,18 @@ install-dvdnav-config: dvdnav-config install -d $(DESTDIR)$(PREFIX)/bin install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config +dvdread-config: $(.OBJDIR) + @echo '#!/bin/sh' > $(.OBJDIR)/dvdread-config + @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdread-config + @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdread-config + @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdread-config + @echo >> $(.OBJDIR)/dvdread-config + cat $(SRC_PATH_BARE)/misc/dvdread-config.sh >> $(.OBJDIR)/dvdread-config + chmod 0755 $(.OBJDIR)/dvdread-config + +install-dvdread-config: dvdread-config + install -d $(DESTDIR)$(PREFIX)/bin + install -m 0755 $(.OBJDIR)/dvdread-config $(DESTDIR)$(PREFIX)/bin/dvdread-config vpath %.so ${.OBJDIR} vpath %.o ${.OBJDIR} Copied: trunk/libdvdnav/misc/dvdread-config.sh (from r1001, /trunk/libdvdnav/misc/dvdnav-config2.sh) ============================================================================== --- /trunk/libdvdnav/misc/dvdnav-config2.sh (original) +++ trunk/libdvdnav/misc/dvdread-config.sh Sat Apr 19 22:18:35 2008 @@ -1,21 +1,14 @@ dvdreadlib="-ldvdread" -dvdreadmsg="[--minilibs]" -if test "$dvdread" = "external"; then - dvdreadmsg="[--minicflags]" - dvdreadcflags="-I$dvdreaddir" - extracflags="-DDVDNAV_USES_EXTERNAL_DVDREAD" -fi usage() { cat <<EOF -Usage: dvdnav-config [OPTIONS] [LIBRARIES] +Usage: dvdread-config [OPTIONS] [LIBRARIES] Options: [--prefix[=DIR]] [--version] [--libs] [--cflags] - $dvdreadmsg EOF exit $1 } @@ -40,19 +33,9 @@ while test $# -gt 0; do --cflags) echo_cflags=yes ;; - --minicflags) - if test "$dvdread" = "external"; then - echo_minicflags=yes - else - usage 1 1>&2 - fi - ;; --libs) echo_libs=yes ;; - --minilibs) - echo_minilibs=yes - ;; *) usage 1 1>&2 ;; @@ -65,17 +48,9 @@ if test "$echo_prefix" = "yes"; then fi if test "$echo_cflags" = "yes"; then - echo -I$prefix/include $dvdreadcflags $extracflags $threadcflags -fi - -if test "$echo_minicflags" = "yes"; then - echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags + echo -I$prefix/include $extracflags fi if test "$echo_libs" = "yes"; then - echo -L$libdir -ldvdnav $dvdreadlib $threadlib + echo -L$libdir $dvdreadlib fi - -if test "$echo_minilibs" = "yes"; then - echo -L$libdir -ldvdnavmini $threadlib -fi

4 4

[PATCH] Fix parallel jobs; sources need version.h
by Dan Nicholson 01 May '08

01 May '08

--- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index fcc3940..85108e5 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,8 @@ endif version.h: sh $(SRC_PATH)/version.sh $(SRC_PATH) +$(SRCS) $(DVDREAD_SRCS): version.h + # General targets -- 1.5.3.2

2 5

[PATCH] Create version.h with released version number when SVN not known
by Dan Nicholson 28 Apr '08

28 Apr '08

--- Makefile | 2 +- version.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 85108e5..c76c72c 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ version.h: $(SVN_ENTRIES) endif version.h: - sh $(SRC_PATH)/version.sh $(SRC_PATH) + sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)" $(SRCS) $(DVDREAD_SRCS): version.h diff --git a/version.sh b/version.sh index 6ef2323..6b4e52e 100755 --- a/version.sh +++ b/version.sh @@ -6,7 +6,11 @@ test $svn_revision || svn_revision=`cd "$1" && \ grep revision .svn/entries 2> /dev/null | cut -d '"' -f2 2> /dev/null` test $svn_revision || svn_revision=UNKNOWN -NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" +if test "$svn_revision" = UNKNOWN && test -n "$2"; then + NEW_REVISION="#define VERSION \"$2\"" +else + NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" +fi OLD_REVISION=`cat version.h 2> /dev/null` # Update version.h only on revision changes to avoid spurious rebuilds -- 1.5.3.2

1 0

[PATCH] Suppress error messages creating version.h from non-SVN checkout
by Dan Nicholson 28 Apr '08

28 Apr '08

--- version.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/version.sh b/version.sh index be67dcd..6ef2323 100755 --- a/version.sh +++ b/version.sh @@ -1,8 +1,9 @@ #!/bin/sh -svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` -test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries | \ - cut -d '"' -f2 2> /dev/null` +svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | \ + grep Revision 2> /dev/null | cut -d' ' -f2` +test $svn_revision || svn_revision=`cd "$1" && \ + grep revision .svn/entries 2> /dev/null | cut -d '"' -f2 2> /dev/null` test $svn_revision || svn_revision=UNKNOWN NEW_REVISION="#define VERSION \"SVN-r$svn_revision\"" -- 1.5.3.2

1 0

r1020 - trunk/libdvdnav/src/dvdread/ifo_read.c
by nicodvb 27 Apr '08

27 Apr '08

Author: nicodvb Date: Sun Apr 27 11:53:45 2008 New Revision: 1020 Log: some debug message to identify the cause of 'Invalid main menu IFO' 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 Apr 27 11:53:45 2008 @@ -121,7 +121,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, /* These are both mandatory. */ if(!ifoRead_FP_PGC(ifofile) || !ifoRead_TT_SRPT(ifofile)) { - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO), ifoRead_FP_PGC() failed.\n"); ifoClose(ifofile); return NULL; } @@ -131,7 +131,7 @@ ifo_handle_t *ifoOpen(dvd_reader_t *dvd, /* This is also mandatory. */ if(!ifoRead_VTS_ATRT(ifofile)) { - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO), ifoRead_VTS_ATRT() failed.\n"); ifoClose(ifofile); return NULL; } @@ -200,7 +200,7 @@ ifo_handle_t *ifoOpenVMGI(dvd_reader_t * if(ifoRead_VMG(ifofile)) return ifofile; - fprintf(stderr, "libdvdread: Invalid main menu IFO (VIDEO_TS.IFO).\n"); + fprintf(stderr, "libdvdread,ifoOpenVMGI(): Invalid main menu IFO (VIDEO_TS.IFO).\n"); ifoClose(ifofile); return NULL; }

1 0

r1018 - in trunk/libdvdnav/src: navigation.c vm/vm.c
by nicodvb 22 Apr '08

22 Apr '08

Author: nicodvb Date: Sun Apr 20 10:29:02 2008 New Revision: 1018 Log: in get_PGCIT() check the validity of vm->vtsi before risking to dereference NULL; also change dvdnav_get_current_menu() accordingly\npatch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/vm/vm.c Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c (original) +++ trunk/libdvdnav/src/navigation.c Sun Apr 20 10:29:02 2008 @@ -104,7 +104,10 @@ dvdnav_status_t dvdnav_current_title_inf if ( (this->vm->state.domain == VTSM_DOMAIN) || (this->vm->state.domain == VMGM_DOMAIN) ) { /* Get current Menu ID: into *part. */ - vm_get_current_menu(this->vm, part); + if(! vm_get_current_menu(this->vm, part)) { + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_ERR; + } if (*part > -1) { *title = 0; pthread_mutex_unlock(&this->vm_lock); Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Sun Apr 20 10:29:02 2008 @@ -1823,13 +1823,15 @@ static pgcit_t* get_MENU_PGCIT(vm_t *vm, /* Uses state to decide what to return */ static pgcit_t* get_PGCIT(vm_t *vm) { - pgcit_t *pgcit; + pgcit_t *pgcit = NULL; switch ((vm->state).domain) { case VTS_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = vm->vtsi->vts_pgcit; break; case VTSM_DOMAIN: + if(!vm->vtsi) return NULL; pgcit = get_MENU_PGCIT(vm, vm->vtsi, (vm->state).registers.SPRM[0]); break; case VMGM_DOMAIN:

4 5

r1019 - trunk/libdvdnav/src/vm/vm.c
by nicodvb 22 Apr '08

22 Apr '08

Author: nicodvb Date: Tue Apr 22 09:36:49 2008 New Revision: 1019 Log: 10l to me: in vm_get_current_menu() I forgot to attach Erik's patch that returned 0 if get_PGCIT() fails Modified: trunk/libdvdnav/src/vm/vm.c Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Tue Apr 22 09:36:49 2008 @@ -612,6 +612,7 @@ int vm_get_current_menu(vm_t *vm, int *m int pgcn; pgcn = (vm->state).pgcN; pgcit = get_PGCIT(vm); + if(pgcit==NULL) return 0; *menuid = pgcit->pgci_srp[pgcn - 1].entry_id & 0xf ; return 1; }

1 0

A few patches for minor defects
by Erik Hovland 21 Apr '08

21 Apr '08

I put the libdvdnav code in MythTV through a static analysis tool and it found some defects. I ported the patches I submitted there to the fork on mplayerhq. I offer them here to you in hopes you find them useful. E -- Erik Hovland mail: erik(a)hovland.org web: http://hovland.org/ PGP/GPG public key available on request

4 9

[propchange]: r1018 - svn:log
by nicodvb 20 Apr '08

20 Apr '08

Author: nicodvb Revision: 1018 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,3 @@ -in get_PGCIT() check the validity of vm->vtsi before risking to dereference NULL; also change dvdnav_get_current_menu() accordingly\npatch by Erik Hovland - erik hovland org \ No newline at end of file +in get_PGCIT() check the validity of vm->vtsi before risking to dereference NULL; +also change dvdnav_get_current_menu() accordingly. +Patch by Erik Hovland - erik hovland org

1 0

r1017 - trunk/libdvdnav/src/dvdread/dvd_input.c
by nicodvb 20 Apr '08

20 Apr '08

Author: nicodvb Date: Sun Apr 20 10:18:52 2008 New Revision: 1017 Log: check that dvdcss_version is not NULL before dereferencing it; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_input.c Modified: trunk/libdvdnav/src/dvdread/dvd_input.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_input.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_input.c Sun Apr 20 10:18:52 2008 @@ -341,7 +341,7 @@ int dvdinput_setup(void) fprintf(stderr, "DVDCSS_VERBOSE %s\n", psz_verbose); */ fprintf(stderr, "libdvdread: Using libdvdcss version %s for DVD access\n", - *dvdcss_version); + dvdcss_version ? *dvdcss_version : ""); /* libdvdcss wrapper functions */ dvdinput_open = css_open;

1 0

r1016 - trunk/libdvdnav/ChangeLog
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 22:19:31 2008 New Revision: 1016 Log: mention dvdread-config Modified: trunk/libdvdnav/ChangeLog Modified: trunk/libdvdnav/ChangeLog ============================================================================== --- trunk/libdvdnav/ChangeLog (original) +++ trunk/libdvdnav/ChangeLog Sat Apr 19 22:19:31 2008 @@ -1,6 +1,7 @@ libdvdnav /4.1.3) * an embarassing amount of fixes regarding potential memory and resource leaks (patches contributed by Erik Hovland) + * added dvdread-config (dvdnav-config's younger brother) libdvdnav (4.1.2) * multiple build system fixes * added dvdnav_describe_title_chapters(title) to get title and chapters

2 1

r1014 - trunk/libdvdnav/ChangeLog
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 21:53:40 2008 New Revision: 1014 Log: mention Erik's fixes for next release Modified: trunk/libdvdnav/ChangeLog Modified: trunk/libdvdnav/ChangeLog ============================================================================== --- trunk/libdvdnav/ChangeLog (original) +++ trunk/libdvdnav/ChangeLog Sat Apr 19 21:53:40 2008 @@ -1,3 +1,6 @@ +libdvdnav /4.1.3) + * an embarassing amount of fixes regarding potential memory and resource leaks + (patches contributed by Erik Hovland) libdvdnav (4.1.2) * multiple build system fixes * added dvdnav_describe_title_chapters(title) to get title and chapters

4 3

r1013 - trunk/libdvdnav/src/remap.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:35:25 2008 New Revision: 1013 Log: in remap_loadmap() close the file pointer before exiting ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/remap.c Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Sat Apr 19 12:35:25 2008 @@ -228,6 +228,7 @@ remap_t* remap_loadmap( char *title) { remap_add_node( map, tmp); } } + fclose(fp); if (map->nblocks == 0 && map->debug == 0) { free(map);

1 0

r1012 - trunk/libdvdnav/src/remap.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:34:31 2008 New Revision: 1012 Log: in remap_loadmap() free map before exiting in case of failure ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/remap.c Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Sat Apr 19 12:34:31 2008 @@ -229,7 +229,10 @@ remap_t* remap_loadmap( char *title) { } } - if (map->nblocks == 0 && map->debug == 0) return NULL; + if (map->nblocks == 0 && map->debug == 0) { + free(map); + return NULL; + } return map; }

1 0

r1011 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:27:37 2008 New Revision: 1011 Log: in DVDDiscID() call DVDCloseFile() before exiting with an error ; patch by Erik Hovland - erik hovland org 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 Sat Apr 19 12:27:37 2008 @@ -1117,6 +1117,7 @@ int DVDDiscID( dvd_reader_t *dvd, unsign char *buffer = (unsigned char *)(((uintptr_t)buffer_base & ~((uintptr_t)2047)) + 2048); if( buffer_base == NULL ) { + DVDCloseFile( dvd_file ); fprintf( stderr, "libdvdread: DVDDiscId, failed to " "allocate memory for file read!\n" ); return -1;

1 0

r1010 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:11:36 2008 New Revision: 1010 Log: in dvdnav_get_next_cache_block() release the mutex if vm_start() failed ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 12:11:36 2008 @@ -416,6 +416,7 @@ dvdnav_status_t dvdnav_get_next_cache_bl /* Start the VM */ if (!vm_start(this->vm)) { printerr("Encrypted or faulty DVD"); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; } this->started = 1;

1 0

r1009 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 12:07:47 2008 New Revision: 1009 Log: added missing mutex around the code in dvdnav_clear() ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 12:07:47 2008 @@ -53,6 +53,7 @@ static dvdnav_status_t dvdnav_clear(dvdnav_t * this) { /* clear everything except file, vm, mutex, readahead */ + pthread_mutex_lock(&this->vm_lock); if (this->file) DVDCloseFile(this->file); this->file = NULL; @@ -70,6 +71,7 @@ static dvdnav_status_t dvdnav_clear(dvdn this->cur_cell_time = 0; dvdnav_read_cache_clear(this->cache); + pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_OK; }

1 0

r1008 - trunk/libdvdnav/src/dvdnav.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:44:15 2008 New Revision: 1008 Log: in dvdnav_open() make sure to NULL-terminate this->path and to not overrun its length; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdnav.c Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Sat Apr 19 11:44:15 2008 @@ -108,7 +108,8 @@ dvdnav_status_t dvdnav_open(dvdnav_t** d } /* Set the path. FIXME: Is a deep copy 'right' */ - strncpy(this->path, path, MAX_PATH_LEN); + strncpy(this->path, path, MAX_PATH_LEN - 1); + this->path[MAX_PATH_LEN - 1] = '\0'; /* Pre-open and close a file so that the CSS-keys are cached. */ this->file = DVDOpenFile(vm_get_dvd_reader(this->vm), 0, DVD_READ_MENU_VOBS);

1 0

r1007 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:40:03 2008 New Revision: 1007 Log: prevent access to index ouf of bounds when iterating over titles; patch by Erik Hovland - erik hovland org 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 Sat Apr 19 11:40:03 2008 @@ -971,7 +971,8 @@ static int DVDReadBlocksPath( dvd_file_t * 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; + if( i + 1 >= TITLES_MAX || !dvd_file->title_devs[ i + 1 ] ) + return ret; /* Read part 2 */ off = dvdinput_seek( dvd_file->title_devs[ i + 1 ], 0 );

1 0

r1006 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:34:55 2008 New Revision: 1006 Log: #define TITLES_MAX as 9 instead of using an hardcodec value ; patch by Erik Hovland - erik hovland org 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 Sat Apr 19 11:34:55 2008 @@ -88,6 +88,8 @@ struct dvd_reader_s { void *udfcache; }; +#define TITLES_MAX 9 + struct dvd_file_s { /* Basic information. */ dvd_reader_t *dvd; @@ -100,8 +102,8 @@ struct dvd_file_s { uint32_t seek_pos; /* Information required for a directory path drive. */ - size_t title_sizes[ 9 ]; - dvd_input_t title_devs[ 9 ]; + size_t title_sizes[ TITLES_MAX ]; + dvd_input_t title_devs[ TITLES_MAX ]; /* Calculated at open-time, size in blocks. */ ssize_t filesize; @@ -441,10 +443,10 @@ dvd_reader_t *DVDOpen( const char *ppath path_copy[ strlen( path_copy ) - 1 ] = '\0'; } - if( strlen( path_copy ) > 9 ) { - if( !strcasecmp( &(path_copy[ strlen( path_copy ) - 9 ]), + if( strlen( path_copy ) > TITLES_MAX ) { + if( !strcasecmp( &(path_copy[ strlen( path_copy ) - TITLES_MAX ]), "/video_ts" ) ) { - path_copy[ strlen( path_copy ) - 9 ] = '\0'; + path_copy[ strlen( path_copy ) - TITLES_MAX ] = '\0'; } } @@ -788,7 +790,7 @@ static dvd_file_t *DVDOpenVOBPath( dvd_r dvd_file->filesize = dvd_file->title_sizes[ 0 ]; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { sprintf( filename, "VTS_%02i_%i.VOB", title, i + 1 ); if( !findDVDFile( dvd, filename, full_path ) ) { @@ -873,7 +875,7 @@ void DVDCloseFile( dvd_file_t *dvd_file if( dvd_file->dvd->isImageFile ) { ; } else { - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( dvd_file->title_devs[ i ] ) { dvdinput_close( dvd_file->title_devs[i] ); } @@ -936,7 +938,7 @@ static int DVDReadBlocksPath( dvd_file_t ret = 0; ret2 = 0; - for( i = 0; i < 9; ++i ) { + for( i = 0; i < TITLES_MAX; ++i ) { if( !dvd_file->title_sizes[ i ] ) return 0; /* Past end of file */ if( offset < dvd_file->title_sizes[ i ] ) {

1 0

r1005 - trunk/libdvdnav/src/dvdread/dvd_udf.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:29:18 2008 New Revision: 1005 Log: prevent string overflow in static buffer using strncat(MAX_UDF_FILE_NAME_LEN-1) instead of strcat() ; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_udf.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_udf.c Sat Apr 19 11:29:18 2008 @@ -802,7 +802,7 @@ uint32_t UDFFindFile( dvd_reader_t *devi *filesize = 0; tokenline[0] = '\0'; - strcat( tokenline, filename ); + strncat(tokenline, filename, MAX_UDF_FILE_NAME_LEN - 1); if(!(GetUDFCache(device, PartitionCache, 0, &partition) &&

1 0

r1004 - trunk/libdvdnav/src/dvdread/dvd_udf.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:19:24 2008 New Revision: 1004 Log: set cached_dir_base=NULL after free()ing it; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c Modified: trunk/libdvdnav/src/dvdread/dvd_udf.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_udf.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_udf.c Sat Apr 19 11:19:24 2008 @@ -562,6 +562,7 @@ static int UDFScanDir( dvd_reader_t *dev cached_dir = (uint8_t *)(((uintptr_t)cached_dir_base & ~((uintptr_t)2047)) + 2048); if( DVDReadLBUDF( device, lbnum, dir_lba, cached_dir, 0) <= 0 ) { free(cached_dir_base); + cached_dir_base = NULL; cached_dir = NULL; } /*

1 0

r1003 - trunk/libdvdnav/examples/menus.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:15:57 2008 New Revision: 1003 Log: removed unused variable dsi; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/examples/menus.c Modified: trunk/libdvdnav/examples/menus.c ============================================================================== --- trunk/libdvdnav/examples/menus.c (original) +++ trunk/libdvdnav/examples/menus.c Sat Apr 19 11:15:57 2008 @@ -215,7 +215,6 @@ int main(int argc, char **argv) { * engine of the player so that it knows the dimensions of the button areas. */ { pci_t *pci; - dsi_t *dsi; /* Applications with fifos should not use these functions to retrieve NAV packets, * they should implement their own NAV handling, because the packet you get from these @@ -223,7 +222,7 @@ int main(int argc, char **argv) { * Applications with fifos should therefore pass the NAV packet through the fifo * and decoding pipeline just like any other data. */ pci = dvdnav_get_current_nav_pci(dvdnav); - dsi = dvdnav_get_current_nav_dsi(dvdnav); + dvdnav_get_current_nav_dsi(dvdnav); if(pci->hli.hl_gi.btn_ns > 0) { int button;

1 0

r1002 - in trunk/libdvdnav/src: navigation.c read_cache.c remap.c searching.c settings.c vm/vm.c
by nicodvb 19 Apr '08

19 Apr '08

Author: nicodvb Date: Sat Apr 19 11:11:14 2008 New Revision: 1002 Log: removed unnecessary inclusion of vmcmd.h; patch by Erik Hovland - erik hovland org Modified: trunk/libdvdnav/src/navigation.c trunk/libdvdnav/src/read_cache.c trunk/libdvdnav/src/remap.c trunk/libdvdnav/src/searching.c trunk/libdvdnav/src/settings.c trunk/libdvdnav/src/vm/vm.c Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c (original) +++ trunk/libdvdnav/src/navigation.c Sat Apr 19 11:11:14 2008 @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c (original) +++ trunk/libdvdnav/src/read_cache.c Sat Apr 19 11:11:14 2008 @@ -42,7 +42,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Sat Apr 19 11:11:14 2008 @@ -45,7 +45,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Sat Apr 19 11:11:14 2008 @@ -38,7 +38,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/settings.c ============================================================================== --- trunk/libdvdnav/src/settings.c (original) +++ trunk/libdvdnav/src/settings.c Sat Apr 19 11:11:14 2008 @@ -35,7 +35,6 @@ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "vm/vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h" Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Sat Apr 19 11:11:14 2008 @@ -48,7 +48,6 @@ #include "decoder.h" #include "remap.h" #include "vm.h" -#include "vmcmd.h" #include "dvdnav.h" #include "dvdnav_internal.h"

1 0

release 4.1.2
by Dominik 'Rathann' Mierzejewski 13 Apr '08

13 Apr '08

Hi. As my first action as the appointed release manager I'd like to release 4.1.2 this Saturday. Wow, this sounded so formal. ;) Anyway, I don't think there are any critical bugs that need fixing before the release and I think I didn't miss putting any important changes in the ChangeLog (if I did, yell). So, we're good to go. I'm going to prepare the tarball, test it on a couple of systems and ask someone who has access to put it on mplayerhq.hu. Or maybe I can even find someone to whip up a simple webpage and put it at http://dvdnav.mplayerhq.hu/ (any volunteers?). 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"

2 4

r1001 - trunk/libdvdnav/configure2
by rathann 13 Apr '08

13 Apr '08

Author: rathann Date: Sun Apr 13 13:31:59 2008 New Revision: 1001 Log: bump version for release Modified: trunk/libdvdnav/configure2 Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Sun Apr 13 13:31:59 2008 @@ -1,6 +1,6 @@ #!/bin/sh -dvdnav_sh_version=4.1.1 +dvdnav_sh_version=4.1.2 dvdnav_sh_major=`echo $dvdnav_sh_version | awk -F. '{print $1}'` cc=gcc

1 0

[PATCH] docs update
by Dominik 'Rathann' Mierzejewski 10 Apr '08

10 Apr '08

Hi. Here's a docs update to reflect current state of affairs better. 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"

2 4

r1000 - trunk/libdvdnav/README
by rathann 10 Apr '08

10 Apr '08

Author: rathann Date: Thu Apr 10 20:46:20 2008 New Revision: 1000 Log: Update to reflect current upstream location. Modified: trunk/libdvdnav/README Modified: trunk/libdvdnav/README ============================================================================== --- trunk/libdvdnav/README (original) +++ trunk/libdvdnav/README Thu Apr 10 20:46:20 2008 @@ -26,8 +26,9 @@ from xine-dvdnav and went into the first Where is it now? ---------------- -libdvdnav is hosted on http://dvd.sourceforge.net/. Please report bugs to the -developers mailinglist at mailto:dvd-devel@lists.sourceforge.net +libdvdnav is hosted on http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ . +Please report bugs to the developers mailinglist at +mailto:dvdnav-discuss@mplayerhq.hu . We are still in beta stage, but libdvdnav is already quite usable. With regular DVD playback, there should not be any serious issues. The library

1 0

r999 - trunk/libdvdnav/ChangeLog
by rathann 10 Apr '08

10 Apr '08

Author: rathann Date: Thu Apr 10 20:45:49 2008 New Revision: 999 Log: - update with current notable changes Modified: trunk/libdvdnav/ChangeLog Modified: trunk/libdvdnav/ChangeLog ============================================================================== --- trunk/libdvdnav/ChangeLog (original) +++ trunk/libdvdnav/ChangeLog Thu Apr 10 20:45:49 2008 @@ -1,3 +1,9 @@ +libdvdnav (4.1.2) + * multiple build system fixes + * added dvdnav_describe_title_chapters(title) to get title and chapters + duration + +libdvdnav (4.1.1) * added dvdnav_audio_stream_channels() to return number of channels * fixed dvdnav_time_search() in multi-angle dvds (but it still needs improvements)

1 0

r998 - in trunk/libdvdnav: Makefile configure2
by rathann 10 Apr '08

10 Apr '08

Author: rathann Date: Thu Apr 10 17:03:03 2008 New Revision: 998 Log: Fix DESTDIR handling Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Thu Apr 10 17:03:03 2008 @@ -120,45 +120,45 @@ endif # Install targets install-headers: - install -d $(incdir) - install -m 644 $(HEADERS) $(incdir) + install -d $(DESTDIR)$(incdir) + install -m 644 $(HEADERS) $(DESTDIR)$(incdir) ifeq ($(DVDREAD),internal) - install -d $(dvdread_incdir) - install -m 644 $(DVDREAD_HEADERS) $(dvdread_incdir) + install -d $(DESTDIR)$(dvdread_incdir) + install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(dvdread_incdir) endif install-shared: $(SHLIB) - install -d $(shlibdir) + install -d $(DESTDIR)$(shlibdir) install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(SHLIB) \ - $(shlibdir)/$(SHLIB).$(SHLIB_VERSION) + $(DESTDIR)$(shlibdir)/$(SHLIB).$(SHLIB_VERSION) install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(MINI_SHLIB) \ - $(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION) + $(DESTDIR)$(shlibdir)/$(MINI_SHLIB).$(SHLIB_VERSION) - cd $(shlibdir) && \ + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(SHLIB).$(SHLIB_VERSION) $(SHLIB).$(SHLIB_MAJOR) - cd $(shlibdir) && \ + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(MINI_SHLIB).$(SHLIB_VERSION) $(MINI_SHLIB).$(SHLIB_MAJOR) - cd $(shlibdir) && \ + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(SHLIB).$(SHLIB_MAJOR) $(SHLIB) - cd $(shlibdir) && \ + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(MINI_SHLIB).$(SHLIB_MAJOR) $(MINI_SHLIB) ifeq ($(DVDREAD),internal) install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_SHLIB) \ - $(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION) - cd $(shlibdir) && \ + $(DESTDIR)$(shlibdir)/$(DVDREAD_SHLIB).$(SHLIB_VERSION) + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(DVDREAD_SHLIB).$(SHLIB_VERSION) $(DVDREAD_SHLIB).$(SHLIB_MAJOR) - cd $(shlibdir) && \ + cd $(DESTDIR)$(shlibdir) && \ ln -sf $(DVDREAD_SHLIB).$(SHLIB_MAJOR) $(DVDREAD_SHLIB) endif install-static: $(LIB) - install -d $(libdir) + install -d $(DESTDIR)$(libdir) - install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(libdir)/$(LIB) + install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(LIB) $(DESTDIR)$(libdir)/$(LIB) ifeq ($(DVDREAD),internal) - install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(libdir)/$(DVDREAD_LIB) + install $(INSTALLSTRIP) -m 755 $(.OBJDIR)/$(DVDREAD_LIB) $(DESTDIR)$(libdir)/$(DVDREAD_LIB) endif @@ -185,8 +185,8 @@ dvdnav-config: $(.OBJDIR) chmod 0755 $(.OBJDIR)/dvdnav-config install-dvdnav-config: dvdnav-config - install -d $(PREFIX)/bin - install -m 0755 $(.OBJDIR)/dvdnav-config $(PREFIX)/bin/dvdnav-config + install -d $(DESTDIR)$(PREFIX)/bin + install -m 0755 $(.OBJDIR)/dvdnav-config $(DESTDIR)$(PREFIX)/bin/dvdnav-config vpath %.so ${.OBJDIR} Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Thu Apr 10 17:03:03 2008 @@ -126,12 +126,11 @@ esac cat > config.mak << EOF # Automatically generated by configure, do not edit -DESTDIR = -PREFIX=\$(DESTDIR)$PREFIX -libdir=\$(DESTDIR)$libdir -shlibdir=\$(DESTDIR)$shlibdir -incdir=\$(DESTDIR)$incdir -dvdread_incdir=\$(DESTDIR)$dvdread_incdir +PREFIX=$PREFIX +libdir=$libdir +shlibdir=$shlibdir +incdir=$incdir +dvdread_incdir=$dvdread_incdir THREADLIB=$threadlib BUILD_SHARED=$SHARED BUILD_STATIC=$STATIC

1 0

Re: [DVDnav-discuss] Fwd: [PATCH] destdir handling fix
by Nico Sabbi 10 Apr '08

10 Apr '08

Il Monday 07 April 2008 23:01:16 hai scritto: > > ---------- Messaggio inoltrato ---------- > From: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> > To: dvdnav-discuss(a)mplayerhq.hu > Date: Mon, 7 Apr 2008 00:59:12 +0200 > Subject: [DVDnav-discuss] [PATCH] destdir handling fix > Hi! > > The attached patch needs to be applied. Otherwise if you use > make DESTDIR=/some/path > the specified path ends up in pkgconfig file, which is wrong. > DESTDIR should only ever be used upon installing the files. > > After it's applied, I'd like to propose making a new (4.1.2?) release. > I'll prepare the tarball and write a news entry for MPlayer page if you > like. > > Regards, > R. > it doesn't seem to work because of +DESTDIR = in configure2. If I remove it all is fine, otherwise [nico@xp libdvdnav]$ make install install -d /usr/local/lib install -s -m 755 obj/libdvdnav.so \ /usr/local/lib/libdvdnav.so.4.1.1 install: impossibile rimuovere `/usr/local/lib/libdvdnav.so.4.1.1': Permission denied make: *** [install-shared] Error 1 regardless if I set DESTDIR before or after running ./configure2

2 4

[PATCH] destdir handling fix
by Dominik 'Rathann' Mierzejewski 06 Apr '08

06 Apr '08

Hi! The attached patch needs to be applied. Otherwise if you use make DESTDIR=/some/path the specified path ends up in pkgconfig file, which is wrong. DESTDIR should only ever be used upon installing the files. After it's applied, I'd like to propose making a new (4.1.2?) release. I'll prepare the tarball and write a news entry for MPlayer page if you like. 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"

1 0