Changeset 736:44f4feb2496f in roaraudio

Timestamp:

09/03/08 03:37:50 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added basic alaw cf

Location:

roard

Files:

• Makefile (modified) (1 diff)
• codecfilter.c (modified) (1 diff)
• codecfilter_alaw.c (added)
• include/codecfilter.h (modified) (1 diff)

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
-CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o
+CF=codecfilter_cmd.o codecfilter_vorbis.o codecfilter_celt.o codecfilter_speex.o codecfilter_wave.o codecfilter_alaw.o
 
 include ../Makefile.conf

roard/codecfilter.c

@@ -30 +30 @@
  {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL, ROAR_CODECFILTER_READ,
   cf_wave_open, cf_wave_close, NULL, NULL, cf_wave_read, NULL},
+
+ {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, ROAR_CODECFILTER_READ,
+  cf_alaw_open, cf_alaw_close, NULL, NULL, cf_alaw_read, NULL},
 
  {ROAR_CODEC_OGG_GENERAL, "cmd",  "ogg123",

roard/include/codecfilter.h

@@ -80 +80 @@
 int codecfilter_flush(CODECFILTER_USERDATA_T   inst, int codecfilter);
 
+// codecfilter without a own .h:
+int cf_alaw_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                            struct roar_stream_server * info,
+                                            struct roar_codecfilter   * filter);
+
+int cf_alaw_close(CODECFILTER_USERDATA_T   inst);
+
+int cf_alaw_read(CODECFILTER_USERDATA_T   inst, char * buf, int len);
+int cf_alaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
 
 #endif