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

VLC patches
by Jean-Baptiste Kempf 04 Dec '07

04 Dec '07

Hello, VLC is now using this version as a base for dvd reading. However, we still apply a patch against it: https://trac.videolan.org/vlc/browser/trunk/extras/contrib/src/Patches/libd… Some of this patch is to compile correctly under some version of cygwin/MSys (lseek, gettimeoftheday and LL) Another part is about forcing to link with libdvdcss. And the last one is to use dvdinput_open(device) instead of open(device, O_RDONLY); I don't understand all the patch (haven't studied it yet), but I wanted to inform you about that. Best Regards, -- Jean-Baptiste Kempf http://www.jbkempf.com/

3 3

Any plan to support ppc?
by Ulion 03 Dec '07

03 Dec '07

Hello, Current libdvdnav seems not work on ppc because the vm error, any plan to support it? -- Ulion

4 10

VLC patches
by Damien Fouilleul 30 Nov '07

30 Nov '07

just a few comments on top of j-b said > >/ > Some of this patch is to compile correctly under some version of/ > >/ > cygwin/MSys (lseek, gettimeoftheday and LL)/ > >/ / > >/ it's ugly and especially out of place: who wrote that part/ > >/ should have fixed cygwin instead/ > ... > Cygwin/MSys being not perfect is known, but telling people to fix their > environment is not really a solution. > > Mingw runtime since 3.10 has gettimeofday, so the first configure.ac > > patch is needed to detect it. > >/ why? doesn't cygwin have dlopen()? /> the libdvdcss part, you can of course not use it... one more thing, those patches are for mingw, not cygwin. they are quite different, mingw is about using windows APIs natively and as such you can't expect to see POSIX compliance, but mingw does provide some POSIX apis that are not part of windows SDK, and each release of mingw contains more of these. we could use the windows equivalent for dlopen(), which is called LoadLibrary() by the way, but VLC for win32 use static archives anyway. maybe in the future. windows does not support the _FILE_OFFSET_BITS=64 kludge, instead it has its own apis called _lseeki64, etc... > >/ > And the last one is to use dvdinput_open(device) instead of /> >/ > open(device, O_RDONLY); /> >/ /> >/ why? /> On win32, you can't open a block device. well, technically you can, but not from a drive letter, which needs be converted to a device path, and that only works on win2000+ Anyway, libdvdread already supports reading block devices on win32, so why not reuse it, and it's compatible with all platforms > >/ > wanted to inform you about that. /> >/ the patch to bswap.h seems to be essentially cosmetical /> Yes, but fixes some weird cygwin/win64 problems, IIRC. well, it's not quite cosmetic, if you look at the following line (((x) & 0x00000000000000ff) << 56)) in order to type the constant, the C compiler usually uses the type with the most convenient storage size that can accommodate it, which in this case would be an int. But it would also consider the type of x, and use its type to evaluate the expression it if its storage size is bigger than a int. therefore if you 100% sure that x would always be an int64_t, then you will never have a problem, but if you use another type such as in32_t, etc.. then <<56 would overflow and cause a problem, by using 0x00000000000000ffLL, you force the compiler to use int64_t regardless of the type of x. > >/ The diff in dvd_input.c: /> >/ - for(i=25; i < 73; i++ ) { /> >/ + for(i=40; i < 73; i++ ) { /> >/ is unexplainable. Can you shed some light? /> This diff is not in dvd_input.c but in vm.c and is realted to the use of > dvdinput_open. > I can ask more to damien. i got those offsets from libdvdcss (libdvdcss.c:431), and they do match what you physically see on the DVD. Damien

4 3

r975 - in trunk/libdvdnav/src: dvdnav.h searching.c
by nicodvb 29 Nov '07

29 Nov '07

Author: nicodvb Date: Fri Nov 30 00:24:05 2007 New Revision: 975 Log: now dvdnav_describe_title_chapters() also returns the duration of the title Modified: trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/searching.c Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Fri Nov 30 00:24:05 2007 @@ -286,10 +286,11 @@ dvdnav_status_t dvdnav_part_play(dvdnav_ /* * Stores in *times an array (that the application *must* free) of * dvdtimes corresponding to the chapter times for the chosen title. + * *duration will have the duration of the title * The number of entries in *times is the result of the function. * On error *times is NULL and the output is 0 */ -uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times); +uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times, uint64_t *duration); /* * Play the specified amount of parts of the specified title of Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Fri Nov 30 00:24:05 2007 @@ -551,7 +551,7 @@ dvdnav_status_t dvdnav_get_position_in_t return DVDNAV_STATUS_OK; } -uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times) { +uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times, uint64_t *duration) { int32_t retval=0; uint16_t parts, i; title_info_t *ptitle = NULL; @@ -562,6 +562,7 @@ uint32_t dvdnav_describe_title_chapters( uint64_t length, *tmp=NULL; *times = NULL; + *duration = 0; pthread_mutex_lock(&this->vm_lock); if(!this->vm->vmgi) { printerr("Bad VM state or missing VTSI."); @@ -613,6 +614,7 @@ uint32_t dvdnav_describe_title_chapters( cellnr++; } while(cellnr < endcellnr); } + *duration = length; vm_ifo_close(ifo); retval = parts; *times = tmp;

1 0

r974 - trunk/libdvdnav/src/searching.c
by nicodvb 29 Nov '07

29 Nov '07

Author: nicodvb Date: Fri Nov 30 00:09:59 2007 New Revision: 974 Log: in dvdnav_describe_title_chapters() init *times to NULL, so if something fails we don't leave the ptr uninited Modified: trunk/libdvdnav/src/searching.c Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Fri Nov 30 00:09:59 2007 @@ -561,6 +561,7 @@ uint32_t dvdnav_describe_title_chapters( cell_playback_t *cell; uint64_t length, *tmp=NULL; + *times = NULL; pthread_mutex_lock(&this->vm_lock); if(!this->vm->vmgi) { printerr("Bad VM state or missing VTSI.");

1 0

Should the mplayer configure tobe fixed to link dvdnav instead of minilib?
by Ulion 29 Nov '07

29 Nov '07

Hello, It seems the minilib already be removed in current libdvdnav svn at least for static build. And the libdvdnav no longer include dvdread, so mplayer can link to the libdvdnav instead of minilib. So should the mplayer configure file be fixed else it will break users using static minilibs, since newest stream_dvdnav update used a new function only static libdvdnav have. -- Ulion

3 2

r973 - in trunk/libdvdnav/src: dvdnav.h searching.c
by nicodvb 28 Nov '07

28 Nov '07

Author: nicodvb Date: Thu Nov 29 00:19:00 2007 New Revision: 973 Log: added dvdnav_describe_title_chapters(title) Modified: trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/searching.c Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Thu Nov 29 00:19:00 2007 @@ -284,6 +284,14 @@ dvdnav_status_t dvdnav_title_play(dvdnav dvdnav_status_t dvdnav_part_play(dvdnav_t *self, int32_t title, int32_t part); /* + * Stores in *times an array (that the application *must* free) of + * dvdtimes corresponding to the chapter times for the chosen title. + * The number of entries in *times is the result of the function. + * On error *times is NULL and the output is 0 + */ +uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times); + +/* * Play the specified amount of parts of the specified title of * the DVD then STOP. * Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c (original) +++ trunk/libdvdnav/src/searching.c Thu Nov 29 00:19:00 2007 @@ -30,6 +30,7 @@ #include <limits.h> #include <stdio.h> #include <string.h> +#include <stdlib.h> #include <sys/time.h> #include "dvd_types.h" #include "nav_types.h" @@ -549,3 +550,75 @@ dvdnav_status_t dvdnav_get_position_in_t return DVDNAV_STATUS_OK; } + +uint32_t dvdnav_describe_title_chapters(dvdnav_t *this, int32_t title, uint64_t **times) { + int32_t retval=0; + uint16_t parts, i; + title_info_t *ptitle = NULL; + ptt_info_t *ptt = NULL; + ifo_handle_t *ifo; + pgc_t *pgc; + cell_playback_t *cell; + uint64_t length, *tmp=NULL; + + pthread_mutex_lock(&this->vm_lock); + if(!this->vm->vmgi) { + printerr("Bad VM state or missing VTSI."); + goto fail; + } + if(!this->started) { + /* don't report an error but be nice */ + vm_start(this->vm); + this->started = 1; + } + ifo = vm_get_title_ifo(this->vm, title); + if(!ifo || !ifo->vts_pgcit) { + printerr("Couldn't open IFO for chosen title, exit."); + goto fail; + } + + ptitle = &this->vm->vmgi->tt_srpt->title[title-1]; + parts = ptitle->nr_of_ptts; + ptt = ifo->vts_ptt_srpt->title[ptitle->vts_ttn-1].ptt; + + tmp = calloc(1, sizeof(uint64_t)*parts); + if(!tmp) + goto fail; + + length = 0; + for(i=0; i<parts; i++) { + uint32_t cellnr, endcellnr; + pgc = ifo->vts_pgcit->pgci_srp[ptt[i].pgcn-1].pgc; + if(ptt[i].pgn > pgc->nr_of_programs) { + printerr("WRONG part number."); + goto fail; + } + + cellnr = pgc->program_map[ptt[i].pgn-1]; + if(ptt[i].pgn < pgc->nr_of_programs) + endcellnr = pgc->program_map[ptt[i].pgn]; + else + endcellnr = 0; + + do { + cell = &pgc->cell_playback[cellnr-1]; + if(!(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK && + cell->block_mode != BLOCK_MODE_FIRST_CELL + )) + { + tmp[i] = length + dvdnav_convert_time(&cell->playback_time); + length = tmp[i]; + } + cellnr++; + } while(cellnr < endcellnr); + } + vm_ifo_close(ifo); + retval = parts; + *times = tmp; + +fail: + pthread_mutex_unlock(&this->vm_lock); + if(!retval && tmp) + free(tmp); + return retval; +}

1 0

r972 - in trunk/libdvdnav/src/vm: vm.c vm.h
by nicodvb 28 Nov '07

28 Nov '07

Author: nicodvb Date: Thu Nov 29 00:13:50 2007 New Revision: 972 Log: added utility functions vm_get_title_ifo() and vm_ifo_close() to proxy dvdread functions to dvdnav proper. These functions are used in upcoming patch to describe the chapters of a title Modified: trunk/libdvdnav/src/vm/vm.c trunk/libdvdnav/src/vm/vm.h Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c (original) +++ trunk/libdvdnav/src/vm/vm.c Thu Nov 29 00:13:50 2007 @@ -1844,6 +1844,23 @@ static pgcit_t* get_PGCIT(vm_t *vm) { return pgcit; } +//return the ifo_handle_t describing required title, used to +//identify chapters +ifo_handle_t *vm_get_title_ifo(vm_t *vm, uint32_t title) +{ + ifo_handle_t *ifo = NULL; + uint8_t titleset_nr; + if((title < 1) || (title > vm->vmgi->tt_srpt->nr_of_srpts)) + return NULL; + titleset_nr = vm->vmgi->tt_srpt->title[title-1].title_set_nr; + ifo = ifoOpen(vm->dvd, titleset_nr); + return ifo; +} + +void vm_ifo_close(ifo_handle_t *ifo) +{ + ifoClose(ifo); +} /* Debug functions */ Modified: trunk/libdvdnav/src/vm/vm.h ============================================================================== --- trunk/libdvdnav/src/vm/vm.h (original) +++ trunk/libdvdnav/src/vm/vm.h Thu Nov 29 00:13:50 2007 @@ -168,6 +168,8 @@ int vm_get_video_scale_permission(vm_t video_attr_t vm_get_video_attr(vm_t *vm); audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN); subp_attr_t vm_get_subp_attr(vm_t *vm, int streamN); +ifo_handle_t *vm_get_title_ifo(vm_t *vm, uint32_t title); +void vm_ifo_close(ifo_handle_t *ifo); /* Uncomment for VM command tracing */ /* #define TRACE */

1 0

r971 - trunk/libdvdnav/Makefile
by nicodvb 25 Nov '07

25 Nov '07

Author: nicodvb Date: Sun Nov 25 10:05:59 2007 New Revision: 971 Log: replaced echo -e with @echo in Makefile; (seems to fix building in os my-name-indicates-evolution-but-i-still-have-to-begin) ; patch by Ulion Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Sun Nov 25 10:05:59 2007 @@ -173,12 +173,14 @@ distclean: clean rm -rf config.mak dvdnav-config: $(.OBJDIR) - echo -e '#!/bin/sh\n\nprefix='$(PREFIX)'\n' > $(.OBJDIR)/dvdnav-config - echo -e 'libdir='$(shlibdir)'\n' >> $(.OBJDIR)/dvdnav-config - echo -e 'version='$(SHLIB_VERSION)'\n' >> $(.OBJDIR)/dvdnav-config - echo -e 'dvdread='$(DVDREAD)'\n' >> $(.OBJDIR)/dvdnav-config - echo -e 'dvdreaddir='$(DVDREAD_DIR)'\n' >> $(.OBJDIR)/dvdnav-config - echo -e 'threadlib='$(THREADLIB)'\n\n' >> $(.OBJDIR)/dvdnav-config + @echo '#!/bin/sh' > $(.OBJDIR)/dvdnav-config + @echo 'prefix='$(PREFIX) >> $(.OBJDIR)/dvdnav-config + @echo 'libdir='$(shlibdir) >> $(.OBJDIR)/dvdnav-config + @echo 'version='$(SHLIB_VERSION) >> $(.OBJDIR)/dvdnav-config + @echo 'dvdread='$(DVDREAD) >> $(.OBJDIR)/dvdnav-config + @echo 'dvdreaddir='$(DVDREAD_DIR) >> $(.OBJDIR)/dvdnav-config + @echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config + @echo >> $(.OBJDIR)/dvdnav-config cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config

1 0

[PATCH] bugfix for compile minilib of libdvdnav
by Ulion 25 Nov '07

25 Nov '07

Hello, There's a little bug in libdvdnav/Makefile prevent from compiling minilib, here's fix: Index: libdvdnav/Makefile =================================================================== --- libdvdnav/Makefile (revision 955) +++ libdvdnav/Makefile (working copy) @@ -21,7 +21,7 @@ CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H -ifeq ($(DVDREAD),internal) +ifeq ($(DVDREAD),"internal") L=libdvdnav VPATH+= $(SRC_PATH_BARE)/src/dvdread HEADERS += src/dvdread/dvd_reader.h \ -- Ulion

4 13