increase buffer for mcfs video stream to 64k

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit cc9ca351 parent ee5b9873 files · +34 −3Browse files

Unified · Split

3 files

@@ -50,6 +50,8 @@ Sclose(Stream *s) · 49 unmodified lines
50	return;	50	return;
51	s->ops.close(s);	51	s->ops.close(s);
52	s->type = -1;	52	s->type = -1;
		53	if(s->freeaux != nil)
		54	s->freeaux(s->aux);
53	}	55	}
54		56
55	int	57	int

@@ -67,6 +67,8 @@ struct Stream { · 66 unmodified lines
67	void *b;	67	void *b;
68	u8int *buf;	68	u8int *buf;
69	int bufsz;	69	int bufsz;
		70	void *aux;
		71	void (freeaux)(void );
70	};	72	};
71		73
72	Stream Sopen(char filename, int *num);	74	Stream Sopen(char filename, int *num);

 enum {
 	Maxstreams = 2,
+	Bufsz = 64*1024,
+};
+typedef struct MCaux MCaux;
+struct MCaux {
+	int fd;
+	Biobuf bio;
+	u8int buf[Bufsz];
 };
 static int
 	return -1;
 }
+static void
+freeaux(void *aux)
+{
+	MCaux *a;
+	a = aux;
+	close(a->fd);
+	free(a);
+}
 static Stream *
 mcopen(char *filename, int *num, int *failed)
 {
 	char *line;
 	int p, pid, n, ns;
 	Biobuf b;
+	MCaux *a;
 	char *argv[] = {
 		"mcfs",
 		filename,
 			if(nvideo < 1 && strcmp(v[1], "video") == 0){
 				s->video.w = atoi(v[3]);
 				s->video.h = atoi(v[4]);
-				if(mcfs(argv, &sp) > 0 && ivfopenb(Bfdopen(sp, OREAD), s, failed) == 0){
+				if(mcfs(argv, &sp) > 0){
-					nvideo++;
+					if((a = malloc(sizeof(*a))) == nil)
-					ns++;
+						sysfatal("memory");
+					a->fd = sp;
+					s->aux = a;
+					s->freeaux = freeaux;
+					if(Binits(&a->bio, sp, OREAD, a->buf, Bufsz) == 0 && ivfopenb(&a->bio, s, failed) == 0){
+						nvideo++;
+						ns++;
+					}
 				}
 			}else if(naudio < 1 && strcmp(v[1], "audio") == 0 && (s->fmt = audfmt(v[2])) >= 0){
 				s->audio.nchan = atoi(v[3]);

Keyboard shortcuts