Changeset 922:0620585d146b in roaraudio

Timestamp:

12/07/08 01:36:08 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support for mulaw (libroardsp) and added a codec filter for roard

Files:

• include/libroardsp/libroardsp.h (modified) (1 diff)
• libroardsp/Makefile (modified) (1 diff)
• libroardsp/mulaw.c (added)
• roard/Makefile (modified) (1 diff)
• roard/codecfilter.c (modified) (1 diff)
• roard/include/codecfilter.h (modified) (1 diff)

include/libroardsp/libroardsp.h

@@ -118 +118 @@
 int roardsp_conv_pcm162alaw (char * out, int16_t * in, size_t len);
 
+int roardsp_conv_mulaw2pcm16 (int16_t * out, char * in, size_t len);
+int roardsp_conv_pcm162mulaw (char * out, int16_t * in, size_t len);
+
 __END_DECLS
 

libroardsp/Makefile

@@ -2 +2 @@
 
 TARGETS=libroardsp.so
-OBJS=libroardsp.o filter.o filterchain.o alaw.o
+OBJS=libroardsp.o filter.o filterchain.o alaw.o mulaw.o
 OLDROAR=midi.o
 FILTER=lowp.o highp.o amp.o

roard/Makefile

@@ -3 +3 @@
 OBJ=roard.o driver.o mixer.o output.o signals.o loop.o clients.o streams.o network.o commands.o req.o sources.o sample.o meta.o codecfilter.o midi.o lib.o
 DRV=driver_esd.o driver_ao.o driver_roar.o driver_raw.o driver_oss.o
-CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o codecfilter_sndfile.o
+CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o codecfilter_mulaw.o codecfilter_sndfile.o
 
 include ../Makefile.conf

roard/codecfilter.c

@@ -38 +38 @@
  {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
   cf_alaw_open, cf_alaw_close, NULL, cf_alaw_write, cf_alaw_read, NULL},
+
+ {ROAR_CODEC_MULAW, "mulaw", "mu-Law", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
+  cf_mulaw_open, cf_mulaw_close, NULL, cf_mulaw_write, cf_mulaw_read, NULL},
 
 #ifdef ROAR_HAVE_BIN_OGG123

roard/include/codecfilter.h

@@ -97 +97 @@
 int cf_alaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
 
+int cf_mulaw_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                            struct roar_stream_server * info,
+                                            struct roar_codecfilter   * filter);
+
+int cf_mulaw_close(CODECFILTER_USERDATA_T   inst);
+
+int cf_mulaw_read(CODECFILTER_USERDATA_T   inst, char * buf, int len);
+int cf_mulaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
+
+
 #endif