[SCM] Mumudvb packaging branch, upstream, updated. 24c2efb080b56abb8e7be67bae30ba7fe457759e
Brice DUBOST
braice at braice.net
Sat Nov 1 13:31:03 UTC 2008
The following commit has been merged in the upstream branch:
commit 9f8454d97cbefa26d614a5fcfa0e2a628a0961c4
Author: Brice DUBOST <braice at braice.net>
Date: Sun Sep 21 13:52:20 2008 +0200
Segfault and gcc 4.2 compatibility
* segfault when the directory /var/run/mumudvb doesn't exist
* CRC32 calculation and new version of gcc issues corrected
diff --git a/src/Makefile b/src/Makefile
index deee3c1..29b1b6b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,9 +1,9 @@
CC = gcc
-CFLAGS = -Wall -Wextra -O2
+CFLAGS = -Wall -Wextra -O2 -ggdb
IFLAGS = -g root -o root
OUT = mumudvb
-OBJ_FILES = mumudvb.o tune.o udp.o dvb.o pat_rewrite.o cam.o cam_en50221.o log.o ts.o autoconf.o
+OBJ_FILES = mumudvb.o tune.o udp.o dvb.o pat_rewrite.o cam.o cam_en50221.o log.o ts.o autoconf.o crc32.o
SRC_FILES = $(OBJ_FILES:.o=.c)
ifdef DESTDIR
diff --git a/src/crc32.c b/src/crc32.c
new file mode 100644
index 0000000..9eb3cc8
--- /dev/null
+++ b/src/crc32.c
@@ -0,0 +1,98 @@
+/*
+ * mumudvb - UDP-ize a DVB transport stream.
+ * File for CRC32 calculation
+ *
+ * (C) Brice DUBOST
+ *
+ * The latest version can be found at http://mumudvb.braice.net
+ *
+ * Copyright notice:
+ *
+ * This program 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.
+ *
+ * This program 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <stdint.h>
+
+//CRC table for PAT rebuilding, cam support and autoconfiguration
+
+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
+};
+
diff --git a/src/mumudvb.c b/src/mumudvb.c
index a89b3e6..e4679ae 100644
--- a/src/mumudvb.c
+++ b/src/mumudvb.c
@@ -33,6 +33,7 @@
#include <sys/time.h>
#include <sys/poll.h>
#include <sys/stat.h>
+#include <stdint.h>
#include <resolv.h>
#include <fcntl.h>
#include <unistd.h>
@@ -54,6 +55,7 @@
#define VERSION "1.5.0"
+extern uint32_t crc32_table[256];
/* Signal handling code shamelessly copied from VDR by Klaus Schmidinger
- see http://www.cadsoft.de/people/kls/vdr/index.htm */
@@ -104,10 +106,6 @@ access_sys_t *cam_sys_access;
// file descriptors
fds_t fds; // defined in dvb.h
-
-//CRC table for PAT rebuilding and cam support
-unsigned long crc32_table[256];
-
// prototypes
static void SignalHandler (int signum);
int mumudvb_close(int Interrupted, mumudvb_ts_packet_t *cam_pmt_ptr);
@@ -210,7 +208,6 @@ main (int argc, char **argv)
//do we rewrite the pat pid ?
int rewrite_pat = 0;
- unsigned long crc32_table_temp_var[3];
//do we support conditionnal access modules ?
int i;
@@ -654,8 +651,8 @@ main (int argc, char **argv)
nom_fich_chaines_diff, strerror (errno));
//exit(ERROR_CREATE_FILE);
}
-
- fclose (chaines_diff);
+ else
+ fclose (chaines_diff);
chaines_non_diff = fopen (nom_fich_chaines_non_diff, "w");
if (chaines_diff == NULL)
@@ -666,8 +663,8 @@ main (int argc, char **argv)
nom_fich_chaines_non_diff, strerror (errno));
//exit(ERROR_CREATE_FILE);
}
-
- fclose (chaines_non_diff);
+ else
+ fclose (chaines_non_diff);
log_message( MSG_INFO, "Streaming. Freq %lu pol %c srate %lu\n",
@@ -675,23 +672,6 @@ main (int argc, char **argv)
/******************************************************/
- //we compute the crc32 tables for cam support,
- // autoconfiguration or pat rewriting
- /******************************************************/
- if(cam_support||rewrite_pat||autoconfiguration)
- {
- //CRC32 table initialisation (taken from the xine project), we can also use static tables if we want
- for( crc32_table_temp_var[0] = 0 ; crc32_table_temp_var[0] < 256 ; crc32_table_temp_var[0]++ ) {
- crc32_table_temp_var[2] = 0;
- for (crc32_table_temp_var[1] = (crc32_table_temp_var[0] << 24) | 0x800000 ; crc32_table_temp_var[1] != 0x80000000 ; crc32_table_temp_var[1] <<= 1) {
- crc32_table_temp_var[2] = (crc32_table_temp_var[2] << 1) ^ (((crc32_table_temp_var[2] ^ crc32_table_temp_var[1]) & 0x80000000) ? 0x04c11db7 : 0);
- }
- crc32_table[crc32_table_temp_var[0]] = crc32_table_temp_var[2];
- }
- }
-
-
- /******************************************************/
// Card tuning
/******************************************************/
// alarm for tuning timeout
@@ -702,6 +682,8 @@ main (int argc, char **argv)
alarm (timeout_accord);
// We tune the card
+ tune_retval =-1;
+
if ((freq > 100000000))
{
if (open_fe (&fds.fd_frontend, card))
diff --git a/src/pat_rewrite.c b/src/pat_rewrite.c
index 149b7bd..181b6dd 100644
--- a/src/pat_rewrite.c
+++ b/src/pat_rewrite.c
@@ -29,9 +29,9 @@
#include "mumudvb.h"
#include "ts.h"
+#include <stdint.h>
-extern unsigned long crc32_table[256];
-
+extern uint32_t crc32_table[256];
int
pat_rewrite(unsigned char *buf,int num_pids, int *pids)
@@ -72,7 +72,7 @@ pat_rewrite(unsigned char *buf,int num_pids, int *pids)
calc_crc32=0xffffffff;
//we compute the CRC32
for(i = 0; i < section_length-1; i++) {
- calc_crc32 = (calc_crc32 << 8) ^ crc32_table[(calc_crc32 >> 24) ^ buf[i+TS_HEADER_LEN]];
+ calc_crc32 = (calc_crc32 << 8) ^ crc32_table[((calc_crc32 >> 24) ^ buf[i+TS_HEADER_LEN])&0xff];
}
crc32=0x00000000;
@@ -150,7 +150,7 @@ pat_rewrite(unsigned char *buf,int num_pids, int *pids)
//we compute the CRC32
crc32=0xffffffff;
for(i = 0; i < new_section_length-1; i++) {
- crc32 = (crc32 << 8) ^ crc32_table[(crc32 >> 24) ^ buf_dest[i+TS_HEADER_LEN]];
+ crc32 = (crc32 << 8) ^ crc32_table[((crc32 >> 24) ^ buf_dest[i+TS_HEADER_LEN])&0xff];
}
diff --git a/src/ts.c b/src/ts.c
index c1fc019..0b16ea6 100644
--- a/src/ts.c
+++ b/src/ts.c
@@ -29,7 +29,9 @@
#include "ts.h"
#include "mumudvb.h"
-extern unsigned long crc32_table[256];
+#include <stdint.h>
+extern uint32_t crc32_table[256];
+
int get_ts_packet(unsigned char *buf, mumudvb_ts_packet_t *ts_packet)
{
@@ -160,7 +162,7 @@ int ts_check_CRC( mumudvb_ts_packet_t *pmt)
//we have two ways: either we compute untill the end and it should be 0
//either we exclude the 4 last bits and in should be equal to the 4 last bits
for(i = 0; i < pmt->len; i++) {
- crc32 = (crc32 << 8) ^ crc32_table[(crc32 >> 24) ^ pmt->packet[i]];
+ crc32 = (crc32 << 8) ^ crc32_table[((crc32 >> 24) ^ pmt->packet[i])&0xff];
}
if(crc32!=0)
--
Mumudvb packaging
More information about the pkg-vdr-dvb-changes
mailing list