January 2015 - DVDnav-discuss - lists.mplayerhq.hu

[PATCH] ifo_types.h: fix 'warning: `gcc_struct' attribute directive ignored'
by KO Myung-Hun 29 Jan '15

29 Jan '15

gcc_struct has been supported since gcc 3.4. --- src/dvdread/ifo_types.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/dvdread/ifo_types.h b/src/dvdread/ifo_types.h index 10bdab5..33f0346 100644 --- a/src/dvdread/ifo_types.h +++ b/src/dvdread/ifo_types.h @@ -32,7 +32,11 @@ #if defined(__GNUC__) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) #define ATTRIBUTE_PACKED __attribute__ ((packed,gcc_struct)) +#else +#define ATTRIBUTE_PACKED __attribute__ ((packed)) +#endif #define PRAGMA_PACK 0 #endif #endif -- 1.8.5.2

1 0

Tag 5.0.3 : libdvdnav 5.0.3
by git＠videolan.org 28 Jan '15

28 Jan '15

[libdvdnav] [branch: refs/tags/5.0.3] Tag: 6ed5456488b4e2feb5f3c1be77bdd26b104d3f94 > http://git.videolan.org/gitweb.cgi/libdvdnav.git?a=tag;h=6ed5456488b4e2feb5… Tagger: Jean-Baptiste Kempf <jb(a)videolan.org> Date: Wed Jan 28 15:02:05 2015 +0100 libdvdnav 5.0.3 This minor release fixes a regression when reading a DVD label, and adds dvdnav_open_stream to read from virtual devices with read/seek callbacks

1 0

[PATCH] src/dvd_input.c: use dvdcss2.dll instead of dvdcss.dll on OS/2
by KO Myung-Hun 28 Jan '15

28 Jan '15

libtool creates a versioned dll on OS/2 as well. --- src/dvd_input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dvd_input.c b/src/dvd_input.c index 2d6a8af..a89c08d 100644 --- a/src/dvd_input.c +++ b/src/dvd_input.c @@ -287,7 +287,7 @@ int dvdinput_setup(void) #elif defined(WIN32) #define CSS_LIB "libdvdcss-2.dll" #elif defined(__OS2__) - #define CSS_LIB "dvdcss.dll" + #define CSS_LIB "dvdcss2.dll" #else #define CSS_LIB "libdvdcss.so.2" #endif -- 1.8.5.2

2 2

Update Changelog and release version
by git＠videolan.org 27 Jan '15

27 Jan '15

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Tue Jan 27 16:56:57 2015 +0100| [7554e0a90610fde12a96cc032b9335bb966f41f5] | committer: Jean-Baptiste Kempf Update Changelog and release version > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=7554e0a90610fd… --- ChangeLog | 1 + configure.ac | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8cc42a3..5fce282 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ libdvdnav (5.0.3) * added dvdnav_open_stream to read from external read/seek callbacks + * fixed reading DVD label regression libdvdnav (5.0.2) * fixed 2 wrong asserts (LP #1236939, #570790) diff --git a/configure.ac b/configure.ac index 786efbe..fd9a4e7 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl These are defined in m4 so they can be passed to AC_INIT dnl -------------------------------------------------------------- m4_define([dvdnav_major], [5]) m4_define([dvdnav_minor], [0]) -m4_define([dvdnav_sub], [2]) +m4_define([dvdnav_sub], [3]) m4_define([dvdnav_pre], []) AC_INIT([libdvdnav], [dvdnav_major.dvdnav_minor.dvdnav_sub[]dvdnav_pre])

1 0

add dvdnav_open_stream
by git＠videolan.org 27 Jan '15

27 Jan '15

libdvdnav | branch: master | Thomas Guillem <tom(a)gllm.fr> | Fri Oct 17 15:45:34 2014 +0200| [48102c2a5252e2e4ce3e2d71154c79ba8e339de9] | committer: Jean-Baptiste Kempf add dvdnav_open_stream open a DVD Device using external read/seek callbacks (see libdvdcss). Signed-off-by: Jean-Baptiste Kempf <jb(a)videolan.org> > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=48102c2a5252e2… --- ChangeLog | 3 +++ configure.ac | 2 +- src/dvdnav.c | 26 ++++++++++++++++++++------ src/dvdnav/dvdnav.h | 16 +++++++++++----- src/vm/vm.c | 12 ++++++++---- src/vm/vm.h | 3 ++- 6 files changed, 45 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93e53dc..8cc42a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +libdvdnav (5.0.3) + * added dvdnav_open_stream to read from external read/seek callbacks + libdvdnav (5.0.2) * fixed 2 wrong asserts (LP #1236939, #570790) * fixed 2 crashes (in dvdnav_get_position and dvdnav_get_position_in_title) diff --git a/configure.ac b/configure.ac index b29d879..786efbe 100644 --- a/configure.ac +++ b/configure.ac @@ -97,7 +97,7 @@ esac AC_SUBST(THREAD_LIBS) AC_SUBST(THREAD_CFLAGS) -PKG_CHECK_MODULES([DVDREAD], [dvdread]) +PKG_CHECK_MODULES([DVDREAD], [dvdread >= 5.0.2]) dnl --------------------------------------------- dnl Check for bitfield compiler flag diff --git a/src/dvdnav.c b/src/dvdnav.c index 69bc4f8..ae267d5 100644 --- a/src/dvdnav.c +++ b/src/dvdnav.c @@ -145,7 +145,9 @@ dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) { return DVDNAV_STATUS_OK; } -dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { +static dvdnav_status_t dvdnav_open_common(dvdnav_t** dest, const char *path, + void *stream, + dvdnav_stream_cb *stream_cb) { dvdnav_t *this; struct timeval time; @@ -167,15 +169,18 @@ dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { printerr("Error initialising the DVD VM."); goto fail; } - if(!vm_reset(this->vm, path)) { + if(!vm_reset(this->vm, path, stream, stream_cb)) { printerr("Error starting the VM / opening the DVD device."); goto fail; } /* Set the path. */ - this->path = strdup(path); - if(!this->path) - goto fail; + if(path != NULL) + { + this->path = strdup(path); + if(!this->path) + goto fail; + } /* 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); @@ -203,6 +208,15 @@ fail: return DVDNAV_STATUS_ERR; } +dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) { + return dvdnav_open_common(dest, path, NULL, NULL); +} + +dvdnav_status_t dvdnav_open_stream(dvdnav_t** dest, + void *stream, dvdnav_stream_cb *stream_cb) { + return dvdnav_open_common(dest, NULL, stream, stream_cb); +} + dvdnav_status_t dvdnav_close(dvdnav_t *this) { #ifdef LOG_DEBUG @@ -250,7 +264,7 @@ dvdnav_status_t dvdnav_reset(dvdnav_t *this) { #ifdef LOG_DEBUG fprintf(MSG_OUT, "libdvdnav: reseting vm\n"); #endif - if(!vm_reset(this->vm, NULL)) { + if(!vm_reset(this->vm, NULL, NULL, NULL)) { printerr("Error restarting the VM."); pthread_mutex_unlock(&this->vm_lock); return DVDNAV_STATUS_ERR; diff --git a/src/dvdnav/dvdnav.h b/src/dvdnav/dvdnav.h index 4254534..8894fe5 100644 --- a/src/dvdnav/dvdnav.h +++ b/src/dvdnav/dvdnav.h @@ -55,6 +55,8 @@ typedef struct dvdnav_s dvdnav_t; /* Status as reported by most of libdvdnav's functions */ typedef int32_t dvdnav_status_t; +typedef dvd_reader_stream_cb dvdnav_stream_cb; + /* * Unless otherwise stated, all functions return DVDNAV_STATUS_OK if * they succeeded, otherwise DVDNAV_STATUS_ERR is returned and the error may @@ -73,15 +75,19 @@ typedef int32_t dvdnav_status_t; */ /* - * Attempts to open the DVD drive at the specified path and pre-cache - * the CSS-keys. libdvdread is used to access the DVD, so any source - * supported by libdvdread can be given with "path". Currently, - * libdvdread can access: DVD drives, DVD image files, DVD file-by-file - * copies. + * Attempts to open the DVD drive at the specified path or using external + * seek/read functions (dvdnav_open_stream) and pre-cache the CSS-keys. + * libdvdread is used to access the DVD, so any source supported by libdvdread + * can be given with "path" or "stream_cb". Currently, using dvdnav_open, + * libdvdread can access : DVD drives, DVD image files, DVD file-by-file + * copies. Using dvdnav_open_stream, libdvdread can access any kind of DVD + * storage via custom implementation of seek/read functions. * * The resulting dvdnav_t handle will be written to *dest. */ dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path); +dvdnav_status_t +dvdnav_open_stream(dvdnav_t **dest, void *stream, dvdnav_stream_cb *stream_cb); dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src); dvdnav_status_t dvdnav_free_dup(dvdnav_t * _this); diff --git a/src/vm/vm.c b/src/vm/vm.c index 1e87376..869dd05 100644 --- a/src/vm/vm.c +++ b/src/vm/vm.c @@ -292,7 +292,7 @@ dvd_reader_t *vm_get_dvd_reader(vm_t *vm) { int vm_start(vm_t *vm) { if (vm->stopped) { - if (!vm_reset(vm, NULL)) + if (!vm_reset(vm, NULL, NULL, NULL)) return 0; vm->stopped = 0; @@ -325,7 +325,8 @@ static void vm_close(vm_t *vm) { vm->stopped = 1; } -int vm_reset(vm_t *vm, const char *dvdroot) { +int vm_reset(vm_t *vm, const char *dvdroot, + void *stream, dvdnav_stream_cb *stream_cb) { /* Setup State */ memset(vm->state.registers.SPRM, 0, sizeof(vm->state.registers.SPRM)); memset(vm->state.registers.GPRM, 0, sizeof(vm->state.registers.GPRM)); @@ -362,12 +363,15 @@ int vm_reset(vm_t *vm, const char *dvdroot) { vm->hop_channel = 0; - if (vm->dvd && dvdroot) { + if (vm->dvd && (dvdroot || (stream && stream_cb))) { /* a new dvd device has been requested */ vm_close(vm); } if (!vm->dvd) { - vm->dvd = DVDOpen(dvdroot); + if(dvdroot) + vm->dvd = DVDOpen(dvdroot); + else if(stream && stream_cb) + vm->dvd = DVDOpenStream(stream, (dvd_reader_stream_cb *)stream_cb); if(!vm->dvd) { fprintf(MSG_OUT, "libdvdnav: vm: failed to open/read the DVD\n"); return 0; diff --git a/src/vm/vm.h b/src/vm/vm.h index 57498d2..e4b01c2 100644 --- a/src/vm/vm.h +++ b/src/vm/vm.h @@ -114,7 +114,8 @@ dvd_reader_t *vm_get_dvd_reader(vm_t *vm); /* Basic Handling */ int vm_start(vm_t *vm); void vm_stop(vm_t *vm); -int vm_reset(vm_t *vm, const char *dvdroot); +int vm_reset(vm_t *vm, const char *dvdroot, void *stream, + dvdnav_stream_cb *stream_cb); /* copying and merging - useful for try-running an operation */ vm_t *vm_new_copy(vm_t *vm);

1 0

Update .so version because of added API
by git＠videolan.org 27 Jan '15

27 Jan '15

libdvdnav | branch: master | Jean-Baptiste Kempf <jb(a)videolan.org> | Tue Jan 27 16:59:09 2015 +0100| [5fb919774444aa382f6e02cb63801c82f2c38325] | committer: Jean-Baptiste Kempf Update .so version because of added API > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=5fb919774444aa… --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index fd9a4e7..af3f4fa 100644 --- a/configure.ac +++ b/configure.ac @@ -56,9 +56,9 @@ dnl are platform dependent dnl * in Linux, the library will be named dnl libname.so.(DVDNAV_LT_CURRENT - DVDNAV_LT_AGE).DVDNAV_LT_AGE.DVDNAV_LT_REVISION -DVDNAV_LT_CURRENT=5 -DVDNAV_LT_AGE=1 -DVDNAV_LT_REVISION=2 +DVDNAV_LT_CURRENT=6 +DVDNAV_LT_AGE=2 +DVDNAV_LT_REVISION=0 AC_SUBST(DVDNAV_LT_CURRENT) AC_SUBST(DVDNAV_LT_AGE)

1 0

libdvdread: ifoRead functions need proper error handling
by Steve Dibb 14 Jan '15

14 Jan '15

The next major issue I wanna tackle re the libdvdread bugs is fixing ifoRead*() functions. The problem is really simple: the code runs CHECK_VALUE() all over the place, but doesn't actually quit when it hits a value that is going to break reading the IFO. The whole thing is a mess, with a lot of different scenarios. For example, there are some variables that it doesn't matter what they're set to, since they're not used anywhere else when looking at the data. The value checks can be removed, or ignored. zero* ones are an example. Another is that there's a lot of variables where the original code just guesses at what are some sane values (nr_of_lus), but doesn't actually do anything if it's out of bounds or not. A lot of them are just simple checks to see if the sectors are actually in sequential order. Last of all, there's some value checks that are just commented out, or flagged as ?? in the code, with no documentation present. The good thing is that we have enough sane checks that we can run, where we have specs or obvious answers to guide us, that will fix a lot of issues. In each case, it's really simple design -- if something breaks, then just stop trying to read the IFO and it'll be ignored, and considered garbage. That's it. Super easy. It just needs to be cleaned up, which I totally don't mind doing, but I want to wait to see how my previous patches get applied so I don't dig myself into a further hole trying to manage git branches. Steve

2 1

Fix reading DVD label
by git＠videolan.org 13 Jan '15

13 Jan '15

libdvdnav | branch: master | John Stebbins <stebbins(a)jetheaddev.com> | Tue Jan 13 11:07:03 2015 -0700| [1cdbd6909097cf36f3357a92de482ec9980ae7ed] | committer: John Stebbins Fix reading DVD label This was inadvertently removed with REMAP > http://git.videolan.org/gitweb.cgi/libdvdnav.git/?a=commit;h=1cdbd6909097cf… --- src/vm/vm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vm/vm.c b/src/vm/vm.c index 7e4d594..1e87376 100644 --- a/src/vm/vm.c +++ b/src/vm/vm.c @@ -402,6 +402,9 @@ int vm_reset(vm_t *vm, const char *dvdroot) { /* return 0; Not really used for now.. */ } /* ifoRead_TXTDT_MGI(vmgi); Not implemented yet */ + if(dvd_read_name(vm->dvd_name, vm->dvd_serial, dvdroot) != 1) { + fprintf(MSG_OUT, "libdvdnav: vm: dvd_read_name failed\n"); + } } if (vm->vmgi) { int i, mask;

1 0

dvdread: beandog branch with fixes
by Steve Dibb 09 Jan '15

09 Jan '15

While I appreciate everyone's help in trying to get me up to speed on git, I was spending more time playing with it than actually coding, so I am trying something else instead. I created my own branch and pushed the changes to github. Hopefully someone smarter than me can figure out how to pull those into the main branch. You can see all the commits here: https://github.com/beandog/dvdread/commits/beandog The majority of the changes are deprecating ifoFree_* functions that are making the code confusing to read or are unnecessary since they are called only once, plus checking for NULL pointers properly and setting them where necessary. There's a lot of changes from using malloc to calloc since each ifoRead functions partially import some of the data, and I added it as a safety measure to make sure there's no garbage. In dvd_reader.c, changing to use calloc actually fixed some of Thomas' fuzzed DVDs parsing, when opening the DVD file, so that's good. That's about it. I dunno where we go from here, or how I can help out. Thanks, Steve

1 1

Re: [DVDnav-discuss] [libdvdnav-devel] [PATCH] Cleanup ifoFree()
by Steve Dibb 08 Jan '15

08 Jan '15

On Tue, 6 Jan 2015 19:24:10 +0100 Jean-Baptiste Kempf <jb(a)videolan.org> wrote: > On 06 Jan, Steve Dibb wrote : > > On Tue, 6 Jan 2015 09:38:47 +0100 > > Jean-Baptiste Kempf <jb(a)videolan.org> wrote: > > > > > This is a break of the API, of course. You cannot do this. > > > > K, I'll revamp it. > > You can keep empty functions though, AND mark them as deprecated. How do I mark it as deprecated? Steve

1 0