X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/record-dvb/blobdiff_plain/dba12497cea20a96739be2fd80caa7427e20570b..4710a9f88a22ea44ad4ec216e6c379783e1079e3:/record-dvb.c

diff --git a/record-dvb.c b/record-dvb.c
index d32eba1..02fcd51 100644
--- a/record-dvb.c
+++ b/record-dvb.c
@@ -13,45 +13,50 @@
 #include "http.h"
 #include "mcast.h"
 
-#define CHUNKSIZE 1500
+#define CHUNKSIZE 3000
+#define GTOD_INTERVAL 100
 
 void record(int(*open_fn)(char *), char *url, char *outfile, int duration)
 {
 	struct timeval start, curr;
-	int bytes, written;
+	int bytes, recvd, written, count = 0;
 	char buffer[CHUNKSIZE];
-	int i;
 	int in, out;
 
-	if ((out = open(outfile, O_CREAT|O_TRUNC|O_WRONLY|O_LARGEFILE, 00644)) < 0) {
-		perror("open");
+	if ((in = (*open_fn)(url)) < 0) {
+		fprintf(stderr,"Can't open url %s!\n",url);
 		exit(EXIT_FAILURE);
 	}
 
-	if ((in = (*open_fn)(url)) < 0) {
-		fprintf(stderr,"Can't open url %s!\n",url);
+	if ((out = open(outfile, O_CREAT|O_TRUNC|O_WRONLY|O_LARGEFILE, 00644)) < 0) {
+		perror("open");
 		exit(EXIT_FAILURE);
 	}
 
 	printf("Recording from %s for %d seconds...\n", url, duration);
 
 	gettimeofday(&start, NULL);
+	curr = start;
 
 	do {
-		if ((bytes = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
+		if ((recvd = recv(in, buffer, CHUNKSIZE, 0)) < 1) {
 			/* TODO: Insert better connection-loss recovery here */
-			in = (*open_fn)(url);
+			if ((in = (*open_fn)(url)) < 0) {
+				sleep(1);
+				continue;
+			}
 		}
 		written = 0;
 		do {
-			if ((i = write(out, buffer, bytes-written)) < 0) {
+			if ((bytes = write(out, buffer, recvd-written)) < 0) {
 				perror("write");
 				exit(EXIT_FAILURE);
 			}
-			written += i;
-		} while(written < bytes);
+			written += bytes;
+		} while(written < recvd);
 
-		gettimeofday(&curr, NULL);
+		if (!(++count % GTOD_INTERVAL))
+			gettimeofday(&curr, NULL);
 	} while (curr.tv_sec < start.tv_sec+duration);
 
 	close(out);
@@ -68,7 +73,7 @@ int main(int argc, char **argv)
 
 	if (argc == 4) {
 		url = argv[1];
-		duration = atol(argv[2])*60;
+		duration = atoi(argv[2])*60;
 		outfile = argv[3];
 	} else {
 		fprintf(stderr,"Syntax: %s URL duration_in_minutes outfile\n", argv[0]);