[Asterisk-cvs] asterisk slinfactory.c, NONE, 1.1 Makefile, 1.185, 1.186

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv20143

Modified Files:
	Makefile 
Added Files:
	slinfactory.c 
Log Message:
add slinfactory object, and change app_chanspy to use it (bug #4724)


--- NEW FILE: slinfactory.c ---
/*
 * Asterisk -- A telephony toolkit for Linux.
 *
 * A machine to gather up arbitrary frames and convert them
 * to raw slinear on demand.
 * 
 * Copyright (C) 2005, Anthony Minessale II.
 *
 * Anthony Minessale <anthmct at yahoo.com>
 *
 * This program is free software, distributed under the terms of
 * the GNU General Public License
 */

#include "asterisk/slinfactory.h"
#include "asterisk/file.h"
#include "asterisk/logger.h"
#include "asterisk/channel.h"
#include "asterisk/pbx.h"
#include "asterisk/module.h"
#include "asterisk/lock.h"
#include "asterisk/cli.h"
#include "asterisk/options.h"
#include "asterisk/app.h"
#include "asterisk/translate.h"


void ast_slinfactory_init(struct ast_slinfactory *sf) 
{
	memset(sf, 0, sizeof(struct ast_slinfactory));
	sf->offset = sf->hold;
	sf->queue = NULL;
}

void ast_slinfactory_destroy(struct ast_slinfactory *sf) 
{
	struct ast_frame *f;

	if (sf->trans) {
		ast_translator_free_path(sf->trans);
		sf->trans = NULL;
	}

	while((f = sf->queue)) {
		sf->queue = f->next;
		ast_frfree(f);
	}
}

int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
{
	struct ast_frame *frame, *frame_ptr;

	if (!f) {
		return 0;
	}

	if (f->subclass != AST_FORMAT_SLINEAR) {
		if (sf->trans && f->subclass != sf->format) {
			ast_translator_free_path(sf->trans);
			sf->trans = NULL;
		}
		if (!sf->trans) {
			if ((sf->trans = ast_translator_build_path(AST_FORMAT_SLINEAR, f->subclass)) == NULL) {
				ast_log(LOG_WARNING, "Cannot build a path from %s to slin\n", ast_getformatname(f->subclass));
				return 0;
			} else {
				sf->format = f->subclass;
			}
		}
	}

	if (sf->trans) {
		frame = ast_translate(sf->trans, f, 0);
	} else {
		frame = ast_frdup(f);
	}

	if (frame) {
		int x = 0;
		for (frame_ptr = sf->queue; frame_ptr && frame_ptr->next; frame_ptr=frame_ptr->next) {
			x++;
		}
		if (frame_ptr) {
			frame_ptr->next = frame;
		} else {
			sf->queue = frame;
		}
		frame->next = NULL;
		sf->size += frame->datalen;	
		return x;
	}

	return 0;
	
}

int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t bytes) 
{
	struct ast_frame *frame_ptr;
	int sofar = 0, ineed, remain;
	short *frame_data, *offset = buf;

	while (sofar < bytes) {
		ineed = bytes - sofar;

		if (sf->holdlen) {
			if ((sofar + sf->holdlen) <= ineed) {
				memcpy(offset, sf->hold, sf->holdlen);
				sofar += sf->holdlen;
				offset += (sf->holdlen / sizeof(short));
				sf->holdlen = 0;
				sf->offset = sf->hold;
			} else {
				remain = sf->holdlen - ineed;
				memcpy(offset, sf->offset, ineed);
				sofar += ineed;
				sf->offset += (ineed / sizeof(short));
				sf->holdlen = remain;
			}
			continue;
		}
		
		if ((frame_ptr = sf->queue)) {
			sf->queue = frame_ptr->next;
			frame_data = frame_ptr->data;
			
			if ((sofar + frame_ptr->datalen) <= ineed) {
				memcpy(offset, frame_data, frame_ptr->datalen);
				sofar += frame_ptr->datalen;
				offset += (frame_ptr->datalen / sizeof(short));
			} else {
				remain = frame_ptr->datalen - ineed;
				memcpy(offset, frame_data, ineed);
				sofar += ineed;
				frame_data += (ineed / sizeof(short));
				memcpy(sf->hold, frame_data, remain);
				sf->holdlen = remain;
			}
			ast_frfree(frame_ptr);
		} else {
			break;
		}
	}

	sf->size -= sofar;
	return sofar;
}





Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- Makefile	19 Jul 2005 23:17:02 -0000	1.185
+++ Makefile	20 Jul 2005 00:53:21 -0000	1.186
@@ -276,7 +276,7 @@
 	dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
 	astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
 	utils.o config_old.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
-	netsock.o
+	netsock.o slinfactory.o
 ifeq (${OSARCH},Darwin)
 OBJS+=poll.o dlfcn.o
 ASTLINK=-Wl,-dynamic