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

r883 - trunk/libdvdnav/src/dvdread/dvd_reader.c
by nicodvb 18 Apr '07

18 Apr '07

Author: nicodvb Date: Thu Apr 19 00:41:10 2007 New Revision: 883 Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c Log: avoid leaking file descriptors obtained by opendir(); synced with upstream as reported by Diego Petteno' Modified: trunk/libdvdnav/src/dvdread/dvd_reader.c ============================================================================== --- trunk/libdvdnav/src/dvdread/dvd_reader.c (original) +++ trunk/libdvdnav/src/dvdread/dvd_reader.c Thu Apr 19 00:41:10 2007 @@ -586,10 +586,12 @@ static int findDirFile( const char *path sprintf( filename, "%s%s%s", path, ( ( path[ strlen( path ) - 1 ] == '/' ) ? "" : "/" ), ent->d_name ); + closedir( dir ); return 0; } } + closedir( dir ); return -1; }

1 0

[PATCH] [dvdread] Add support for Darwin hosts
by Diego 'Flameeyes' Pettenò 18 Apr '07

18 Apr '07

Another change that was added to xine-lib (and wasn't updated in the diff file for libdvdnav by the way), this patch adds support for opening the Darwin version of libdvdcss. I've been looking to submit a proper patch to libdvdread upstream too, but the libdvdread code doesn't even support Win32 at the moment, so I'll have to look at that first. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

4 5

r882 - trunk/libdvdnav/src/remap.c
by nicodvb 18 Apr '07

18 Apr '07

Author: nicodvb Date: Thu Apr 19 00:36:58 2007 New Revision: 882 Modified: trunk/libdvdnav/src/remap.c Log: replaced sequency of strncpy() and strncat() by 1 snprintf() and fixed off-by-1 possible buffer oveflow; patch by Diego Petteno' Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c (original) +++ trunk/libdvdnav/src/remap.c Thu Apr 19 00:36:58 2007 @@ -190,10 +190,7 @@ remap_t* remap_loadmap( char *title) { /* Build the map filename */ home = getenv("HOME"); assert(home); - strncpy(fname, home, sizeof(fname)); - strncat(fname, "/.dvdnav/", sizeof(fname)); - strncat(fname, title, sizeof(fname)); - strncat(fname, ".map", sizeof(fname)); + snprintf(fname, sizeof(fname), "%s/.dvdnav/%s.map", home, title); /* Open the map file */ fp = fopen( fname, "r");

1 0

[PATCH] Mark some literals array more "const" (trivial)
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

This is a really trivial patch, it simply marks a few literals arrays as constant pointers to constant characters. The change doesn't affect the functionality of the code, but could avoid possible mistakes in the code that would try to change the literals at runtime, triggering a COW to the dirty rss pages. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

1 0

Don't use raw UDF access for mounted non-encrypted DVDs
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

I'm attaching a patch applied to xine's libdvdnav that is designed to let libdvdnav decide to use the file access rather than the raw access to non-encrypted DVDs if they are mounted, to workaround buggy DVDs where the filesystem is simple ISO9660 rather than UDF. Before you shoot at me, I am not the author of this patch, and I don't like it at all: first it tries to make transparent an opaque type of another library, which is bad on its own, but it also ends up vastly depending on the ABI remaining constant in libdvdcss, which is not something that is guaranteed at all since it's dynamic loaded. I'm sending this just for knowledge, I'd like to see if someone else has a clue how to implement this same feature in a less nasty way. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

3 3

r880 - in trunk/libdvdnav: Makefile configure2
by nicodvb 17 Apr '07

17 Apr '07

Author: nicodvb Date: Wed Apr 18 00:04:32 2007 New Revision: 880 Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Log: --disable-debug && --enable-debug Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Wed Apr 18 00:04:32 2007 @@ -36,7 +36,7 @@ LIB = $(L).a SHLIB = $(L).so -CFLAGS += -g -Wall -funsigned-char +CFLAGS += $(USEDEBUG) -Wall -funsigned-char CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm \ -I$(SRC_PATH)/src/dvdread Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Wed Apr 18 00:04:32 2007 @@ -32,6 +32,8 @@ show_help(){ echo " --disable-static do not build static libraries [default=no]" echo " --enable-shared build shared libraries [default=no]" echo " --disable-shared do not build shared libraries [default=yes]" + echo " --enable-debug compile with debug symbols [default=yes]" + echo " --disable-debug compile without debug symbols [default=no]" echo "Advanced options (experts only):" echo " --cc=CC use C compiler CC [$cc]" echo " --make=MAKE use specified make [$make]" @@ -47,6 +49,7 @@ SHARED=yes STATIC=yes PREFIX=/usr/local/ INSTALLSTRIP=-s +USEDEBUG=-g optimizations="-O3" for opt do @@ -80,6 +83,10 @@ for opt do ;; --disable-opts) optimizations="" ;; + --disable-debug) USEDEBUG="" + ;; + --enable-debug) USEDEBUG="-g" + ;; --help) show_help ;; esac @@ -106,6 +113,7 @@ MAKE=$make CFLAGS=$optimizations $cflags LDFLAGS=$ldflags INSTALLSTRIP=$INSTALLSTRIP +USEDEBUG=$USEDEBUG SRC_PATH="$source_path" SRC_PATH_BARE=$source_path

1 0

[PATCH] Allow building with builddir != srcdir
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

I'm attaching a patch that takes a few more features from FFmpeg's build system, allowing to have builddir != srcdir builds. With this I should be able to start working on the first integration branch for xine-lib. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1

r879 - in trunk/libdvdnav: Makefile configure2
by nicodvb 17 Apr '07

17 Apr '07

Author: nicodvb Date: Tue Apr 17 23:56:53 2007 New Revision: 879 Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/configure2 Log: support for building the library in a different directory; patch by Diego Petteno Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Tue Apr 17 23:56:53 2007 @@ -8,14 +8,14 @@ AR=ar LD=ld RANLIB=ranlib -VPATH+= src +VPATH+= $(SRC_PATH_BARE)/src SRCS = dvdnav.c highlight.c navigation.c read_cache.c remap.c \ searching.c settings.c -VPATH+= src/vm +VPATH+= $(SRC_PATH_BARE)/src/vm SRCS+= decoder.c vm.c vmcmd.c -VPATH+= src/dvdread +VPATH+= $(SRC_PATH_BARE)/src/dvdread SRCS+= dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \ md5.c nav_print.c nav_read.c @@ -37,8 +37,8 @@ SHLIB = $(L).so CFLAGS += -g -Wall -funsigned-char -CFLAGS += -I$(CURDIR) -I$(CURDIR)/src -I$(CURDIR)/src/vm \ - -I$(CURDIR)/src/dvdread +CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm \ + -I$(SRC_PATH)/src/dvdread CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H @@ -77,7 +77,7 @@ version.h: $(SVN_ENTRIES) endif version.h: - sh ./version.sh + sh $(SRC_PATH)/version.sh $(SRC_PATH) # General targets @@ -93,10 +93,10 @@ ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -o $@ $(SHOBJS) .c.so: $(BUILDDEPS) - cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $(CURDIR)/$< + cd $(.OBJDIR) && $(CC) -fPIC -DPIC -MD $(CFLAGS) -c -o $@ $< .c.o: $(BUILDDEPS) - cd $(.OBJDIR) && $(CC) -MD $(CFLAGS) -c -o $@ $(CURDIR)/$< + cd $(.OBJDIR) && $(CC) -MD $(CFLAGS) -c -o $@ $< # Install targets Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Tue Apr 17 23:56:53 2007 @@ -6,6 +6,18 @@ dvdnav_sh_major=`echo $dvdnav_sh_version cc=gcc make=make +# find source path +source_path="`dirname \"$0\"`" +source_path_used="yes" +if test -z "$source_path" -o "$source_path" = "." ; then + source_path="`pwd`" + source_path_used="no" +else + source_path="`cd \"$source_path\" && pwd`" + echo "$source_path" | grep -q '[[:blank:]]' && + die "Out of tree builds are impossible with whitespace in source path." +fi + show_help(){ echo "Usage: configure [options]" echo "Options: [defaults in brackets after descriptions]" @@ -94,6 +106,10 @@ MAKE=$make CFLAGS=$optimizations $cflags LDFLAGS=$ldflags INSTALLSTRIP=$INSTALLSTRIP + +SRC_PATH="$source_path" +SRC_PATH_BARE=$source_path + EOF cat > config.h << EOF @@ -101,6 +117,16 @@ cat > config.h << EOF #include "version.h" EOF +# build tree in object directory if source path is different from current one +if test "$source_path_used" != "no"; then + FILES="\ + Makefile \ + " + for f in $FILES ; do + ln -sf "$source_path/$f" $f + done +fi + echo echo "Done, type 'make install' to build and install"

1 0

[PATCH] [?] Don't check for memcpy() presence, assume it's available
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

I can't think of any case off the top of my head where memcpy() function is not available, and bcopy has to be used instead, but the md5.c source file (from dvdread) seems to be taken out of glibc, and it checks for HAVE_MEMCPY before using it, otherwise uses bcopy. With this patch (that I'm not sure if it's okay to apply as it changes dvdread sources), memcpy check is skipped, and it's always used instead. This also removes the implicit declarations warnings (that become errors when compiled with xine). Note that luckily the return value of memcpy() is never used in md5.c so there's no risk that a broken pointer is dereferenced with the implicit declarations. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

3 5

[PATCH] Remove format warnings on 64-bit systems
by Diego 'Flameeyes' Pettenò 17 Apr '07

17 Apr '07

The attached patch changes llx used for uint64_t types to PRIx64, removing two (four with both shared and static libraries enabled) warnings from the build. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

3 2