Changeset 582:dd12ba513b27 in roaraudio

Timestamp:

08/19/08 16:08:07 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added cf_vorbis_write()

Location:

roard

Files:

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

roard/codecfilter.c

@@ -15 +15 @@
 #ifdef ROAR_HAVE_LIBVORBISFILE
  {ROAR_CODEC_OGG_VORBIS, "oggvorbis", "Ogg Vorbis decoder", NULL,
- cf_vorbis_open, cf_vorbis_close, NULL, NULL, cf_vorbis_read, NULL},
+ cf_vorbis_open, cf_vorbis_close, NULL, cf_vorbis_write, cf_vorbis_read, NULL},
 #endif
 

roard/codecfilter_vorbis.c

@@ -10 +10 @@
  struct codecfilter_vorbis_inst * self = malloc(sizeof(struct codecfilter_vorbis_inst));
  struct roar_stream * s = ROAR_STREAM(info);
- ogg_packet header;
- ogg_packet header_comm;
- ogg_packet header_code;
 
  if ( !self )
@@ -68 +65 @@
   ogg_stream_init(&(self->encoder.os), 0x52410000 + ((getpid() & 0xff)<<8) + s->id);
 
+#else
+ free(self);
+ return -1;
+#endif
+ } else {
+  free(self);
+  return -1;
+ }
+
+ return 0;
+}
+
+int cf_vorbis_close(CODECFILTER_USERDATA_T   inst) {
+ struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
+
+ if ( !inst )
+  return -1;
+
+ if ( self->got_it_running )
+  ov_clear(&(self->vf));
+
+#ifdef ROAR_HAVE_LIBVORBISENC
+ if ( self->encoding ) {
+  ogg_stream_clear(&(self->encoder.os));
+  vorbis_block_clear(&(self->encoder.vb));
+  vorbis_dsp_clear(&(self->encoder.vd));
+  vorbis_info_clear(&(self->encoder.vi));
+ }
+#endif
+
+ free(inst);
+ return 0;
+}
+
+int cf_vorbis_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
+#ifdef ROAR_HAVE_LIBVORBISENC
+ struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
+ struct roar_stream * s = ROAR_STREAM(self->stream);
+ ogg_packet header;
+ ogg_packet header_comm;
+ ogg_packet header_code;
+
   vorbis_analysis_headerout(&(self->encoder.vd), &(self->encoder.vc), &header, &header_comm, &header_code);
 
@@ -82 +121 @@
   }
 
+  return len; // we assume every thing was written (at least into our dsp anaylises buffer
 #else
- free(self);
+ errno = ENOSYS;
  return -1;
 #endif
- } else {
-  free(self);
-  return -1;
- }
-
- return 0;
-}
-
-int cf_vorbis_close(CODECFILTER_USERDATA_T   inst) {
- struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
-
- if ( !inst )
-  return -1;
-
- if ( self->got_it_running )
-  ov_clear(&(self->vf));
-
-#ifdef ROAR_HAVE_LIBVORBISENC
- if ( self->encoding ) {
-  ogg_stream_clear(&(self->encoder.os));
-  vorbis_block_clear(&(self->encoder.vb));
-  vorbis_dsp_clear(&(self->encoder.vd));
-  vorbis_info_clear(&(self->encoder.vi));
- }
-#endif
-
- free(inst);
- return 0;
-}
-
+}
 int cf_vorbis_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;

roard/include/codecfilter_vorbis.h

@@ -46 +46 @@
 int cf_vorbis_close(CODECFILTER_USERDATA_T   inst);
 
+int cf_vorbis_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
 int cf_vorbis_read(CODECFILTER_USERDATA_T   inst, char * buf, int len);