Changeset 205:1053e00bbeb7 in roaraudio

Timestamp:

07/21/08 01:02:24 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

playing around with cf_vorbis*

Location:

roard

Files:

• codecfilter.c (modified) (1 diff)
• codecfilter_vorbis.c (modified) (1 diff)
• include/codecfilter_vorbis.h (modified) (1 diff)

roard/codecfilter.c

@@ -9 +9 @@
   "ogg123 -q -d raw -f - -",
   cf_cmd_open, NULL, NULL, NULL, NULL, NULL},
+
+ {ROAR_CODEC_OGG_VORBIS, "oggvorbis", "Ogg Vorbis decoder", NULL,
+ cf_vorbis_open, cf_vorbis_close, NULL, NULL, cf_vorbis_read, NULL},
 
  {ROAR_CODEC_FLAC, "cmd",  "ogg123",

roard/codecfilter_vorbis.c

@@ -3 +3 @@
 #include "roard.h"
 
+int cf_vorbis_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                            struct roar_stream_server * info,
+                                            struct roar_codecfilter   * filter) {
+ struct codecfilter_vorbis_inst * self = malloc(sizeof(struct codecfilter_vorbis_inst));
+
+ if ( !self )
+  return -1;
+
+ self->current_section      = -1;
+ self->last_section         = -1;
+ self->opened               = 0;
+ self->stream               = info;
+// self->outlen               = ROAR_OUTPUT_BUFFER_SAMPLES * s->info.channels * s->info.bits / 8; // optimal size
+
+ if ( (self->in = fdopen(((struct roar_stream*)info)->fh, "r")) == NULL ) {
+  free((void*)self);
+  return -1;
+ }
+
+ *inst = (CODECFILTER_USERDATA_T) self;
+
+ return -1;
+}
+
+int cf_vorbis_close(CODECFILTER_USERDATA_T   inst) {
+ struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
+
+ if ( !inst )
+  return -1;
+
+ ov_clear(&(self->vf));
+
+ free(inst);
+ return -1;
+}
+
+int cf_vorbis_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+ struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
+ long r;
+
+ if ( !self->opened == 2 ) {
+  if ( ov_open(self->in, &(self->vf), NULL, 0) < 0 ) {
+   free((void*)self);
+   return -1;
+  }
+ }
+ self->opened++;
+
+ r = ov_read(&(self->vf), buf, len, 0, 2, 1, &(self->current_section));
+
+ if ( r == 0 ) {
+  // do some EOF handling...
+  return -1;
+ } else if ( r < 0 ) {
+  return -1; // error in stream
+ } else {
+  return r;
+ }
+}
+
 //ll

roard/include/codecfilter_vorbis.h

@@ -5 +5 @@
 
 #include <roaraudio.h>
+#include <vorbis/codec.h>
+#include <vorbis/vorbisfile.h>
+
+struct codecfilter_vorbis_inst {
+ int current_section;
+ int last_section;
+ int opened;
+ FILE * in;
+ struct roar_stream_server * stream;
+ OggVorbis_File vf;
+};
+
+int cf_vorbis_open(CODECFILTER_USERDATA_T * inst, int codec,
+                                            struct roar_stream_server * info,
+                                            struct roar_codecfilter   * filter);
+
+int cf_vorbis_close(CODECFILTER_USERDATA_T   inst);
+
+int cf_vorbis_read(CODECFILTER_USERDATA_T   inst, char * buf, int len);
 
 #endif