Merge changes.

24 files changed, 133 insertions, 59 deletions

diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 10f1714f9..bacb2720f 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -32,6 +32,7 @@ libxineutils_la_SOURCES = $(pppc_files) \
 	cpu_accel.c \
 	color.c \
 	copy.c \
+	crc.c \
 	list.c \
 	memcpy.c \
 	monitor.c \
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index 9b514b59c..6c226c7ef 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: array.c,v 1.4 2007/02/03 16:31:55 dsalt Exp $
- *
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h
index d23a77a52..ae2093823 100644
--- a/src/xine-utils/array.h
+++ b/src/xine-utils/array.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: array.h,v 1.3 2007/02/03 16:31:55 dsalt Exp $
- *
  * Array that can grow automatically when you add elements.
  * Inserting an element in the middle of the array implies memory moves.
  */
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 261dbe204..0b9cf0188 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -60,8 +60,6 @@
  * to facilitate these operations (such as the PPC AltiVec pixel-unpacking
  * instructions), these macros will automatically map to those special
  * instructions.
- *
- * $Id: color.c,v 1.30 2006/07/17 18:31:24 hadess Exp $
  */
 
 #include "xine_internal.h"
diff --git a/src/xine-utils/compat.h b/src/xine-utils/compat.h
index 045fa8368..d4b95aeb3 100644
--- a/src/xine-utils/compat.h
+++ b/src/xine-utils/compat.h
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: compat.h,v 1.3 2003/04/20 21:13:26 guenter Exp $
- *
  */
 
 #ifndef XINE_COMPAT_H
diff --git a/src/xine-utils/crc.c b/src/xine-utils/crc.c
new file mode 100644
index 000000000..ba0e3010b
--- /dev/null
+++ b/src/xine-utils/crc.c
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2000-2007 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine 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.
+ *
+ * xine 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ *
+ * Common CRC calculation code.
+ */
+
+#include "xineutils.h"
+
+static const uint32_t crc32_table[256] = {
+  0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+  0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+  0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+  0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+  0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+  0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+  0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+  0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+  0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+  0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+  0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+  0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+  0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+  0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+  0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+  0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+  0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+  0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+  0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+  0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+  0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+  0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+  0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+  0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+  0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+  0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+  0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+  0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+  0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+  0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+  0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+  0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+  0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+  0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+  0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+  0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+  0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+  0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+  0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+  0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+  0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+  0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+  0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+  0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+  0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+  0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+  0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+  0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+  0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+  0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+  0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+  0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+  0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+  0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+  0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+  0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+  0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+  0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+  0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+  0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+  0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+  0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+  0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+  0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+};
+
+uint32_t _x_compute_crc32 (const uint8_t *data, int32_t length, uint32_t crc32)
+{
+  int32_t i;
+  for (i = 0; i < length; ++i)
+    crc32 = (crc32 << 8) ^ crc32_table[(crc32 >> 24) ^ data[i]];
+  return crc32;
+}
+
+#if 0
+/* generate the CRC data */
+
+#include <stdio.h>
+
+static void build_crc32_table (void)
+{
+  uint32_t i;
+
+  for (i = 0; i < 256; ++i)
+  {
+    uint32_t j, k = 0;
+    for (j = (i << 24) | 0x800000; j != 0x80000000; j <<= 1)
+      k = (k << 1) ^ (((k ^ j) & 0x80000000) ? 0x04c11db7 : 0);
+    crc32_table[i] = k;
+  }
+}
+
+int main (void)
+{
+  build_crc32_table ();
+  int i;
+  for (i = 0; i < 256; ++i)
+    printf ("0x%08x,%c", crc32_table[i], (3 & ~i) ? ' ' : '\n');
+  return 0;
+}
+
+#endif
diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c
index a440ade9c..65bdaec26 100644
--- a/src/xine-utils/list.c
+++ b/src/xine-utils/list.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h
index ac1c91b5a..e00e30d6c 100644
--- a/src/xine-utils/list.h
+++ b/src/xine-utils/list.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: list.h,v 1.5 2007/02/19 23:34:32 dgp85 Exp $
- *
  * Doubly-linked linked list.
  *
  * Exemples:
diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c
index ad1bfc5e7..3c7c3e10a 100644
--- a/src/xine-utils/monitor.c
+++ b/src/xine-utils/monitor.c
@@ -17,10 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: monitor.c,v 1.8 2006/06/23 18:24:22 dsalt Exp $
- *
  * debug print and profiling functions - implementation
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c
index cd0e40b0d..a1fddadd9 100644
--- a/src/xine-utils/pool.c
+++ b/src/xine-utils/pool.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
- *
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h
index 01ef69556..918da82a2 100644
--- a/src/xine-utils/pool.h
+++ b/src/xine-utils/pool.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
- *
  * Object Pool
  */
 
diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c
index ed3b3aee9..031fda4fc 100644
--- a/src/xine-utils/ring_buffer.c
+++ b/src/xine-utils/ring_buffer.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $
- *
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h
index 1c5bbcf51..efcffd3b7 100644
--- a/src/xine-utils/ring_buffer.h
+++ b/src/xine-utils/ring_buffer.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
- *
  * Fifo + Ring Buffer
  */
 typedef struct xine_ring_buffer_s xine_ring_buffer_t;
diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c
index c3dad54c9..363325f0b 100644
--- a/src/xine-utils/sorted_array.c
+++ b/src/xine-utils/sorted_array.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
- *
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h
index 9a4d61bd8..a1894eca3 100644
--- a/src/xine-utils/sorted_array.h
+++ b/src/xine-utils/sorted_array.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $
- *
  * Sorted array which grows automatically when you add elements.
  * A binary search is used to find the position of a new element.
  * 
@@ -52,7 +50,6 @@
  *
  *   Delete the array:
  *     xine_sarray_delete(sarray);
- * 
  */
 #ifndef XINE_SORTED_ARRAY_H
 #define XINE_SORTED_ARRAY_H
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 20286e7f6..980a2a520 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: utils.c,v 1.46 2006/07/21 04:47:17 dgp85 Exp $
- *
  */
 #define	_POSIX_PTHREAD_SEMANTICS 1	/* for 5-arg getpwuid_r on solaris */
 
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 842253ecb..190ab5197 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: xine_buffer.c,v 1.11 2006/06/23 18:24:22 dsalt Exp $
- *
  *
  * generic dynamic buffer functions. The goals
  * of these functions are (in fact many of these points
diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h
index b1c99ee34..84511bd1b 100644
--- a/src/xine-utils/xine_buffer.h
+++ b/src/xine-utils/xine_buffer.h
@@ -17,8 +17,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  *
- * $Id: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $
- *
  *
  * generic dynamic buffer functions. The goals
  * of these functions are (in fact many of these points
diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c
index 9c2943ea0..c94f32be0 100644
--- a/src/xine-utils/xine_mutex.c
+++ b/src/xine-utils/xine_mutex.c
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: xine_mutex.c,v 1.5 2006/07/16 14:45:24 dsalt Exp $
- *
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 9750eefad..3296b2ba9 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -16,9 +16,6 @@
  * 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, USA
- *
- * $Id: xineutils.h,v 1.107 2006/12/25 15:16:33 dgp85 Exp $
- *
  */
 #ifndef XINEUTILS_H
 #define XINEUTILS_H
@@ -973,6 +970,11 @@ const char *xine_guess_spu_encoding(void) XINE_PROTECTED;
  */
 int xine_monotonic_clock(struct timeval *tv, struct timezone *tz) XINE_PROTECTED;
 
+/**
+ * CRC functions
+ */
+uint32_t _x_compute_crc32 (const uint8_t * data, int32_t length, uint32_t crc32) XINE_PROTECTED;
+
 /* don't harm following code */
 #ifdef extern
 #  undef extern
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index a9fcd9e31..39632938f 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -17,9 +17,6 @@
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110, USA
- *
- *  $Id: xmllexer.c,v 1.13 2007/03/04 16:19:12 hadess Exp $
- *
  */
 
 #define LOG_MODULE "xmllexer"
diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h
index 5b6ce8311..10bcc8676 100644
--- a/src/xine-utils/xmllexer.h
+++ b/src/xine-utils/xmllexer.h
@@ -17,9 +17,6 @@
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110, USA
- *
- * $Id: xmllexer.h,v 1.8 2007/03/04 16:19:12 hadess Exp $
- *
  */
 
 /* xml lexer */
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index 21d5a6de9..a7bc146a9 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -17,9 +17,6 @@
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110, USA
- *
- *  $Id: xmlparser.c,v 1.16 2007/03/04 16:19:12 hadess Exp $
- *
  */
 
 #ifdef XINE_COMPILE
diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h
index 2536e079f..c89cb6dd3 100644
--- a/src/xine-utils/xmlparser.h
+++ b/src/xine-utils/xmlparser.h
@@ -17,9 +17,6 @@
  * License along with the Gnome Library; see the file COPYING.LIB.  If not,
  * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
  * Floor, Boston, MA 02110, USA
- *
- *  $Id: xmlparser.h,v 1.6 2007/03/04 16:19:12 hadess Exp $
- *
  */
 
 #ifndef XML_PARSER_H