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

Fw: [xine-cvs] HG: xine-lib: Support Solaris byteorder.h macros.
by Diego 'Flameeyes' Pettenò 14 Jun '07

14 Jun '07

Forwarding one more fix applied to xine-lib now. Begin forwarded message: Date: Wed, 13 Jun 2007 21:31:02 +0000 From: Albert Lee <trisk+xine(a)acm.jhu.edu> To: xine-cvslog(a)lists.sourceforge.net Subject: [xine-cvs] HG: xine-lib: Support Solaris byteorder.h macros. # HG changeset patch # User Albert Lee <trisk+xine(a)acm.jhu.edu> # Date 1181770255 -7200 # Node ID 5082f1f32e32cceb246490acae76317f22d0be44 # Parent 1312dcc392d964d0892d6538b2bbec4d6600deac Support Solaris byteorder.h macros. diff -r 5082f1f32e32cceb246490acae76317f22d0be44 -r 1312dcc392d964d0892d6538b2bbec4d6600deac src/input/libdvdnav/bswap.h --- a/src/input/libdvdnav/bswap.h Wed Jun 13 23:30:55 2007 +0200 +++ b/src/input/libdvdnav/bswap.h Wed Jun 13 23:30:46 2007 +0200 @@ -41,6 +41,12 @@ #define B2N_32(x) x = bswap_32(x) #define B2N_64(x) x = bswap_64(x) +#elif defined(__SVR4) && defined(__sun) +#include <sys/byteorder.h> +#define B2N_16(x) x = BSWAP_16(x) +#define B2N_32(x) x = BSWAP_32(x) +#define B2N_64(x) x = BSWAP_64(x) + #elif defined(__APPLE__) #include <libkern/OSByteOrder.h> #define B2N_16(x) x = OSSwapBigToHostInt16(x) @@ -67,11 +73,11 @@ /* This is a slow but portable implementation, it has multiple evaluation * problems so beware. - * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such + * Old FreeBSD and Windows don't have <byteswap.h> or any other such * functionality! */ -#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) +#elif defined(__FreeBSD__) || defined(__bsdi__) || defined(WIN32) || defined(__CYGWIN__) #define B2N_16(x) \ x = ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1

[PATCH] to win32 build
by Ötvös Attila 11 Jun '07

11 Jun '07

Hi All! Patch to win32 build Note: I didn't create this patch, Erik Lunchpail sent to me (in 2006. febr.). Attila

2 2

[PATCH] get audio and spu attr
by Ötvös Attila 11 Jun '07

11 Jun '07

Hi All! Get audio attr: dvdnav_status_t dvdnav_get_audio_attr(dvdnav_t *self, uint8_t audio_mum, audio_attr_t *audio_attr); Get spu attr: dvdnav_status_t dvdnav_get_spu_attr(dvdnav_t *self, uint8_t audio_mum, subp_attr_t *subp_attr); Best regards! Attila

3 2

r940 - in trunk/libdvdnav/src: dvdnav.c dvdnav.h
by nicodvb 11 Jun '07

11 Jun '07

Author: nicodvb Date: Mon Jun 11 23:14:12 2007 New Revision: 940 Log: implemented dvdnav_get_audio_attr and dvdnav_get_spu_attr; patch by Attila Otvos Modified: trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/dvdnav.h Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c (original) +++ trunk/libdvdnav/src/dvdnav.c Mon Jun 11 23:14:12 2007 @@ -962,6 +962,23 @@ int8_t dvdnav_get_audio_logical_stream(d return retval; } +dvdnav_status_t dvdnav_get_audio_attr(dvdnav_t *this, uint8_t audio_num, audio_attr_t *audio_attr) { + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; + } + pthread_mutex_lock(&this->vm_lock); + if (!this->vm->state.pgc) { + printerr("No current PGC."); + pthread_mutex_unlock(&this->vm_lock); + return -1; + } + *audio_attr=vm_get_audio_attr(this->vm, audio_num); + pthread_mutex_unlock(&this->vm_lock); + + return DVDNAV_STATUS_OK; +} + int8_t dvdnav_get_spu_logical_stream(dvdnav_t *this, uint8_t subp_num) { int8_t retval; @@ -982,6 +999,22 @@ int8_t dvdnav_get_spu_logical_stream(dvd return retval; } +dvdnav_status_t dvdnav_get_spu_attr(dvdnav_t *this, uint8_t audio_num, subp_attr_t *subp_attr) { + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; + } + pthread_mutex_lock(&this->vm_lock); + if (!this->vm->state.pgc) { + printerr("No current PGC."); + pthread_mutex_unlock(&this->vm_lock); + return -1; + } + *subp_attr=vm_get_subp_attr(this->vm, audio_num); + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_OK; +} + int8_t dvdnav_get_active_audio_stream(dvdnav_t *this) { int8_t retval; Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Mon Jun 11 23:14:12 2007 @@ -585,11 +585,23 @@ uint16_t dvdnav_spu_stream_to_lang(dvdna */ int8_t dvdnav_get_audio_logical_stream(dvdnav_t *self, uint8_t audio_num); +#define HAVE_GET_AUDIO_ATTR +/* + * Get audio attr + */ +dvdnav_status_t dvdnav_get_audio_attr(dvdnav_t *self, uint8_t audio_mum, audio_attr_t *audio_attr); + /* * Converts a *physical* (MPEG) subpicture stream id into a logical stream number. */ int8_t dvdnav_get_spu_logical_stream(dvdnav_t *self, uint8_t subp_num); +#define HAVE_GET_SPU_ATTR +/* + * Get spu attr + */ +dvdnav_status_t dvdnav_get_spu_attr(dvdnav_t *self, uint8_t audio_mum, subp_attr_t *subp_attr); + /* * Get active audio stream. */

1 0

r939 - in trunk/libdvdnav2/src: dvdnav.c dvdnav.h
by nicodvb 11 Jun '07

11 Jun '07

Author: nicodvb Date: Mon Jun 11 23:12:33 2007 New Revision: 939 Log: implemented dvdnav_get_audio_attr and dvdnav_get_spu_attr; patch by Attila Otvos Modified: trunk/libdvdnav2/src/dvdnav.c trunk/libdvdnav2/src/dvdnav.h Modified: trunk/libdvdnav2/src/dvdnav.c ============================================================================== --- trunk/libdvdnav2/src/dvdnav.c (original) +++ trunk/libdvdnav2/src/dvdnav.c Mon Jun 11 23:12:33 2007 @@ -947,6 +947,23 @@ int8_t dvdnav_get_audio_logical_stream(d return retval; } +dvdnav_status_t dvdnav_get_audio_attr(dvdnav_t *this, uint8_t audio_num, audio_attr_t *audio_attr) { + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; + } + pthread_mutex_lock(&this->vm_lock); + if (!this->vm->state.pgc) { + printerr("No current PGC."); + pthread_mutex_unlock(&this->vm_lock); + return -1; + } + *audio_attr=vm_get_audio_attr(this->vm, audio_num); + pthread_mutex_unlock(&this->vm_lock); + + return DVDNAV_STATUS_OK; +} + int8_t dvdnav_get_spu_logical_stream(dvdnav_t *this, uint8_t subp_num) { int8_t retval; @@ -967,6 +984,22 @@ int8_t dvdnav_get_spu_logical_stream(dvd return retval; } +dvdnav_status_t dvdnav_get_spu_attr(dvdnav_t *this, uint8_t audio_num, subp_attr_t *subp_attr) { + if(!this->started) { + printerr("Virtual DVD machine not started."); + return -1; + } + pthread_mutex_lock(&this->vm_lock); + if (!this->vm->state.pgc) { + printerr("No current PGC."); + pthread_mutex_unlock(&this->vm_lock); + return -1; + } + *subp_attr=vm_get_subp_attr(this->vm, audio_num); + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_OK; +} + int8_t dvdnav_get_active_audio_stream(dvdnav_t *this) { int8_t retval; Modified: trunk/libdvdnav2/src/dvdnav.h ============================================================================== --- trunk/libdvdnav2/src/dvdnav.h (original) +++ trunk/libdvdnav2/src/dvdnav.h Mon Jun 11 23:12:33 2007 @@ -583,11 +583,23 @@ uint16_t dvdnav_spu_stream_to_lang(dvdna */ int8_t dvdnav_get_audio_logical_stream(dvdnav_t *self, uint8_t audio_num); +#define HAVE_GET_AUDIO_ATTR +/* + * Get audio attr + */ +dvdnav_status_t dvdnav_get_audio_attr(dvdnav_t *self, uint8_t audio_mum, audio_attr_t *audio_attr); + /* * Converts a *physical* (MPEG) subpicture stream id into a logical stream number. */ int8_t dvdnav_get_spu_logical_stream(dvdnav_t *self, uint8_t subp_num); +#define HAVE_GET_SPU_ATTR +/* + * Get spu attr + */ +dvdnav_status_t dvdnav_get_spu_attr(dvdnav_t *self, uint8_t audio_mum, subp_attr_t *subp_attr); + /* * Get active audio stream. */

1 0