Changeset 391:ab42dd0763ef in roaraudio

Timestamp:

08/06/08 18:15:08 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added a bit mor struct to the cf speex

Location:

roard

Files:

• codecfilter_speex.c (modified) (1 diff)
• include/codecfilter_speex.h (modified) (2 diffs)

roard/codecfilter_speex.c

@@ -7 +7 @@
                                             struct roar_stream_server * info,
                                             struct roar_codecfilter   * filter) {
+ struct codecfilter_speex_inst * self = malloc(sizeof(struct codecfilter_speex_inst));
+
  *inst = NULL;
- return -1;
+
+ if (!self)
+  return -1;
+
+ *inst = (void*) self;
+
+ return 0;
 }
 
 int cf_speex_close(CODECFILTER_USERDATA_T   inst) {
- return -1;
+ struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
+
+ if (!self)
+  return -1;
+
+ free((void*)self);
+
+ return 0;
 }
 
 int cf_speex_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+ struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
+
  return -1;
 }
 int cf_speex_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+ struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
+
  return -1;
 }

roard/include/codecfilter_speex.h

@@ -6 +6 @@
 #include <roaraudio.h>
 #include <speex/speex.h>
+#include <speex/speex_stereo.h>
 
 struct codecfilter_speex_inst {
@@ -11 +12 @@
  void * decoder;
  SpeexBits bits;
+ struct roar_stream_server * stream;
+ int frame_size;
 
 /*
- struct roar_stream_server * stream;
- CELTMode * mode;
- CELTEncoder * encoder;
- CELTDecoder * decoder;
- int frame_size;
- int lookahead;
  int out_size;
  char * ibuf;