add L16 codec

include/mediastreamer2/allfilters.h

@@ -127,7 +127,9 @@ typedef enum MSFilterId{
 	MS_AAL2_G726_40_DEC_ID,
 	MS_AAL2_G726_32_DEC_ID,
 	MS_AAL2_G726_24_DEC_ID,
-	MS_AAL2_G726_16_DEC_ID
+	MS_AAL2_G726_16_DEC_ID,
+	MS_L16_ENC_ID,
+	MS_L16_DEC_ID
 } MSFilterId;
 
 

src/Makefile.am

@@ -57,7 +57,8 @@ libmediastreamer_la_SOURCES=	mscommon.c    $(GITVERSION_FILE) \
 				qualityindicator.c \
 				g722_decode.c g722.h \
 				g722_encode.c \
-				msg722.c 
+				msg722.c \
+				l16.c
 
 
 #dummy c++ file to force libtool to use c++ linking (because of msdscap-mingw.cc)

src/l16.c

+/*
+mediastreamer2 library - modular sound and video processing and streaming
+Copyright (C) 2011  Belledonne Communications SARL
+Author: Simon Morlat <simon.morlat@linphone.org>
+
+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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include <mediastreamer2/msfilter.h>
+
+struct EncState {
+	uint32_t ts;
+	int ptime;
+	int rate;
+	int nbytes;
+	MSBufferizer *bufferizer;
+};
+
+static void enc_init(MSFilter *f)
+{
+	struct EncState *s=(struct EncState*)ms_new(struct EncState,1);
+	s->ts=0;
+	s->bufferizer=ms_bufferizer_new();
+	s->ptime = 20;
+	s->rate=8000;
+	f->data=s;
+};
+
+static void enc_uninit(MSFilter *f)
+{
+	struct EncState *s=(struct EncState*)f->data;
+	ms_bufferizer_destroy(s->bufferizer);
+	ms_free(s);
+	f->data = 0;
+};
+
+static void enc_preprocess(MSFilter *f){
+	struct EncState *s=(struct EncState*)f->data;
+	s->nbytes=(2*s->rate*s->ptime)/1000;
+}
+
+static void enc_process(MSFilter *f)
+{
+	struct EncState *s=(struct EncState*)f->data;
+	
+	ms_bufferizer_put_from_queue(s->bufferizer,f->inputs[0]);
+	
+	while(ms_bufferizer_get_avail(s->bufferizer)>=s->nbytes) {
+		mblk_t *om=allocb(s->nbytes,0);
+		om->b_wptr+=ms_bufferizer_read(s->bufferizer,om->b_wptr,s->nbytes);
+		mblk_set_timestamp_info(om,s->ts);		
+		ms_queue_put(f->outputs[0],om);
+		s->ts += s->nbytes/2;
+	}
+};
+
+static void set_ptime(struct EncState *s, int value){
+	if (value>0 && value<=100){
+		s->ptime=value;
+	}
+}
+
+static int enc_add_attr(MSFilter *f, void *arg)
+{
+	const char *fmtp=(const char*)arg;
+	struct EncState *s=(struct EncState*)f->data;
+	if(strstr(fmtp,"ptime:"))
+		set_ptime(s,atoi(fmtp+6));
+
+	return 0;
+};
+
+static int enc_add_fmtp(MSFilter *f, void *arg){
+	const char *fmtp=(const char*)arg;
+	struct EncState *s=(struct EncState*)f->data;
+	char tmp[16]={0};
+	if (fmtp_get_value(fmtp,"ptime",tmp,sizeof(tmp))){
+		set_ptime(s,atoi(tmp));
+	}
+	return 0;
+}
+
+static int enc_set_sr(MSFilter *f, void *arg){
+	struct EncState *s=(struct EncState*)f->data;
+	s->rate=*(int*)arg;
+	return 0;
+}
+
+static MSFilterMethod enc_methods[]={
+	{	MS_FILTER_ADD_ATTR		,	enc_add_attr},
+	{	MS_FILTER_ADD_FMTP		,	enc_add_fmtp},
+	{	MS_FILTER_SET_SAMPLE_RATE	,	enc_set_sr	},
+	{	0				,	NULL		}
+};
+
+#ifdef _MSC_VER
+
+MSFilterDesc ms_l16_enc_desc={
+	MS_L16_ENC_ID,
+	"MSL16Enc",
+	"L16 dummy encoder",
+	MS_FILTER_ENCODER,
+	"l16",
+	1,
+	1,
+	enc_init,
+	enc_preprocess,
+	enc_process,
+	NULL,
+	enc_uninit,
+	enc_methods
+};
+
+#else
+
+MSFilterDesc ms_l16_enc_desc={
+	.id			= MS_L16_ENC_ID,
+	.name		= "MSL16Enc",
+	.text		= "L16 dummy encoder",
+	.category	= MS_FILTER_ENCODER,
+	.enc_fmt	= "l16",
+	.ninputs	= 1,
+	.noutputs	= 1,
+	.init		= enc_init,
+	.preprocess = enc_preprocess,
+	.process	= enc_process,
+	.uninit		= enc_uninit,
+	.methods	= enc_methods
+};
+#endif
+
+
+
+static void dec_init(MSFilter *f){
+};
+
+static void dec_uninit(MSFilter *f){
+};
+
+static void dec_process(MSFilter *f)
+{
+	mblk_t *im;
+
+	while((im=ms_queue_get(f->inputs[0]))) {
+		ms_queue_put(f->outputs[0],im);
+	}
+};
+
+#ifdef _MSC_VER
+
+MSFilterDesc ms_l16_dec_desc={
+	MS_L16_DEC_ID,
+	"MSL16Dec",
+	"L16 dummy decoder",
+	MS_FILTER_DECODER,
+	"l16",
+	1,
+	1,
+	dec_init,
+	NULL,
+	dec_process,
+	NULL,
+	dec_uninit,
+	NULL
+};
+
+#else
+
+MSFilterDesc ms_l16_dec_desc={
+	.id			= MS_L16_DEC_ID,
+	.name		= "MSL16Dec",
+	.text		= "L16 dummy decoder",
+	.category	= MS_FILTER_DECODER,
+	.enc_fmt	= "l16",
+	.ninputs	= 1,
+	.noutputs	= 1,
+	.init		= dec_init,
+	.process	= dec_process,
+	.uninit		= dec_uninit
+};
+
+#endif
+
+
+MS_FILTER_DESC_EXPORT(ms_l16_dec_desc)
+MS_FILTER_DESC_EXPORT(ms_l16_enc_desc)