Totally redo file formats

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1130 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 110 deletions

diff --git a/formats/format_vox.c b/formats/format_vox.c
index 3848f47c0..095ca1703 100755
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -35,21 +35,16 @@
 
 struct ast_filestream {
 	void *reserved[AST_RESERVED_POINTERS];
-	/* Believe it or not, we must decode/recode to account for the
-	   weird MS format */
 	/* This is what a filestream means to us */
 	int fd; /* Descriptor */
-	struct ast_channel *owner;
 	struct ast_frame fr;				/* Frame information */
 	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
 	char empty;							/* Empty character */
 	unsigned char buf[BUF_SIZE + 3];				/* Output Buffer */
 	int lasttimeout;
 	struct timeval last;
-	int adj;
 	short signal;						/* Signal level (file side) */
 	short ssindex;						/* Signal ssindex (file side) */
-	struct ast_filestream *next;
 };
 
 
@@ -182,10 +177,7 @@ static struct ast_filestream *vox_open(int fd)
 			free(tmp);
 			return NULL;
 		}
-		tmp->next = glist;
-		glist = tmp;
 		tmp->fd = fd;
-		tmp->owner = NULL;
 		tmp->fr.data = tmp->buf;
 		tmp->fr.frametype = AST_FRAME_VOICE;
 		tmp->fr.subclass = AST_FORMAT_ADPCM;
@@ -213,11 +205,7 @@ static struct ast_filestream *vox_rewrite(int fd, char *comment)
 			free(tmp);
 			return NULL;
 		}
-		tmp->next = glist;
-		glist = tmp;
 		tmp->fd = fd;
-		tmp->owner = NULL;
-		tmp->lasttimeout = -1;
 		glistcnt++;
 		ast_pthread_mutex_unlock(&vox_lock);
 		ast_update_use_count();
@@ -226,53 +214,23 @@ static struct ast_filestream *vox_rewrite(int fd, char *comment)
 	return tmp;
 }
 
-static struct ast_frame *vox_read(struct ast_filestream *s)
-{
-	return NULL;
-}
-
 static void vox_close(struct ast_filestream *s)
 {
-	struct ast_filestream *tmp, *tmpl = NULL;
 	if (ast_pthread_mutex_lock(&vox_lock)) {
 		ast_log(LOG_WARNING, "Unable to lock vox list\n");
 		return;
 	}
-	tmp = glist;
-	while(tmp) {
-		if (tmp == s) {
-			if (tmpl)
-				tmpl->next = tmp->next;
-			else
-				glist = tmp->next;
-			break;
-		}
-		tmpl = tmp;
-		tmp = tmp->next;
-	}
 	glistcnt--;
-	if (s->owner) {
-		s->owner->stream = NULL;
-		if (s->owner->streamid > -1)
-			ast_sched_del(s->owner->sched, s->owner->streamid);
-		s->owner->streamid = -1;
-	}
 	ast_pthread_mutex_unlock(&vox_lock);
 	ast_update_use_count();
-	if (!tmp) 
-		ast_log(LOG_WARNING, "Freeing a filestream we don't seem to own\n");
 	close(s->fd);
 	free(s);
 	s = NULL;
 }
 
-static int ast_read_callback(void *data)
+static struct ast_frame *vox_read(struct ast_filestream *s, int *whennext)
 {
-	int retval = 0;
 	int res;
-	int delay;
-	struct ast_filestream *s = data;
-	struct timeval tv;
 	int x;
 	/* Send a frame from the file to the appropriate channel */
 
@@ -284,8 +242,7 @@ static int ast_read_callback(void *data)
 	if ((res = read(s->fd, s->buf + 3, BUF_SIZE)) < 1) {
 		if (res)
 			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
-		s->owner->streamid = -1;
-		return 0;
+		return NULL;
 	}
 	/* Store index, then signal */
 	s->buf[0] = s->ssindex & 0xff;
@@ -298,55 +255,8 @@ static int ast_read_callback(void *data)
 	}
 	s->fr.samples = res * 2;
 	s->fr.datalen = res + 3;
-	delay = s->fr.samples / 8;
-	/* Lastly, process the frame */
-	if (ast_write(s->owner, &s->fr)) {
-		ast_log(LOG_WARNING, "Failed to write frame\n");
-		s->owner->streamid = -1;
-		return 0;
-	}
-	if (s->last.tv_usec || s->last.tv_usec) {
-		int ms;
-		gettimeofday(&tv, NULL);
-		ms = 1000 * (tv.tv_sec - s->last.tv_sec) + 
-			(tv.tv_usec - s->last.tv_usec) / 1000;
-		s->last.tv_sec = tv.tv_sec;
-		s->last.tv_usec = tv.tv_usec;
-		if ((ms - delay) * (ms - delay) > 4) {
-			/* Compensate if we're more than 2 ms off */
-			s->adj -= (ms - delay);
-		}
-#if 0
-		fprintf(stdout, "Delay is %d, adjustment is %d, last was %d\n", delay, s->adj, ms);
-#endif
-		delay += s->adj;
-		if (delay < 1)
-			delay = 1;
-	} else
-		gettimeofday(&s->last, NULL);
-	if (s->lasttimeout != delay) {
-		/* We'll install the next timeout now. */
-		s->owner->streamid = ast_sched_add(s->owner->sched,
-				delay, ast_read_callback, s); 
-		s->lasttimeout = delay;
-	} else {
-		/* Just come back again at the same time */
-		retval = -1;
-	}
-	return retval;
-}
-
-static int vox_apply(struct ast_channel *c, struct ast_filestream *s)
-{
-	/* Select our owner for this stream, and get the ball rolling. */
-	s->owner = c;
-	return 0;
-}
-
-static int vox_play(struct ast_filestream *s)
-{
-	ast_read_callback(s);
-	return 0;
+	*whennext = s->fr.samples;
+	return &s->fr;
 }
 
 static int vox_write(struct ast_filestream *fs, struct ast_frame *f)
@@ -396,8 +306,6 @@ int load_module()
 	return ast_format_register(name, exts, AST_FORMAT_ADPCM,
 								vox_open,
 								vox_rewrite,
-								vox_apply,
-								vox_play,
 								vox_write,
 								vox_seek,
 								vox_trunc,
@@ -411,20 +319,6 @@ int load_module()
 
 int unload_module()
 {
-	struct ast_filestream *tmp, *tmpl;
-	if (ast_pthread_mutex_lock(&vox_lock)) {
-		ast_log(LOG_WARNING, "Unable to lock vox list\n");
-		return -1;
-	}
-	tmp = glist;
-	while(tmp) {
-		if (tmp->owner)
-			ast_softhangup(tmp->owner, AST_SOFTHANGUP_APPUNLOAD);
-		tmpl = tmp;
-		tmp = tmp->next;
-		free(tmpl);
-	}
-	ast_pthread_mutex_unlock(&vox_lock);
 	return ast_format_unregister(name);
 }