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

[PATCH] UDF2.50 part 1
by Jorgen Lundman 06 Oct '11

06 Oct '11

Separated RAR support, as it is the most questionble change in the old patch. Told emacs to never use tabs too, so it should be cleaner. Add UDF2.50 logic, which includes BD5ISO, and HD-DVD support. Support non-DVD style access. (File iteration, and reading). Diffed against svn 1153. This patch includes: 1. Add ExtFinfo (262) support 2. Add FileType (250) re-direct support 3. DVDOpendir/DVDReaddir/DVDClosedir/DVDOpenFile for UDF access. 4. dvdread-1.9.7 stat methods for obtaining VOB data and sizes 5. AD chaining, instead of assuming files will always fit in 1 AD group. 6. dvd_udf API uses "UDF_FILE" type instead of "starting block number". 7. Separate struct AD and struct FileAD instead of ugly 64->32 bit work. 8. Minor memory clearing problems, and memory leaks. Lund -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home) -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home) -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home)

6 35

"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

dvdbackup and the skipping unused/bad sectors patch
by Benjamin Drung 11 Jan '09

11 Jan '09

Hi, Don Mahurin has modified [1] dvdbackup [2] to find and avoid unused blocks by following title set titles, and then skips the unused blocks. The purpose of this modification is to avoid possible bad sectors that sometimes occur, by manufacturer defect or intention, in unused regions of the disc. The titleset titles are followed using libdvdread and "libdvdvm" extracted from libdvdnav. The "libdvdvm" parts are not perfect, as some jump instructions are skipped to avoid the actual execution of the Jump, which fails in this isolated use of the library. It would be nice if this "libdvdnav" could be separated from libdvdnav into a standalone library. In libdvdnav 4.1.3 there is already an directory called vm. [1] http://dvdbackupx.openright.org/ [2] http://dvdbackup.sourceforge.net/ Regards, Benjamin Drung

3 4

r1162 - in trunk/libdvdread: Makefile src/Makefile.am src/bitreader.c src/bitreader.h src/dvd_input.c src/dvd_reader.c src/dvd_reader.h src/dvd_udf.c src/dvd_udf.h src/dvdread src/dvdread/bitreader...
by reimar 07 Jan '09

07 Jan '09

Author: reimar Date: Wed Dec 31 09:43:03 2008 New Revision: 1162 Log: Move installed headers into dvdread directory to make them easier to use in a consistent way without installing. Added: trunk/libdvdread/src/dvdread/ trunk/libdvdread/src/dvdread/bitreader.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/bitreader.h trunk/libdvdread/src/dvdread/dvd_reader.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/dvd_reader.h trunk/libdvdread/src/dvdread/dvd_udf.h (contents, props changed) - copied, changed from r1159, trunk/libdvdread/src/dvd_udf.h trunk/libdvdread/src/dvdread/ifo_print.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/ifo_print.h trunk/libdvdread/src/dvdread/ifo_read.h (contents, props changed) - copied, changed from r1159, trunk/libdvdread/src/ifo_read.h trunk/libdvdread/src/dvdread/ifo_types.h (contents, props changed) - copied, changed from r1159, trunk/libdvdread/src/ifo_types.h trunk/libdvdread/src/dvdread/nav_print.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/nav_print.h trunk/libdvdread/src/dvdread/nav_read.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/nav_read.h trunk/libdvdread/src/dvdread/nav_types.h (props changed) - copied unchanged from r1159, trunk/libdvdread/src/nav_types.h Deleted: trunk/libdvdread/src/bitreader.h trunk/libdvdread/src/dvd_reader.h trunk/libdvdread/src/dvd_udf.h trunk/libdvdread/src/ifo_print.h trunk/libdvdread/src/ifo_read.h trunk/libdvdread/src/ifo_types.h trunk/libdvdread/src/nav_print.h trunk/libdvdread/src/nav_read.h trunk/libdvdread/src/nav_types.h Modified: trunk/libdvdread/Makefile trunk/libdvdread/src/Makefile.am trunk/libdvdread/src/bitreader.c trunk/libdvdread/src/dvd_input.c trunk/libdvdread/src/dvd_reader.c trunk/libdvdread/src/dvd_udf.c trunk/libdvdread/src/ifo_print.c trunk/libdvdread/src/ifo_read.c trunk/libdvdread/src/nav_print.c trunk/libdvdread/src/nav_read.c Modified: trunk/libdvdread/Makefile ============================================================================== --- trunk/libdvdread/Makefile Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/Makefile Wed Dec 31 09:43:03 2008 (r1162) @@ -18,15 +18,15 @@ DVDREAD_L=libdvdread DVDREAD_LIB = $(DVDREAD_L).a DVDREAD_SHLIB = $(DVDREAD_L).so VPATH+= $(SRC_PATH_BARE)/src -DVDREAD_HEADERS = src/dvd_reader.h \ - src/ifo_print.h \ - src/ifo_read.h \ - src/ifo_types.h \ - src/nav_print.h \ - src/nav_read.h \ - src/dvd_udf.h \ - src/nav_types.h \ - src/bitreader.h +DVDREAD_HEADERS = src/dvdread/dvd_reader.h \ + src/dvdread/ifo_print.h \ + src/dvdread/ifo_read.h \ + src/dvdread/ifo_types.h \ + src/dvdread/nav_print.h \ + src/dvdread/nav_read.h \ + src/dvdread/dvd_udf.h \ + src/dvdread/nav_types.h \ + src/dvdread/bitreader.h 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 bitreader.c CFLAGS += -I$(SRC_PATH)/src Modified: trunk/libdvdread/src/Makefile.am ============================================================================== --- trunk/libdvdread/src/Makefile.am Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/Makefile.am Wed Dec 31 09:43:03 2008 (r1162) @@ -15,5 +15,5 @@ libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS libdvdread_la_LDFLAGS = -version-info $(DVDREAD_LT_CURRENT):$(DVDREAD_LT_REVISION):$(DVDREAD_LT_AGE) \ -export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*|^UDF.*)" -include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \ - nav_print.h ifo_print.h ifo_types.h nav_types.h dvd_udf.h bitreader.h +include_HEADERS = dvdread/dvd_reader.h dvdread/nav_read.h dvdread/ifo_read.h \ + dvdread/nav_print.h dvdread/ifo_print.h dvdread/ifo_types.h dvdread/nav_types.h dvdread/dvd_udf.h dvdread/bitreader.h Modified: trunk/libdvdread/src/bitreader.c ============================================================================== --- trunk/libdvdread/src/bitreader.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/bitreader.c Wed Dec 31 09:43:03 2008 (r1162) @@ -25,7 +25,7 @@ #include <string.h> #include <inttypes.h> -#include "bitreader.h" +#include "dvdread/bitreader.h" int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) { if ((state == NULL) || (start == NULL)) return 0; Modified: trunk/libdvdread/src/dvd_input.c ============================================================================== --- trunk/libdvdread/src/dvd_input.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/dvd_input.c Wed Dec 31 09:43:03 2008 (r1162) @@ -26,7 +26,7 @@ #include <fcntl.h> #include <unistd.h> -#include "dvd_reader.h" +#include "dvdread/dvd_reader.h" #include "dvd_input.h" Modified: trunk/libdvdread/src/dvd_reader.c ============================================================================== --- trunk/libdvdread/src/dvd_reader.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/dvd_reader.c Wed Dec 31 09:43:03 2008 (r1162) @@ -65,9 +65,9 @@ static inline int _private_gettimeofday( #include <mntent.h> #endif -#include "dvd_udf.h" +#include "dvdread/dvd_udf.h" #include "dvd_input.h" -#include "dvd_reader.h" +#include "dvdread/dvd_reader.h" #include "md5.h" #define DEFAULT_UDF_CACHE_LEVEL 1 Modified: trunk/libdvdread/src/dvd_udf.c ============================================================================== --- trunk/libdvdread/src/dvd_udf.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/dvd_udf.c Wed Dec 31 09:43:03 2008 (r1162) @@ -39,8 +39,8 @@ #include <unistd.h> #include <inttypes.h> -#include "dvd_reader.h" -#include "dvd_udf.h" +#include "dvdread/dvd_reader.h" +#include "dvdread/dvd_udf.h" /* Private but located in/shared with dvd_reader.c */ extern int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number, Copied: trunk/libdvdread/src/dvdread/bitreader.h (from r1159, trunk/libdvdread/src/bitreader.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/bitreader.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/bitreader.h) @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort(a)dtek.chalmers.se>. + * + * This file is part of libdvdread. + * + * libdvdread is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdread is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_BITREADER_H +#define LIBDVDREAD_BITREADER_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + uint8_t *start; + uint32_t byte_position; + uint32_t bit_position; + uint8_t byte; +} getbits_state_t; + +int dvdread_getbits_init(getbits_state_t *state, uint8_t *start); +uint32_t dvdread_getbits(getbits_state_t *state, uint32_t number_of_bits); + +#ifdef __cplusplus +}; +#endif +#endif /* LIBDVDREAD_BITREADER_H */ Copied: trunk/libdvdread/src/dvdread/dvd_reader.h (from r1159, trunk/libdvdread/src/dvd_reader.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/dvd_reader.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/dvd_reader.h) @@ -0,0 +1,277 @@ +/* + * Copyright (C) 2001, 2002 Billy Biggs <vektor(a)dumbterm.net>, + * Håkan Hjort <d95hjort(a)dtek.chalmers.se>, + * Björn Englund <d4bjorn(a)dtek.chalmers.se> + * + * This file is part of libdvdread. + * + * libdvdread is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdread is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_DVD_READER_H +#define LIBDVDREAD_DVD_READER_H + +#ifdef _MSC_VER +#include <config.h> + +#include <stdio.h> +#include <stdlib.h> +#endif + +#include <sys/types.h> +#include <inttypes.h> + +/** + * The DVD access interface. + * + * This file contains the functions that form the interface to to + * reading files located on a DVD. + */ + +/** + * The current version. + */ +#define DVDREAD_VERSION 904 + +/** + * The length of one Logical Block of a DVD. + */ +#define DVD_VIDEO_LB_LEN 2048 + +/** + * Maximum length of filenames allowed in UDF. + */ +#define MAX_UDF_FILE_NAME_LEN 2048 + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Opaque type that is used as a handle for one instance of an opened DVD. + */ +typedef struct dvd_reader_s dvd_reader_t; + +/** + * Opaque type for a file read handle, much like a normal fd or FILE *. + */ +typedef struct dvd_file_s dvd_file_t; + +/** + * Opens a block device of a DVD-ROM file, or an image file, or a directory + * name for a mounted DVD or HD copy of a DVD. + * + * If the given file is a block device, or is the mountpoint for a block + * device, then that device is used for CSS authentication using libdvdcss. + * If no device is available, then no CSS authentication is performed, + * and we hope that the image is decrypted. + * + * If the path given is a directory, then the files in that directory may be + * in any one of these formats: + * + * path/VIDEO_TS/VTS_01_1.VOB + * path/video_ts/vts_01_1.vob + * path/VTS_01_1.VOB + * path/vts_01_1.vob + * + * @param path Specifies the the device, file or directory to be used. + * @return If successful a a read handle is returned. Otherwise 0 is returned. + * + * dvd = DVDOpen(path); + */ +dvd_reader_t *DVDOpen( const char * ); + +/** + * Closes and cleans up the DVD reader object. + * + * You must close all open files before calling this function. + * + * @param dvd A read handle that should be closed. + * + * DVDClose(dvd); + */ +void DVDClose( dvd_reader_t * ); + +/** + * + */ +typedef enum { + DVD_READ_INFO_FILE, /**< VIDEO_TS.IFO or VTS_XX_0.IFO (title) */ + DVD_READ_INFO_BACKUP_FILE, /**< VIDEO_TS.BUP or VTS_XX_0.BUP (title) */ + DVD_READ_MENU_VOBS, /**< VIDEO_TS.VOB or VTS_XX_0.VOB (title) */ + DVD_READ_TITLE_VOBS /**< VTS_XX_[1-9].VOB (title). All files in + the title set are opened and read as a + single file. */ +} dvd_read_domain_t; + +/** + * Opens a file on the DVD given the title number and domain. + * + * If the title number is 0, the video manager information is opened + * (VIDEO_TS.[IFO,BUP,VOB]). Returns a file structure which may be + * used for reads, or 0 if the file was not found. + * + * @param dvd A dvd read handle. + * @param titlenum Which Video Title Set should be used, VIDEO_TS is 0. + * @param domain Which domain. + * @return If successful a a file read handle is returned, otherwise 0. + * + * dvd_file = DVDOpenFile(dvd, titlenum, domain); */ +dvd_file_t *DVDOpenFile( dvd_reader_t *, int, dvd_read_domain_t ); + +/** + * Closes a file and frees the associated structure. + * + * @param dvd_file The file read handle to be closed. + * + * DVDCloseFile(dvd_file); + */ +void DVDCloseFile( dvd_file_t * ); + +/** + * Reads block_count number of blocks from the file at the given block offset. + * Returns number of blocks read on success, -1 on error. This call is only + * for reading VOB data, and should not be used when reading the IFO files. + * When reading from an encrypted drive, blocks are decrypted using libdvdcss + * where required. + * + * @param dvd_file A file read handle. + * @param offset Block offset from the start of the file to start reading at. + * @param block_count Number of block to read. + * @param data Pointer to a buffer to write the data into. + * @return Returns number of blocks read on success, -1 on error. + * + * blocks_read = DVDReadBlocks(dvd_file, offset, block_count, data); + */ +ssize_t DVDReadBlocks( dvd_file_t *, int, size_t, unsigned char * ); + +/** + * Seek to the given position in the file. Returns the resulting position in + * bytes from the beginning of the file. The seek position is only used for + * byte reads from the file, the block read call always reads from the given + * offset. + * + * @param dvd_file A file read handle. + * @param seek_offset Byte offset from the start of the file to seek to. + * @return The resulting position in bytes from the beginning of the file. + * + * offset_set = DVDFileSeek(dvd_file, seek_offset); + */ +int32_t DVDFileSeek( dvd_file_t *, int32_t ); + +/** + * Reads the given number of bytes from the file. This call can only be used + * on the information files, and may not be used for reading from a VOB. This + * reads from and increments the currrent seek position for the file. + * + * @param dvd_file A file read handle. + * @param data Pointer to a buffer to write the data into. + * @param bytes Number of bytes to read. + * @return Returns number of bytes read on success, -1 on error. + * + * bytes_read = DVDReadBytes(dvd_file, data, bytes); + */ +ssize_t DVDReadBytes( dvd_file_t *, void *, size_t ); + +/** + * Returns the file size in blocks. + * + * @param dvd_file A file read handle. + * @return The size of the file in blocks, -1 on error. + * + * blocks = DVDFileSize(dvd_file); + */ +ssize_t DVDFileSize( dvd_file_t * ); + +/** + * Get a unique 128 bit disc ID. + * This is the MD5 sum of VIDEO_TS.IFO and the VTS_0?_0.IFO files + * in title order (those that exist). + * If you need a 'text' representation of the id, print it as a + * hexadecimal number, using lowercase letters, discid[0] first. + * I.e. the same format as the command-line 'md5sum' program uses. + * + * @param dvd A read handle to get the disc ID from + * @param discid The buffer to put the disc ID into. The buffer must + * have room for 128 bits (16 chars). + * @return 0 on success, -1 on error. + */ +int DVDDiscID( dvd_reader_t *, unsigned char * ); + +/** + * Get the UDF VolumeIdentifier and VolumeSetIdentifier + * from the PrimaryVolumeDescriptor. + * + * @param dvd A read handle to get the disc ID from + * @param volid The buffer to put the VolumeIdentifier into. + * The VolumeIdentifier is latin-1 encoded (8bit unicode) + * null terminated and max 32 bytes (including '\0') + * @param volid_size No more than volid_size bytes will be copied to volid. + * If the VolumeIdentifier is truncated because of this + * it will still be null terminated. + * @param volsetid The buffer to put the VolumeSetIdentifier into. + * The VolumeIdentifier is 128 bytes as + * stored in the UDF PrimaryVolumeDescriptor. + * Note that this is not a null terminated string. + * @param volsetid_size At most volsetid_size bytes will be copied to volsetid. + * @return 0 on success, -1 on error. + */ +int DVDUDFVolumeInfo( dvd_reader_t *, char *, unsigned int, + unsigned char *, unsigned int ); + +int DVDFileSeekForce( dvd_file_t *, int offset, int force_size); + +/** + * Get the ISO9660 VolumeIdentifier and VolumeSetIdentifier + * + * * Only use this function as fallback if DVDUDFVolumeInfo returns 0 * + * * this will happen on a disc mastered only with a iso9660 filesystem * + * * All video DVD discs have UDF filesystem * + * + * @param dvd A read handle to get the disc ID from + * @param volid The buffer to put the VolumeIdentifier into. + * The VolumeIdentifier is coded with '0-9','A-Z','_' + * null terminated and max 33 bytes (including '\0') + * @param volid_size No more than volid_size bytes will be copied to volid. + * If the VolumeIdentifier is truncated because of this + * it will still be null terminated. + * @param volsetid The buffer to put the VolumeSetIdentifier into. + * The VolumeIdentifier is 128 bytes as + * stored in the ISO9660 PrimaryVolumeDescriptor. + * Note that this is not a null terminated string. + * @param volsetid_size At most volsetid_size bytes will be copied to volsetid. + * @return 0 on success, -1 on error. + */ +int DVDISOVolumeInfo( dvd_reader_t *, char *, unsigned int, + unsigned char *, unsigned int ); + +/** + * Sets the level of caching that is done when reading from a device + * + * @param dvd A read handle to get the disc ID from + * @param level The level of caching wanted. + * -1 - returns the current setting. + * 0 - UDF Cache turned off. + * 1 - (default level) Pointers to IFO files and some data from + * PrimaryVolumeDescriptor are cached. + * + * @return The level of caching. + */ +int DVDUDFCacheLevel( dvd_reader_t *, int ); + +#ifdef __cplusplus +}; +#endif +#endif /* LIBDVDREAD_DVD_READER_H */ Copied and modified: trunk/libdvdread/src/dvdread/dvd_udf.h (from r1159, trunk/libdvdread/src/dvd_udf.h) ============================================================================== --- trunk/libdvdread/src/dvd_udf.h Sat Dec 13 15:27:51 2008 (r1159, copy source) +++ trunk/libdvdread/src/dvdread/dvd_udf.h Wed Dec 31 09:43:03 2008 (r1162) @@ -33,7 +33,7 @@ #include <inttypes.h> -#include "dvd_reader.h" +#include "dvdread/dvd_reader.h" #ifdef __cplusplus extern "C" { Copied: trunk/libdvdread/src/dvdread/ifo_print.h (from r1159, trunk/libdvdread/src/ifo_print.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/ifo_print.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/ifo_print.h) @@ -0,0 +1,28 @@ +/* + * This file is part of libdvdread. + * + * libdvdread is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdread is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_IFO_PRINT_H +#define LIBDVDREAD_IFO_PRINT_H + +#include <inttypes.h> +#include "ifo_types.h" + +void ifo_print(dvd_reader_t *dvd, int title); +void dvdread_print_time(dvd_time_t *dtime); + +#endif /* LIBDVDREAD_IFO_PRINT_H */ Copied and modified: trunk/libdvdread/src/dvdread/ifo_read.h (from r1159, trunk/libdvdread/src/ifo_read.h) ============================================================================== --- trunk/libdvdread/src/ifo_read.h Sat Dec 13 15:27:51 2008 (r1159, copy source) +++ trunk/libdvdread/src/dvdread/ifo_read.h Wed Dec 31 09:43:03 2008 (r1162) @@ -23,7 +23,7 @@ #define LIBDVDREAD_IFO_READ_H #include "ifo_types.h" -#include "dvd_reader.h" +#include "dvdread/dvd_reader.h" #ifdef __cplusplus extern "C" { Copied and modified: trunk/libdvdread/src/dvdread/ifo_types.h (from r1159, trunk/libdvdread/src/ifo_types.h) ============================================================================== --- trunk/libdvdread/src/ifo_types.h Sat Dec 13 15:27:51 2008 (r1159, copy source) +++ trunk/libdvdread/src/dvdread/ifo_types.h Wed Dec 31 09:43:03 2008 (r1162) @@ -23,7 +23,7 @@ #define LIBDVDREAD_IFO_TYPES_H #include <inttypes.h> -#include "dvd_reader.h" +#include "dvdread/dvd_reader.h" #undef ATTRIBUTE_PACKED Copied: trunk/libdvdread/src/dvdread/nav_print.h (from r1159, trunk/libdvdread/src/nav_print.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/nav_print.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/nav_print.h) @@ -0,0 +1,52 @@ +/* + * Copyright (C) 2001, 2002 Billy Biggs <vektor(a)dumbterm.net>, + * Håkan Hjort <d95hjort(a)dtek.chalmers.se> + * + * This file is part of libdvdread. + * + * libdvdread is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdread is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_NAV_PRINT_H +#define LIBDVDREAD_NAV_PRINT_H + +#include "nav_types.h" + +/** + * Pretty printing of the NAV packets, PCI and DSI structs. + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Prints information contained in the PCI to stdout. + * + * @param pci Pointer to the PCI data structure to be printed. + */ +void navPrint_PCI(pci_t *); + +/** + * Prints information contained in the DSI to stdout. + * + * @param dsi Pointer to the DSI data structure to be printed. + */ +void navPrint_DSI(dsi_t *); + +#ifdef __cplusplus +}; +#endif +#endif /* LIBDVDREAD_NAV_PRINT_H */ Copied: trunk/libdvdread/src/dvdread/nav_read.h (from r1159, trunk/libdvdread/src/nav_read.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/nav_read.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/nav_read.h) @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort(a)dtek.chalmers.se>. + * + * This file is part of libdvdread. + * + * libdvdread is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdread is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdread; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_NAV_READ_H +#define LIBDVDREAD_NAV_READ_H + +#include "nav_types.h" + +/** + * Parsing of NAV data, PCI and DSI parts. + */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * Reads the PCI packet data pointed to into th pci struct. + * + * @param pci Pointer to the PCI data structure to be filled in. + * @param bufffer Pointer to the buffer of the on disc PCI data. + */ +void navRead_PCI(pci_t *, unsigned char *); + +/** + * Reads the DSI packet data pointed to into dsi struct. + * + * @param dsi Pointer to the DSI data structure to be filled in. + * @param bufffer Pointer to the buffer of the on disc DSI data. + */ +void navRead_DSI(dsi_t *, unsigned char *); + +#ifdef __cplusplus +}; +#endif +#endif /* LIBDVDREAD_NAV_READ_H */ Copied: trunk/libdvdread/src/dvdread/nav_types.h (from r1159, trunk/libdvdread/src/nav_types.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdread/src/dvdread/nav_types.h Wed Dec 31 09:43:03 2008 (r1162, copy of r1159, trunk/libdvdread/src/nav_types.h) @@ -0,0 +1,248 @@ +/* + * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95hjort(a)dtek.chalmers.se> + * + * The data structures in this file should represent the layout of the + * pci and dsi packets as they are stored in the stream. Information + * found by reading the source to VOBDUMP is the base for the structure + * and names of these data types. + * + * VOBDUMP: a program for examining DVD .VOB files. + * Copyright 1998, 1999 Eric Smith <eric(a)brouhaha.com> + * + * VOBDUMP is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. Note that I am not + * granting permission to redistribute or modify VOBDUMP under the terms + * of any later version of the General Public License. + * + * This program is distributed in the hope that it will be useful (or at + * least amusing), but WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See + * the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef LIBDVDREAD_NAV_TYPES_H +#define LIBDVDREAD_NAV_TYPES_H + +#include <inttypes.h> +#include "ifo_types.h" /* only dvd_time_t, vm_cmd_t and user_ops_t */ + +/* The length including the substream id byte. */ +#define PCI_BYTES 0x3d4 +#define DSI_BYTES 0x3fa + +#define PS2_PCI_SUBSTREAM_ID 0x00 +#define PS2_DSI_SUBSTREAM_ID 0x01 + +/* Remove this */ +#define DSI_START_BYTE 1031 + +/** + * PCI General Information + */ +typedef struct { + uint32_t nv_pck_lbn; /**< sector address of this nav pack */ + uint16_t vobu_cat; /**< 'category' of vobu */ + uint16_t zero1; /**< reserved */ + user_ops_t vobu_uop_ctl; /**< UOP of vobu */ + uint32_t vobu_s_ptm; /**< start presentation time of vobu */ + uint32_t vobu_e_ptm; /**< end presentation time of vobu */ + uint32_t vobu_se_e_ptm; /**< end ptm of sequence end in vobu */ + dvd_time_t e_eltm; /**< Cell elapsed time */ + char vobu_isrc[32]; +} ATTRIBUTE_PACKED pci_gi_t; + +/** + * Non Seamless Angle Information + */ +typedef struct { + uint32_t nsml_agl_dsta[9]; /**< address of destination vobu in AGL_C#n */ +} ATTRIBUTE_PACKED nsml_agli_t; + +/** + * Highlight General Information + * + * For btngrX_dsp_ty the bits have the following meaning: + * 000b: normal 4/3 only buttons + * XX1b: wide (16/9) buttons + * X1Xb: letterbox buttons + * 1XXb: pan&scan buttons + */ +typedef struct { + uint16_t hli_ss; /**< status, only low 2 bits 0: no buttons, 1: different 2: equal 3: eual except for button cmds */ + uint32_t hli_s_ptm; /**< start ptm of hli */ + uint32_t hli_e_ptm; /**< end ptm of hli */ + uint32_t btn_se_e_ptm; /**< end ptm of button select */ + unsigned int zero1 : 2; /**< reserved */ + unsigned int btngr_ns : 2; /**< number of button groups 1, 2 or 3 with 36/18/12 buttons */ + unsigned int zero2 : 1; /**< reserved */ + unsigned int btngr1_dsp_ty : 3; /**< display type of subpic stream for button group 1 */ + unsigned int zero3 : 1; /**< reserved */ + unsigned int btngr2_dsp_ty : 3; /**< display type of subpic stream for button group 2 */ + unsigned int zero4 : 1; /**< reserved */ + unsigned int btngr3_dsp_ty : 3; /**< display type of subpic stream for button group 3 */ + uint8_t btn_ofn; /**< button offset number range 0-255 */ + uint8_t btn_ns; /**< number of valid buttons <= 36/18/12 (low 6 bits) */ + uint8_t nsl_btn_ns; /**< number of buttons selectable by U_BTNNi (low 6 bits) nsl_btn_ns <= btn_ns */ + uint8_t zero5; /**< reserved */ + uint8_t fosl_btnn; /**< forcedly selected button (low 6 bits) */ + uint8_t foac_btnn; /**< forcedly activated button (low 6 bits) */ +} ATTRIBUTE_PACKED hl_gi_t; + + +/** + * Button Color Information Table + * Each entry beeing a 32bit word that contains the color indexs and alpha + * values to use. They are all represented by 4 bit number and stored + * like this [Ci3, Ci2, Ci1, Ci0, A3, A2, A1, A0]. The actual palette + * that the indexes reference is in the PGC. + * @TODO split the uint32_t into a struct + */ +typedef struct { + uint32_t btn_coli[3][2]; /**< [button color number-1][select:0/action:1] */ +} ATTRIBUTE_PACKED btn_colit_t; + +/** + * Button Information + * + * NOTE: I've had to change the structure from the disk layout to get + * the packing to work with Sun's Forte C compiler. + * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ + */ +typedef struct { + unsigned int btn_coln : 2; /**< button color number */ + unsigned int x_start : 10; /**< x start offset within the overlay */ + unsigned int zero1 : 2; /**< reserved */ + unsigned int x_end : 10; /**< x end offset within the overlay */ + + unsigned int auto_action_mode : 2; /**< 0: no, 1: activated if selected */ + unsigned int y_start : 10; /**< y start offset within the overlay */ + unsigned int zero2 : 2; /**< reserved */ + unsigned int y_end : 10; /**< y end offset within the overlay */ + + unsigned int zero3 : 2; /**< reserved */ + unsigned int up : 6; /**< button index when pressing up */ + unsigned int zero4 : 2; /**< reserved */ + unsigned int down : 6; /**< button index when pressing down */ + unsigned int zero5 : 2; /**< reserved */ + unsigned int left : 6; /**< button index when pressing left */ + unsigned int zero6 : 2; /**< reserved */ + unsigned int right : 6; /**< button index when pressing right */ + vm_cmd_t cmd; +} ATTRIBUTE_PACKED btni_t; + +/** + * Highlight Information + */ +typedef struct { + hl_gi_t hl_gi; + btn_colit_t btn_colit; + btni_t btnit[36]; +} ATTRIBUTE_PACKED hli_t; + +/** + * PCI packet + */ +typedef struct { + pci_gi_t pci_gi; + nsml_agli_t nsml_agli; + hli_t hli; + uint8_t zero1[189]; +} ATTRIBUTE_PACKED pci_t; + + + + +/** + * DSI General Information + */ +typedef struct { + uint32_t nv_pck_scr; + uint32_t nv_pck_lbn; /**< sector address of this nav pack */ + uint32_t vobu_ea; /**< end address of this VOBU */ + uint32_t vobu_1stref_ea; /**< end address of the 1st reference image */ + uint32_t vobu_2ndref_ea; /**< end address of the 2nd reference image */ + uint32_t vobu_3rdref_ea; /**< end address of the 3rd reference image */ + uint16_t vobu_vob_idn; /**< VOB Id number that this VOBU is part of */ + uint8_t zero1; /**< reserved */ + uint8_t vobu_c_idn; /**< Cell Id number that this VOBU is part of */ + dvd_time_t c_eltm; /**< Cell elapsed time */ +} ATTRIBUTE_PACKED dsi_gi_t; + +/** + * Seamless Playback Information + */ +typedef struct { + uint16_t category; /**< 'category' of seamless VOBU */ + uint32_t ilvu_ea; /**< end address of interleaved Unit */ + uint32_t ilvu_sa; /**< start address of next interleaved unit */ + uint16_t size; /**< size of next interleaved unit */ + uint32_t vob_v_s_s_ptm; /**< video start ptm in vob */ + uint32_t vob_v_e_e_ptm; /**< video end ptm in vob */ + struct { + uint32_t stp_ptm1; + uint32_t stp_ptm2; + uint32_t gap_len1; + uint32_t gap_len2; + } vob_a[8]; +} ATTRIBUTE_PACKED sml_pbi_t; + +/** + * Seamless Angle Infromation for one angle + */ +typedef struct { + uint32_t address; /**< offset to next ILVU, high bit is before/after */ + uint16_t size; /**< byte size of the ILVU pointed to by address */ +} ATTRIBUTE_PACKED sml_agl_data_t; + +/** + * Seamless Angle Infromation + */ +typedef struct { + sml_agl_data_t data[9]; +} ATTRIBUTE_PACKED sml_agli_t; + +/** + * VOBU Search Information + */ +typedef struct { + uint32_t next_video; /**< Next vobu that contains video */ + uint32_t fwda[19]; /**< Forwards, time */ + uint32_t next_vobu; + uint32_t prev_vobu; + uint32_t bwda[19]; /**< Backwards, time */ + uint32_t prev_video; +} ATTRIBUTE_PACKED vobu_sri_t; + +#define SRI_END_OF_CELL 0x3fffffff + +/** + * Synchronous Information + */ +typedef struct { + uint16_t a_synca[8]; /**< offset to first audio packet for this VOBU */ + uint32_t sp_synca[32]; /**< offset to first subpicture packet */ +} ATTRIBUTE_PACKED synci_t; + +/** + * DSI packet + */ +typedef struct { + dsi_gi_t dsi_gi; + sml_pbi_t sml_pbi; + sml_agli_t sml_agli; + vobu_sri_t vobu_sri; + synci_t synci; + uint8_t zero1[471]; +} ATTRIBUTE_PACKED dsi_t; + + +#if PRAGMA_PACK +#pragma pack() +#endif + +#endif /* LIBDVDREAD_NAV_TYPES_H */ Modified: trunk/libdvdread/src/ifo_print.c ============================================================================== --- trunk/libdvdread/src/ifo_print.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/ifo_print.c Wed Dec 31 09:43:03 2008 (r1162) @@ -24,9 +24,9 @@ #include <ctype.h> #include <assert.h> -#include "ifo_types.h" -#include "ifo_read.h" -#include "ifo_print.h" +#include "dvdread/ifo_types.h" +#include "dvdread/ifo_read.h" +#include "dvdread/ifo_print.h" /* Put this in some other file / package? It's used in nav_print too. */ static void ifo_print_time(int level, dvd_time_t *dtime) { Modified: trunk/libdvdread/src/ifo_read.c ============================================================================== --- trunk/libdvdread/src/ifo_read.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/ifo_read.c Wed Dec 31 09:43:03 2008 (r1162) @@ -28,11 +28,11 @@ #include <string.h> #include "bswap.h" -#include "ifo_types.h" -#include "ifo_read.h" -#include "dvd_reader.h" +#include "dvdread/ifo_types.h" +#include "dvdread/ifo_read.h" +#include "dvdread/dvd_reader.h" #include "dvdread_internal.h" -#include "bitreader.h" +#include "dvdread/bitreader.h" #ifndef DVD_BLOCK_LEN #define DVD_BLOCK_LEN 2048 Modified: trunk/libdvdread/src/nav_print.c ============================================================================== --- trunk/libdvdread/src/nav_print.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/nav_print.c Wed Dec 31 09:43:03 2008 (r1162) @@ -28,9 +28,9 @@ #include <stdio.h> #include <inttypes.h> -#include "nav_types.h" -#include "nav_print.h" -#include "ifo_print.h" +#include "dvdread/nav_types.h" +#include "dvdread/nav_print.h" +#include "dvdread/ifo_print.h" static void navPrint_PCI_GI(pci_gi_t *pci_gi) { int i; Modified: trunk/libdvdread/src/nav_read.c ============================================================================== --- trunk/libdvdread/src/nav_read.c Wed Dec 31 09:41:23 2008 (r1161) +++ trunk/libdvdread/src/nav_read.c Wed Dec 31 09:43:03 2008 (r1162) @@ -26,10 +26,10 @@ #include <inttypes.h> #include "bswap.h" -#include "nav_types.h" -#include "nav_read.h" +#include "dvdread/nav_types.h" +#include "dvdread/nav_read.h" #include "dvdread_internal.h" -#include "bitreader.h" +#include "dvdread/bitreader.h" #define getbits_init dvdread_getbits_init #define getbits dvdread_getbits

5 5

[RFC] MPlayer integration hack
by Reimar Döffinger 31 Dec '08

31 Dec '08

Hello, this hack: Index: dvdnav.c =================================================================== --- dvdnav.c (revision 1160) +++ dvdnav.c (working copy) @@ -21,9 +21,8 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include "version.h" /* #define LOG_DEBUG is what I currently use to build libdvdnav directly from within MPlayer. It is ugly for that use because it uses MPlayer's version string dvdnav ;-) But on the other hand it seems the quickest way to get a working solution. Another possibility would be to add an #else #define VERSION ... Which would also make sense, because a HAVE_CONFIG_H without which nothing works at all does not make much sense either... Greetings, Reimar Döffinger

2 4

r1161 - trunk/libdvdread/Makefile
by reimar 31 Dec '08

31 Dec '08

Author: reimar Date: Wed Dec 31 09:41:23 2008 New Revision: 1161 Log: Remove trailing whitespace to avoid issues with precommit hook Modified: trunk/libdvdread/Makefile Modified: trunk/libdvdread/Makefile ============================================================================== --- trunk/libdvdread/Makefile Tue Dec 30 15:48:46 2008 (r1160) +++ trunk/libdvdread/Makefile Wed Dec 31 09:41:23 2008 (r1161) @@ -67,7 +67,7 @@ endif version.h: sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)" - + $(SRCS) $(DVDREAD_SRCS): version.h

1 0

[PATCH] clean up header mess
by Reimar Döffinger 30 Dec '08

30 Dec '08

Hello, I think the way headers are currently are a mess, it needs that ugly -DDVDNAV_COMPILE and it makes it impossible to use dvdnav directly from the directory where it was compiled without installing (which is also a useful feature for directly integrating dvdnav into a project like it is done for dvdread in MPlayer). The patch looks a bit ugly, but the most it does is moving the dvdnav.h, dvd_types.h and dvdnav_events.h headers into a dvdnav subdirectory (if only svn diff could display file moves in a readable way!), adjusts the paths in the includes and makes dvdnav.h always include dvd_types.h and dvdnav_events.h which means quite a few #includes can be removed. If this looks ok, I'd like to do the same with dvdread and hopefully soon replacing the MPlayer copy with an svn external somewhen... Greetings, Reimar Döffinger

2 4

r1160 - in trunk/libdvdnav: Makefile src/Makefile.am src/dvd_types.h src/dvdnav src/dvdnav.c src/dvdnav.h src/dvdnav/dvd_types.h src/dvdnav/dvdnav.h src/dvdnav/dvdnav_events.h src/dvdnav_events.h s...
by reimar 30 Dec '08

30 Dec '08

Author: reimar Date: Tue Dec 30 15:48:46 2008 New Revision: 1160 Log: Move dvd_types.h, dvdnav_events.h and dvdnav.h into a dvdnav directory. This allows getting rid of the DVDNAV_COMPILE define hack and makes it easier to use the library without installing or integrating the source into some other project directly. Added: trunk/libdvdnav/src/dvdnav/ trunk/libdvdnav/src/dvdnav/dvd_types.h (props changed) - copied unchanged from r1159, trunk/libdvdnav/src/dvd_types.h trunk/libdvdnav/src/dvdnav/dvdnav.h (contents, props changed) - copied, changed from r1159, trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav/dvdnav_events.h (props changed) - copied unchanged from r1159, trunk/libdvdnav/src/dvdnav_events.h Deleted: trunk/libdvdnav/src/dvd_types.h trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdnav_events.h Modified: trunk/libdvdnav/Makefile trunk/libdvdnav/src/Makefile.am trunk/libdvdnav/src/dvdnav.c trunk/libdvdnav/src/highlight.c 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/decoder.c trunk/libdvdnav/src/vm/vm.c trunk/libdvdnav/src/vm/vmcmd.c Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/Makefile Tue Dec 30 15:48:46 2008 (r1160) @@ -12,11 +12,11 @@ SRCS = dvdnav.c highlight.c navigation.c VPATH+= $(SRC_PATH_BARE)/src/vm SRCS+= decoder.c vm.c vmcmd.c -HEADERS = src/dvd_types.h src/dvdnav.h src/dvdnav_events.h +HEADERS = src/dvdnav/dvd_types.h src/dvdnav/dvdnav.h src/dvdnav/dvdnav_events.h CFLAGS += $(USEDEBUG) -Wall -funsigned-char CFLAGS += -I$(CURDIR) -I$(SRC_PATH)/src -I$(SRC_PATH)/src/vm -CFLAGS += -DDVDNAV_COMPILE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS += -DHAVE_CONFIG_H -DHAVE_DLFCN_H L=libdvdnav @@ -57,7 +57,7 @@ endif version.h: sh $(SRC_PATH)/version.sh $(SRC_PATH) "$(SHLIB_VERSION)" - + $(SRCS): version.h Modified: trunk/libdvdnav/src/Makefile.am ============================================================================== --- trunk/libdvdnav/src/Makefile.am Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/Makefile.am Tue Dec 30 15:48:46 2008 (r1160) @@ -4,7 +4,7 @@ SUBDIRS = vm includedir = ${prefix}/include/dvdnav -AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ +AM_CPPFLAGS = $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \ -I$(top_srcdir)/src/vm EXTRA_DIST = README.MAP FELLOWSHIP.map @@ -31,4 +31,4 @@ libdvdnavmini_la_LIBADD = $(THREAD_LIBS) libdvdnavmini_la_LDFLAGS = $(libdvdnav_la_LDFLAGS) -include_HEADERS = dvdnav.h dvdnav_events.h dvd_types.h +include_HEADERS = dvdnav/dvdnav.h dvdnav/dvdnav_events.h dvdnav/dvd_types.h Modified: trunk/libdvdnav/src/dvdnav.c ============================================================================== --- trunk/libdvdnav/src/dvdnav.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/dvdnav.c Tue Dec 30 15:48:46 2008 (r1160) @@ -33,15 +33,13 @@ #include <limits.h> #include <string.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/dvd_reader.h> #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> /* For vm_cmd_t */ #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" -#include "dvdnav_events.h" #include "dvdnav_internal.h" #include "read_cache.h" #include <dvdread/nav_read.h> Copied: trunk/libdvdnav/src/dvdnav/dvd_types.h (from r1159, trunk/libdvdnav/src/dvd_types.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdnav/src/dvdnav/dvd_types.h Tue Dec 30 15:48:46 2008 (r1160, copy of r1159, trunk/libdvdnav/src/dvd_types.h) @@ -0,0 +1,275 @@ +/* + * Copyright (C) 2000, 2001 Björn Englund, Håkan Hjort + * + * This file is part of libdvdnav, a DVD navigation library. It is a modified + * file originally part of the Ogle DVD player project. + * + * libdvdnav is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdnav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdnav; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * Various useful structs and enums for DVDs. + */ + +#ifndef LIBDVDNAV_DVD_TYPES_H +#define LIBDVDNAV_DVD_TYPES_H + +/* + * DVD Menu ID + * (see dvdnav_menu_call()) + */ +typedef enum { + /* When used in VTS domain, DVD_MENU_Escape behaves like DVD_MENU_Root, + * but from within a menu domain, DVD_MENU_Escape resumes playback. */ + DVD_MENU_Escape = 0, + DVD_MENU_Title = 2, + DVD_MENU_Root = 3, + DVD_MENU_Subpicture = 4, + DVD_MENU_Audio = 5, + DVD_MENU_Angle = 6, + DVD_MENU_Part = 7 +} DVDMenuID_t; + + +/* + * Structure containing info on highlight areas + * (see dvdnav_get_highlight_area()) + */ +typedef struct { + uint32_t palette; /* The CLUT entries for the highlight palette + (4-bits per entry -> 4 entries) */ + uint16_t sx,sy,ex,ey; /* The start/end x,y positions */ + uint32_t pts; /* Highlight PTS to match with SPU */ + + /* button number for the SPU decoder/overlaying engine */ + uint32_t buttonN; +} dvdnav_highlight_area_t; + + +/* the following types are currently unused */ + +#if 0 + +/* Domain */ +typedef enum { + DVD_DOMAIN_FirstPlay, /* First Play Domain */ + DVD_DOMAIN_VMG, /* Video Manager Domain */ + DVD_DOMAIN_VTSMenu, /* Video Title Set Menu Domain */ + DVD_DOMAIN_VTSTitle, /* Video Title Set Domain */ + DVD_DOMAIN_Stop /* Stop Domain */ +} DVDDomain_t; + +/* User operation permissions */ +typedef enum { + UOP_FLAG_TitleOrTimePlay = 0x00000001, + UOP_FLAG_ChapterSearchOrPlay = 0x00000002, + UOP_FLAG_TitlePlay = 0x00000004, + UOP_FLAG_Stop = 0x00000008, + UOP_FLAG_GoUp = 0x00000010, + UOP_FLAG_TimeOrChapterSearch = 0x00000020, + UOP_FLAG_PrevOrTopPGSearch = 0x00000040, + UOP_FLAG_NextPGSearch = 0x00000080, + UOP_FLAG_ForwardScan = 0x00000100, + UOP_FLAG_BackwardScan = 0x00000200, + UOP_FLAG_TitleMenuCall = 0x00000400, + UOP_FLAG_RootMenuCall = 0x00000800, + UOP_FLAG_SubPicMenuCall = 0x00001000, + UOP_FLAG_AudioMenuCall = 0x00002000, + UOP_FLAG_AngleMenuCall = 0x00004000, + UOP_FLAG_ChapterMenuCall = 0x00008000, + UOP_FLAG_Resume = 0x00010000, + UOP_FLAG_ButtonSelectOrActivate = 0x00020000, + UOP_FLAG_StillOff = 0x00040000, + UOP_FLAG_PauseOn = 0x00080000, + UOP_FLAG_AudioStreamChange = 0x00100000, + UOP_FLAG_SubPicStreamChange = 0x00200000, + UOP_FLAG_AngleChange = 0x00400000, + UOP_FLAG_KaraokeAudioPresModeChange = 0x00800000, + UOP_FLAG_VideoPresModeChange = 0x01000000 +} DVDUOP_t; + +/* Parental Level */ +typedef enum { + DVD_PARENTAL_LEVEL_1 = 1, + DVD_PARENTAL_LEVEL_2 = 2, + DVD_PARENTAL_LEVEL_3 = 3, + DVD_PARENTAL_LEVEL_4 = 4, + DVD_PARENTAL_LEVEL_5 = 5, + DVD_PARENTAL_LEVEL_6 = 6, + DVD_PARENTAL_LEVEL_7 = 7, + DVD_PARENTAL_LEVEL_8 = 8, + DVD_PARENTAL_LEVEL_None = 15 +} DVDParentalLevel_t; + +/* Language ID (ISO-639 language code) */ +typedef uint16_t DVDLangID_t; + +/* Country ID (ISO-3166 country code) */ +typedef uint16_t DVDCountryID_t; + +/* Register */ +typedef uint16_t DVDRegister_t; +typedef enum { + DVDFalse = 0, + DVDTrue = 1 +} DVDBool_t; +typedef DVDRegister_t DVDGPRMArray_t[16]; +typedef DVDRegister_t DVDSPRMArray_t[24]; + +/* Navigation */ +typedef int DVDStream_t; +typedef int DVDPTT_t; +typedef int DVDTitle_t; + +/* Angle number (1-9 or default?) */ +typedef int DVDAngle_t; + +/* Timecode */ +typedef struct { + uint8_t Hours; + uint8_t Minutes; + uint8_t Seconds; + uint8_t Frames; +} DVDTimecode_t; + +/* Subpicture stream number (0-31,62,63) */ +typedef int DVDSubpictureStream_t; + +/* Audio stream number (0-7, 15(none)) */ +typedef int DVDAudioStream_t; + +/* The audio application mode */ +typedef enum { + DVD_AUDIO_APP_MODE_None = 0, + DVD_AUDIO_APP_MODE_Karaoke = 1, + DVD_AUDIO_APP_MODE_Surround = 2, + DVD_AUDIO_APP_MODE_Other = 3 +} DVDAudioAppMode_t; + +/* The audio format */ +typedef enum { + DVD_AUDIO_FORMAT_AC3 = 0, + DVD_AUDIO_FORMAT_MPEG1 = 1, + DVD_AUDIO_FORMAT_MPEG1_DRC = 2, + DVD_AUDIO_FORMAT_MPEG2 = 3, + DVD_AUDIO_FORMAT_MPEG2_DRC = 4, + DVD_AUDIO_FORMAT_LPCM = 5, + DVD_AUDIO_FORMAT_DTS = 6, + DVD_AUDIO_FORMAT_SDDS = 7, + DVD_AUDIO_FORMAT_Other = 8 +} DVDAudioFormat_t; + +/* Audio language extension */ +typedef enum { + DVD_AUDIO_LANG_EXT_NotSpecified = 0, + DVD_AUDIO_LANG_EXT_NormalCaptions = 1, + DVD_AUDIO_LANG_EXT_VisuallyImpaired = 2, + DVD_AUDIO_LANG_EXT_DirectorsComments1 = 3, + DVD_AUDIO_LANG_EXT_DirectorsComments2 = 4 +} DVDAudioLangExt_t; + +/* Subpicture language extension */ +typedef enum { + DVD_SUBPICTURE_LANG_EXT_NotSpecified = 0, + DVD_SUBPICTURE_LANG_EXT_NormalCaptions = 1, + DVD_SUBPICTURE_LANG_EXT_BigCaptions = 2, + DVD_SUBPICTURE_LANG_EXT_ChildrensCaptions = 3, + DVD_SUBPICTURE_LANG_EXT_NormalCC = 5, + DVD_SUBPICTURE_LANG_EXT_BigCC = 6, + DVD_SUBPICTURE_LANG_EXT_ChildrensCC = 7, + DVD_SUBPICTURE_LANG_EXT_Forced = 9, + DVD_SUBPICTURE_LANG_EXT_NormalDirectorsComments = 13, + DVD_SUBPICTURE_LANG_EXT_BigDirectorsComments = 14, + DVD_SUBPICTURE_LANG_EXT_ChildrensDirectorsComments = 15, +} DVDSubpictureLangExt_t; + +/* Karaoke Downmix mode */ +typedef enum { + DVD_KARAOKE_DOWNMIX_0to0 = 0x0001, + DVD_KARAOKE_DOWNMIX_1to0 = 0x0002, + DVD_KARAOKE_DOWNMIX_2to0 = 0x0004, + DVD_KARAOKE_DOWNMIX_3to0 = 0x0008, + DVD_KARAOKE_DOWNMIX_4to0 = 0x0010, + DVD_KARAOKE_DOWNMIX_Lto0 = 0x0020, + DVD_KARAOKE_DOWNMIX_Rto0 = 0x0040, + DVD_KARAOKE_DOWNMIX_0to1 = 0x0100, + DVD_KARAOKE_DOWNMIX_1to1 = 0x0200, + DVD_KARAOKE_DOWNMIX_2to1 = 0x0400, + DVD_KARAOKE_DOWNMIX_3to1 = 0x0800, + DVD_KARAOKE_DOWNMIX_4to1 = 0x1000, + DVD_KARAOKE_DOWNMIX_Lto1 = 0x2000, + DVD_KARAOKE_DOWNMIX_Rto1 = 0x4000 +} DVDKaraokeDownmix_t; +typedef int DVDKaraokeDownmixMask_t; + +/* Display mode */ +typedef enum { + DVD_DISPLAY_MODE_ContentDefault = 0, + DVD_DISPLAY_MODE_16x9 = 1, + DVD_DISPLAY_MODE_4x3PanScan = 2, + DVD_DISPLAY_MODE_4x3Letterboxed = 3 +} DVDDisplayMode_t; + +/* Audio attributes */ +typedef struct { + DVDAudioAppMode_t AppMode; + DVDAudioFormat_t AudioFormat; + DVDLangID_t Language; + DVDAudioLangExt_t LanguageExtension; + DVDBool_t HasMultichannelInfo; + DVDAudioSampleFreq_t SampleFrequency; + DVDAudioSampleQuant_t SampleQuantization; + DVDChannelNumber_t NumberOfChannels; +} DVDAudioAttributes_t; +typedef int DVDAudioSampleFreq_t; +typedef int DVDAudioSampleQuant_t; +typedef int DVDChannelNumber_t; + +/* Subpicture attributes */ +typedef enum { + DVD_SUBPICTURE_TYPE_NotSpecified = 0, + DVD_SUBPICTURE_TYPE_Language = 1, + DVD_SUBPICTURE_TYPE_Other = 2 +} DVDSubpictureType_t; +typedef enum { + DVD_SUBPICTURE_CODING_RunLength = 0, + DVD_SUBPICTURE_CODING_Extended = 1, + DVD_SUBPICTURE_CODING_Other = 2 +} DVDSubpictureCoding_t; +typedef struct { + DVDSubpictureType_t Type; + DVDSubpictureCoding_t CodingMode; + DVDLangID_t Language; + DVDSubpictureLangExt_t LanguageExtension; +} DVDSubpictureAttributes_t; + +/* Video attributes */ +typedef struct { + DVDBool_t PanscanPermitted; + DVDBool_t LetterboxPermitted; + int AspectX; + int AspectY; + int FrameRate; + int FrameHeight; + DVDVideoCompression_t Compression; + DVDBool_t Line21Field1InGop; + DVDBool_t Line21Field2InGop; + int more_to_come; +} DVDVideoAttributes_t; +typedef int DVDVideoCompression_t; + +#endif + +#endif /* LIBDVDNAV_DVD_TYPES_H */ Copied and modified: trunk/libdvdnav/src/dvdnav/dvdnav.h (from r1159, trunk/libdvdnav/src/dvdnav.h) ============================================================================== --- trunk/libdvdnav/src/dvdnav.h Sat Dec 13 15:27:51 2008 (r1159, copy source) +++ trunk/libdvdnav/src/dvdnav/dvdnav.h Tue Dec 30 15:48:46 2008 (r1160) @@ -32,13 +32,11 @@ extern "C" { #endif -#ifndef DVDNAV_COMPILE -# include <dvdnav/dvd_types.h> -# include <dvdread/dvd_reader.h> -# include <dvdread/nav_types.h> -# include <dvdread/ifo_types.h> /* For vm_cmd_t */ -# include <dvdnav/dvdnav_events.h> -#endif +#include <dvdnav/dvd_types.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/nav_types.h> +#include <dvdread/ifo_types.h> /* For vm_cmd_t */ +#include <dvdnav/dvdnav_events.h> Copied: trunk/libdvdnav/src/dvdnav/dvdnav_events.h (from r1159, trunk/libdvdnav/src/dvdnav_events.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libdvdnav/src/dvdnav/dvdnav_events.h Tue Dec 30 15:48:46 2008 (r1160, copy of r1159, trunk/libdvdnav/src/dvdnav_events.h) @@ -0,0 +1,236 @@ +/* + * Copyright (C) 2001 Rich Wareham <richwareham(a)users.sourceforge.net> + * + * This file is part of libdvdnav, a DVD navigation library. + * + * libdvdnav is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * libdvdnav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with libdvdnav; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +/* + * This header defines events and event types + */ + +#ifndef LIBDVDNAV_DVDNAV_EVENTS_H +#define LIBDVDNAV_DVDNAV_EVENTS_H + +/* + * DVDNAV_BLOCK_OK + * + * A regular data block from the DVD has been returned. + * This one should be demuxed and decoded for playback. + */ +#define DVDNAV_BLOCK_OK 0 + + +/* + * DVDNAV_NOP + * + * Just ignore this. + */ +#define DVDNAV_NOP 1 + + +/* + * DVDNAV_STILL_FRAME + * + * We have reached a still frame. The player application should wait + * the amount of time specified by the still's length while still handling + * user input to make menus and other interactive stills work. + * The last delivered frame should be kept showing. + * Once the still has timed out, call dvdnav_skip_still(). + * A length of 0xff means an infinite still which has to be skipped + * indirectly by some user interaction. + */ +#define DVDNAV_STILL_FRAME 2 + +typedef struct { + /* The length (in seconds) the still frame should be displayed for, + * or 0xff if infinite. */ + int length; +} dvdnav_still_event_t; + + +/* + * DVDNAV_SPU_STREAM_CHANGE + * + * Inform the SPU decoding/overlaying engine to switch SPU channels. + */ +#define DVDNAV_SPU_STREAM_CHANGE 3 + +typedef struct { + /* The physical (MPEG) stream number for widescreen SPU display. + * Use this, if you blend the SPU on an anamorphic image before + * unsqueezing it. */ + int physical_wide; + + /* The physical (MPEG) stream number for letterboxed display. + * Use this, if you blend the SPU on an anamorphic image after + * unsqueezing it. */ + int physical_letterbox; + + /* The physical (MPEG) stream number for pan&scan display. + * Use this, if you blend the SPU on an anamorphic image after + * unsqueezing it the pan&scan way. */ + int physical_pan_scan; + + /* The logical (DVD) stream number. */ + int logical; +} dvdnav_spu_stream_change_event_t; + + +/* + * DVDNAV_AUDIO_STREAM_CHANGE + * + * Inform the audio decoder to switch channels. + */ +#define DVDNAV_AUDIO_STREAM_CHANGE 4 + +typedef struct { + /* The physical (MPEG) stream number. */ + int physical; + + /* The logical (DVD) stream number. */ + int logical; +} dvdnav_audio_stream_change_event_t; + + +/* + * DVDNAV_VTS_CHANGE + * + * Some status information like video aspect and video scale permissions do + * not change inside a VTS. Therefore this event can be used to query such + * information only when necessary and update the decoding/displaying + * accordingly. + */ +#define DVDNAV_VTS_CHANGE 5 + +typedef struct { + int old_vtsN; /* the old VTS number */ + dvd_read_domain_t old_domain; /* the old domain */ + int new_vtsN; /* the new VTS number */ + dvd_read_domain_t new_domain; /* the new domain */ +} dvdnav_vts_change_event_t; + + +/* + * DVDNAV_CELL_CHANGE + * + * Some status information like the current Title and Part numbers do not + * change inside a cell. Therefore this event can be used to query such + * information only when necessary and update the decoding/displaying + * accordingly. + * Some useful information for accurate time display is also reported + * together with this event. + */ +#define DVDNAV_CELL_CHANGE 6 + +typedef struct { + int cellN; /* the new cell number */ + int pgN; /* the current program number */ + int64_t cell_length; /* the length of the current cell in PTS ticks */ + int64_t pg_length; /* the length of the current program in PTS ticks */ + int64_t pgc_length; /* the length of the current program chain in PTS ticks */ + int64_t cell_start; /* the start time of the current cell relatively to the PGC in PTS ticks */ + int64_t pg_start; /* the start time of the current PG relatively to the PGC in PTS ticks */ +} dvdnav_cell_change_event_t; + + +/* + * DVDNAV_NAV_PACKET + * + * NAV packets are useful for various purposes. They define the button + * highlight areas and VM commands of DVD menus, so they should in any + * case be sent to the SPU decoder/overlaying engine for the menus to work. + * NAV packets also provide a way to detect PTS discontinuities, because + * they carry the start and end PTS values for the current VOBU. + * (pci.vobu_s_ptm and pci.vobu_e_ptm) Whenever the start PTS of the + * current NAV does not match the end PTS of the previous NAV, a PTS + * discontinuity has occured. + * NAV packets can also be used for time display, because they are + * timestamped relatively to the current Cell. + */ +#define DVDNAV_NAV_PACKET 7 + + +/* + * DVDNAV_STOP + * + * Applications should end playback here. A subsequent dvdnav_get_next_block() + * call will restart the VM from the beginning of the DVD. + */ +#define DVDNAV_STOP 8 + + +/* + * DVDNAV_HIGHLIGHT + * + * The current button highlight changed. Inform the overlaying engine to + * highlight a different button. Please note, that at the moment only mode 1 + * highlights are reported this way. That means, when the button highlight + * has been moved around by some function call, you will receive an event + * telling you the new button. But when a button gets activated, you have + * to handle the mode 2 highlighting (that is some different colour the + * button turns to on activation) in your application. + */ +#define DVDNAV_HIGHLIGHT 9 + +typedef struct { + /* highlight mode: 0 - hide, 1 - show, 2 - activate, currently always 1 */ + int display; + + /* FIXME: these fields are currently not set */ + uint32_t palette; /* The CLUT entries for the highlight palette + (4-bits per entry -> 4 entries) */ + uint16_t sx,sy,ex,ey; /* The start/end x,y positions */ + uint32_t pts; /* Highlight PTS to match with SPU */ + + /* button number for the SPU decoder/overlaying engine */ + uint32_t buttonN; +} dvdnav_highlight_event_t; + + +/* + * DVDNAV_SPU_CLUT_CHANGE + * + * Inform the SPU decoder/overlaying engine to update its colour lookup table. + * The CLUT is given as 16 uint32_t's in the buffer. + */ +#define DVDNAV_SPU_CLUT_CHANGE 10 + + +/* + * DVDNAV_HOP_CHANNEL + * + * A non-seamless operation has been performed. Applications can drop all + * their internal fifo's content, which will speed up the response. + */ +#define DVDNAV_HOP_CHANNEL 12 + + +/* + * DVDNAV_WAIT + * + * We have reached a point in DVD playback, where timing is critical. + * Player application with internal fifos can introduce state + * inconsistencies, because libdvdnav is always the fifo's length + * ahead in the stream compared to what the application sees. + * Such applications should wait until their fifos are empty + * when they receive this type of event. + * Once this is achieved, call dvdnav_skip_wait(). + */ +#define DVDNAV_WAIT 13 + + +#endif /* LIBDVDNAV_DVDNAV_EVENTS_H */ Modified: trunk/libdvdnav/src/highlight.c ============================================================================== --- trunk/libdvdnav/src/highlight.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/highlight.c Tue Dec 30 15:48:46 2008 (r1160) @@ -30,13 +30,12 @@ #include <string.h> #include <sys/time.h> #include <dvdread/nav_types.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" #include "vm/vmcmd.h" #include "dvdnav_internal.h" -#include "dvdnav.h" /* #define BUTTON_TESTING Modified: trunk/libdvdnav/src/navigation.c ============================================================================== --- trunk/libdvdnav/src/navigation.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/navigation.c Tue Dec 30 15:48:46 2008 (r1160) @@ -26,13 +26,12 @@ #include <limits.h> #include <string.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" /* Navigation API calls */ Modified: trunk/libdvdnav/src/read_cache.c ============================================================================== --- trunk/libdvdnav/src/read_cache.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/read_cache.c Tue Dec 30 15:48:46 2008 (r1160) @@ -33,13 +33,12 @@ #include <limits.h> #include <sys/time.h> #include <time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" #include "read_cache.h" Modified: trunk/libdvdnav/src/remap.c ============================================================================== --- trunk/libdvdnav/src/remap.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/remap.c Tue Dec 30 15:48:46 2008 (r1160) @@ -36,13 +36,12 @@ #include <inttypes.h> #include <limits.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" struct block_s { Modified: trunk/libdvdnav/src/searching.c ============================================================================== --- trunk/libdvdnav/src/searching.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/searching.c Tue Dec 30 15:48:46 2008 (r1160) @@ -29,13 +29,12 @@ #include <string.h> #include <stdlib.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" /* Modified: trunk/libdvdnav/src/settings.c ============================================================================== --- trunk/libdvdnav/src/settings.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/settings.c Tue Dec 30 15:48:46 2008 (r1160) @@ -26,13 +26,12 @@ #include <limits.h> #include <string.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "remap.h" #include "vm/decoder.h" #include "vm/vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" /* Characteristics/setting API calls */ Modified: trunk/libdvdnav/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav/src/vm/decoder.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/vm/decoder.c Tue Dec 30 15:48:46 2008 (r1160) @@ -33,12 +33,11 @@ #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> /* vm_cmd_t */ -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include "remap.h" #include "decoder.h" #include "vm.h" #include "vmcmd.h" -#include "dvdnav.h" #include "dvdnav_internal.h" uint32_t vm_getbits(command_t *command, int32_t start, int32_t count) { Modified: trunk/libdvdnav/src/vm/vm.c ============================================================================== --- trunk/libdvdnav/src/vm/vm.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/vm/vm.c Tue Dec 30 15:48:46 2008 (r1160) @@ -40,12 +40,11 @@ #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include <dvdread/ifo_read.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include "decoder.h" #include "remap.h" #include "vm.h" -#include "dvdnav.h" #include "dvdnav_internal.h" #ifdef _MSC_VER Modified: trunk/libdvdnav/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.c Sat Dec 13 15:27:51 2008 (r1159) +++ trunk/libdvdnav/src/vm/vmcmd.c Tue Dec 30 15:48:46 2008 (r1160) @@ -30,14 +30,13 @@ #include <limits.h> #include <sys/time.h> -#include "dvd_types.h" +#include "dvdnav/dvdnav.h" #include <dvdread/nav_types.h> #include <dvdread/ifo_types.h> #include "decoder.h" #include "remap.h" #include "vm.h" #include "vmcmd.h" -#include "dvdnav.h" #include "dvdnav_internal.h" /* freebsd compatibility */

3 3

Re: [DVDnav-discuss] Using libdvdnav on ARM Based NAS
by John 13 Dec '08

13 Dec '08

I think I am beginning to understand what is going on, but not why it happens. For reference, here is the output I get from the menus example from libdvdnav 4.1.3 from my DNS-323 NAS when getting the information from a DVD: *Opening DVD... libdvdnav: Using dvdnav version 4.1.3 libdvdread: Using libdvdcss version 1.2.10 for DVD access libdvdnav: DVD Title: SERENITY libdvdnav: DVD Serial Number: 3337a571 libdvdnav: DVD Title (Alternative): WS_R0 libdvdnav: Unable to find map file '//.dvdnav/SERENITY.map' *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:522 for vmgi_mat->zero_8 = 0x0000000000000000000000000000**00000000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 0000000000000004e000 00304c5656e0000000004c56672000**0000004c1 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2040 for vts_attributes->zero_6 = 0x656e *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x0000010300656e00000100 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x536d00000100664e000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000043000 00104c1656e0000000000000000000**000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x0000010300656e00000100 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x536d00000100664e000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000043000 00204c1656e0000000004c1656e000**300000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x0000010300656e00000100 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x536d00000100664e000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000043000 00104c1656e0000000000000000000**000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x0000010300656e00000100 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2046 for vts_attributes->vtstt_audio_**attr[i] = 0x536d00000100664e000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000043000 00104c1656e0000000000000000000**000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 0000000000000004e000 00104c5656e0000000000000000000**000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2036 for vts_attributes->zero_2 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 00000000000000001000000000000 *** Zero check failed in /mnt/HD_a2/source/libdvdread-**4.1.3/src/ifo_read.c:2039 for vts_attributes->zero_5 = 0x0000000000000000000000000000**00000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000000000 000000000000000000000000000000**000000000000000000000000000000** 00000000000000043000 00104c1656e0000000000000000000**000000000 libdvdnav: DVD disk reports itself with Region mask 0x00000000. Regions: 1 2 3 4 5 6 7 8 *All but one of these Zero check errors occur in the ifoRead_VTS_ATTRIBUTES function in dvd_reader.c. From what I can gather, this function extracts the audio information from the DVD. In looking at some of the data that is shown in the output above where there should have been zeros read, I see numerous references to 0x656e and 0x6672 which are the ascii values for "en" and "fr". This DVD does have English and French audio soundtracks and this would be valid information for other properties in the vts_attributes_t structure that was filled when the DVD was read. It appears to me that the base memory address when the VTS attributes were read from the DVD was incorrect. I do not see these errors when using the same version on my Ubuntu Hardy setup and I am having difficulty finding where this incorrect base memory address could be have occurred on the NAS (armv5tejl). Any ideas? Thanks, John

4 8

r1159 - trunk/libdvdread/src/ifo_types.h
by rathann 13 Dec '08

13 Dec '08

Author: rathann Date: Sat Dec 13 15:27:51 2008 New Revision: 1159 Log: Because of ARM memory alignment issues the struct app_info has to be packed. Patch by Erik Hovland /erik ^ hovland * org \ Modified: trunk/libdvdread/src/ifo_types.h Modified: trunk/libdvdread/src/ifo_types.h ============================================================================== --- trunk/libdvdread/src/ifo_types.h (original) +++ trunk/libdvdread/src/ifo_types.h Sat Dec 13 15:27:51 2008 @@ -122,7 +122,7 @@ typedef struct { unsigned char dolby_encoded : 1; /* suitable for surround decoding */ unsigned char unknown6 : 3; } surround; - } app_info; + } ATTRIBUTE_PACKED app_info; } ATTRIBUTE_PACKED audio_attr_t;

1 0