Changeset 818:063e70897697 in roaraudio

Timestamp:

09/18/08 16:59:49 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added write support to alaw codec filter

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• codecfilter_alaw.c (modified) (1 diff)

roard/codecfilter.c

@@ -31 +31 @@
   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_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},
 
 #ifdef ROAR_HAVE_BIN_OGG123

roard/codecfilter_alaw.c

@@ -56 +56 @@
 
 int cf_alaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
- struct codecfilter_wave_inst * self = (struct codecfilter_wave_inst *) inst;
+ struct roar_stream_server * s = ROAR_STREAM_SERVER(inst);
+ char * out;
 
- return 0;
+ // TODO: add a more effect way to use memory than allways alloc/freeing it.
+ //       maybe by keeping a buffer over instanzes or by using ca global buffer
+ //       with an refrenze counter so we can free it on last use
+
+ len /= 2;
+
+ if ( (out = (char*)malloc(len)) == NULL )
+  return -1;
+
+ roardsp_conv_pcm162alaw(out, (int16_t*)buf, len);
+
+ len = stream_vio_s_write(s, out, len);
+
+ free(out);
+
+ if ( len > 0 ) {
+  return len*2;
+ } else {
+  return -1;
+ }
 }