[gst-cvs] thomasvs gst-sandbox: gst-sandbox/gst-ethereal/ gst-sandbox/gst-ethereal/plugins/gstreamer/

[<tho...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-sandbox
Changes by:     thomasvs
Date:           Fri Jun 02 2006  10:10:03 UTC

Log message:
        * configure.ac:
        * plugins/gstreamer/packet-gdp.c: (proto_register_gdp),
        (dissect_gdp_tcp):
          require 0.10.6.1 of core, which adds gst_dp_crc()

Modified files:
    gst-ethereal    : ChangeLog configure.ac
    gst-ethereal/plugins/gstreamer: packet-gdp.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/gst-ethereal/ChangeLog.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/gst-ethereal/configure.ac.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-sandbox/gst-ethereal/plugins/gstreamer/packet-gdp.c.diff?r1=1.9&r2=1.10

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-sandbox/gst-ethereal/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ChangeLog	1 Jun 2006 18:35:41 -0000	1.5
+++ ChangeLog	2 Jun 2006 10:09:51 -0000	1.6
@@ -1,3 +1,10 @@
+2006-06-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	* plugins/gstreamer/packet-gdp.c: (proto_register_gdp),
+	(dissect_gdp_tcp):
+	  require 0.10.6.1 of core, which adds gst_dp_crc()
 2006-06-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* plugins/gstreamer/packet-gdp.c: (proto_register_gdp),
Index: configure.ac
RCS file: /cvs/gstreamer/gst-sandbox/gst-ethereal/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	1 Jun 2006 09:48:48 -0000	1.1
+++ configure.ac	2 Jun 2006 10:09:51 -0000	1.2
@@ -50,7 +50,7 @@
   AC_MSG_ERROR([you need to have pkgconfig installed])
 fi
-GST_REQUIRED=0.10.0
+GST_REQUIRED=0.10.6.1
 GST_MAJORMINOR=0.10
 AC_SUBST(GST_MAJORMINOR)
Index: packet-gdp.c
RCS file: /cvs/gstreamer/gst-sandbox/gst-ethereal/plugins/gstreamer/packet-gdp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- packet-gdp.c	1 Jun 2006 18:37:15 -0000	1.9
+++ packet-gdp.c	2 Jun 2006 10:09:51 -0000	1.10
@@ -66,39 +66,6 @@
   {0, NULL},
 };
-/* copied from dataprotocol.c */
-#define POLY       0x1021
-#define CRC_INIT   0xFFFF
-
-static guint16
-gst_dp_crc (const guint8 * buffer, register guint length)
-{
-  static gboolean initialized = FALSE;
-  static guint16 crc_table[256];
-  guint16 crc_register = CRC_INIT;
-  unsigned long i, j, k;
-  if (!initialized) {
-    for (i = 0; i < 256; i++) {
-      j = i << 8;
-      for (k = 8; k--;) {
-        j = j & 0x8000 ? (j << 1) ^ POLY : j << 1;
-      }
-      crc_table[i] = (guint16) j;
-    }
-    initialized = TRUE;
-  }
-  /* calc CRC */
-  for (; length--;) {
-    crc_register = (guint16) ((crc_register << 8) ^
-        crc_table[((crc_register >> 8) & 0x00ff) ^ *buffer++]);
-  return (0xffff ^ crc_register);
-}
 void
 proto_register_gdp (void)
 {