- DVDnav-discuss - lists.mplayerhq.hu

[propchange]: r997 - svn:log
by ben 05 Jan '08

05 Jan '08

Author: ben Revision: 997 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ fix compilation after the recent split of dvdread from dvdnav -Patch from Nico Sabbi +

2 1

r997 - in trunk/dvdbackup: Makefile dvdbackup.c
by ben 05 Jan '08

05 Jan '08

Author: ben Date: Sat Jan 5 16:32:23 2008 New Revision: 997 Log: fix compilation after the recent split of dvdread from dvdnav Patch from Nico Sabbi Modified: trunk/dvdbackup/Makefile trunk/dvdbackup/dvdbackup.c Modified: trunk/dvdbackup/Makefile ============================================================================== --- trunk/dvdbackup/Makefile (original) +++ trunk/dvdbackup/Makefile Sat Jan 5 16:32:23 2008 @@ -13,7 +13,7 @@ OBJECTS = dvdbackup.o HEADERS = CFLAGS = -Wall -O2 -pipe -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" -LDFLAGS = -ldvdnav +LDFLAGS = -ldvdread .SUFFIXES: .c Modified: trunk/dvdbackup/dvdbackup.c ============================================================================== --- trunk/dvdbackup/dvdbackup.c (original) +++ trunk/dvdbackup/dvdbackup.c Sat Jan 5 16:32:23 2008 @@ -35,10 +35,9 @@ #include <unistd.h> #include <string.h> #include <limits.h> -#include <dvdnav/dvd_reader.h> -#include <dvdnav/dvd_udf.h> -#include <dvdnav/ifo_read.h> -#include <dvdnav/ifo_print.h> +#include <dvdread/dvd_reader.h> +#include <dvdread/ifo_read.h> +#include <dvdread/ifo_print.h> #define MAXNAME 256

1 0

[PATCH] Fix Makefile to use the correct path for dvdnav-config
by flameeyes＠gmail.com 05 Jan '08

05 Jan '08

This fix is needed to be able to build dvdnav outside of the source directory. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1

r996 - trunk/libdvdnav/src/vm/vmcmd.c
by nicodvb 05 Jan '08

05 Jan '08

Author: nicodvb Date: Sat Jan 5 16:17:28 2008 New Revision: 996 Log: make static const various tables; NULL were changed to emtpy strings; patch by Diego Pettenò Modified: trunk/libdvdnav/src/vm/vmcmd.c Modified: trunk/libdvdnav/src/vm/vmcmd.c ============================================================================== --- trunk/libdvdnav/src/vm/vmcmd.c (original) +++ trunk/libdvdnav/src/vm/vmcmd.c Sat Jan 5 16:17:28 2008 @@ -53,22 +53,22 @@ #define PRIu16 "d" #endif -static const char *cmp_op_table[] = { - NULL, "&", "==", "!=", ">=", ">", "<=", "<" +static const char cmp_op_table[][4] = { + "", "&", "==", "!=", ">=", ">", "<=", "<" }; -static const char *set_op_table[] = { - NULL, "=", "<->", "+=", "-=", "*=", "/=", "%=", "rnd", "&=", "|=", "^=" +static const char set_op_table[][4] = { + "", "=", "<->", "+=", "-=", "*=", "/=", "%=", "rnd", "&=", "|=", "^=" }; -static const char *link_table[] = { +static const char link_table[][16] = { "LinkNoLink", "LinkTopC", "LinkNextC", "LinkPrevC", - NULL, "LinkTopPG", "LinkNextPG", "LinkPrevPG", - NULL, "LinkTopPGC", "LinkNextPGC", "LinkPrevPGC", - "LinkGoUpPGC", "LinkTailPGC", NULL, NULL, + "", "LinkTopPG", "LinkNextPG", "LinkPrevPG", + "", "LinkTopPGC", "LinkNextPGC", "LinkPrevPGC", + "LinkGoUpPGC", "LinkTailPGC", "", "", "RSM" }; -static const char *system_reg_table[] = { +static const char *const system_reg_table[] = { "Menu Description Language Code", "Audio Stream Number", "Sub-picture Stream Number", @@ -95,8 +95,8 @@ static const char *system_reg_table[] = "Reserved 23" }; -static const char *system_reg_abbr_table[] = { - NULL, +static const char system_reg_abbr_table[][8] = { + "", "ASTN", "SPSTN", "AGLN", @@ -107,23 +107,23 @@ static const char *system_reg_abbr_table "HL_BTNN", "NVTMR", "NV_PGCN", - NULL, + "", "CC_PLT", "PLT", - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", }; static void print_system_reg(uint16_t reg) { - if(reg < sizeof(system_reg_abbr_table) / sizeof(char *)) + if(reg < sizeof(system_reg_abbr_table) / sizeof(system_reg_abbr_table[0])) fprintf(MSG_OUT, "%s (SRPM:%d)", system_reg_table[reg], reg); else fprintf(MSG_OUT, " WARNING: Unknown system register ( reg=%d ) ", reg); @@ -144,14 +144,14 @@ static void print_reg(uint8_t reg) { } static void print_cmp_op(uint8_t op) { - if(op < sizeof(cmp_op_table) / sizeof(char *) && cmp_op_table[op] != NULL) + if(op < sizeof(cmp_op_table) / sizeof(cmp_op_table[0])) fprintf(MSG_OUT, " %s ", cmp_op_table[op]); else fprintf(MSG_OUT, " WARNING: Unknown compare op "); } static void print_set_op(uint8_t op) { - if(op < sizeof(set_op_table) / sizeof(char *) && set_op_table[op] != NULL) + if(op < sizeof(set_op_table) / sizeof(cmp_op_table[0])) fprintf(MSG_OUT, " %s ", set_op_table[op]); else fprintf(MSG_OUT, " WARNING: Unknown set op "); @@ -285,7 +285,7 @@ static void print_linksub_instruction(co uint32_t linkop = vm_getbits(command, 7, 8); uint32_t button = vm_getbits(command, 15, 6); - if(linkop < sizeof(link_table)/sizeof(char *) && link_table[linkop] != NULL) + if(linkop < sizeof(link_table)/sizeof(link_table[0])) fprintf(MSG_OUT, "%s (button %" PRIu8 ")", link_table[linkop], button); else fprintf(MSG_OUT, "WARNING: Unknown linksub instruction (%i)", linkop);

1 0

[PATCH] Make vmcmd table constants
by flameeyes＠gmail.com 05 Jan '08

05 Jan '08

The attached patch replaces the tables in vm/vmcmd.c with constant tables. The constant tables will be moved to .rodata, so they'll use less memory (they'll be memory mapped from the library file - or from the executable if using static library). Please note that NULL can't be used with arrays of arrays so they were replaced by empty literals ("") and the checks were changed accordingly. You might find a waste of space in system_reg_abbr_table, but that's actually minimal and only present for 32-bit (or less) systems, as on 64-bit systems the size of the pointer is 8 like the size of the empty strings I've added. system_reg_table has too varied strings, so using an array of array there might be a bit of a waste because of padding. Maybe using glib's way (with two arrays, of characters with the strings and one of offsets) could be an option, considering they are used just in one place; I'll consider it for a new patch. For more details about the reasoning for using arrays of arrays rather than arrays of strings, I'd point to two blog entries I've written (tinyurl'd or the lines would be way too long for my mailer to work with :P): http://tinyurl.com/34vryr and http://tinyurl.com/3aa2ll . -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 2

r995 - trunk/libdvdnav/Makefile
by nicodvb 05 Jan '08

05 Jan '08

Author: nicodvb Date: Sat Jan 5 16:10:15 2008 New Revision: 995 Log: chmod as executable the correct dvdnav-config; patch by Diego Pettenò Modified: trunk/libdvdnav/Makefile Modified: trunk/libdvdnav/Makefile ============================================================================== --- trunk/libdvdnav/Makefile (original) +++ trunk/libdvdnav/Makefile Sat Jan 5 16:10:15 2008 @@ -182,7 +182,7 @@ dvdnav-config: $(.OBJDIR) @echo 'threadlib='$(THREADLIB) >> $(.OBJDIR)/dvdnav-config @echo >> $(.OBJDIR)/dvdnav-config cat $(SRC_PATH_BARE)/misc/dvdnav-config2.sh >> $(.OBJDIR)/dvdnav-config - chmod 0755 $(SRC_PATH_BARE)/$(.OBJDIR)/dvdnav-config + chmod 0755 $(.OBJDIR)/dvdnav-config install-dvdnav-config: dvdnav-config install -d $(PREFIX)/bin

1 0

[PATCH] Fix configure2 optval discovery
by flameeyes＠gmail.com 05 Jan '08

05 Jan '08

The attached patch changes the cut command used to discovery of optval so that it takes _everything_ after the first = sign. Without this, passing -extra-cflags="-march=atlhlon64 -O3" sets the CFLAGS just to -march (making GCC fail). -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1

r994 - trunk/libdvdnav/configure2
by nicodvb 05 Jan '08

05 Jan '08

Author: nicodvb Date: Sat Jan 5 15:50:53 2008 New Revision: 994 Log: dd to cut -f 2- instead of -f 2 to permit to catch all characters after the second field delimiter, or values of optval with "-" in them will be truncated. Patch by Diego Pettenò Modified: trunk/libdvdnav/configure2 Modified: trunk/libdvdnav/configure2 ============================================================================== --- trunk/libdvdnav/configure2 (original) +++ trunk/libdvdnav/configure2 Sat Jan 5 15:50:53 2008 @@ -57,7 +57,7 @@ optimizations="-O3" threadlib="-lpthread" for opt do - optval=`echo $opt | cut -d '=' -f 2` + optval=`echo $opt | cut -d '=' -f 2-` case "$opt" in --enable-shared) SHARED=yes ;;

1 0

r993 - trunk/libdvdnav/src/vm/decoder.c
by nicodvb 05 Jan '08

05 Jan '08

Author: nicodvb Date: Sat Jan 5 10:22:45 2008 New Revision: 993 Log: static-ize a const; patch by Diego Pettenò Modified: trunk/libdvdnav/src/vm/decoder.c Modified: trunk/libdvdnav/src/vm/decoder.c ============================================================================== --- trunk/libdvdnav/src/vm/decoder.c (original) +++ trunk/libdvdnav/src/vm/decoder.c Sat Jan 5 10:22:45 2008 @@ -417,7 +417,7 @@ static int32_t eval_system_set(command_t For the swap case the contents of reg is stored in reg2. */ static void eval_set_op(command_t* command, int32_t op, int32_t reg, int32_t reg2, int32_t data) { - const int32_t shortmax = 0xffff; + static const int32_t shortmax = 0xffff; int32_t tmp; switch(op) { case 1:

1 0

[PATCH] Staticise a constant
by flameeyes＠gmail.com 05 Jan '08

05 Jan '08

Do I have to explain this? ;) -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/

2 1