Changeset 206:c57fd131ee04 in roaraudio

Timestamp:

07/21/08 01:29:53 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

got codec filter vorbis basicly working

File:

• roard/codecfilter_vorbis.c (modified) (3 diffs)

roard/codecfilter_vorbis.c

@@ -24 +24 @@
  *inst = (CODECFILTER_USERDATA_T) self;
 
- return -1;
+ ((struct roar_stream*)info)->info.codec = ROAR_CODEC_DEFAULT;
+
+ return 0;
 }
 
@@ -36 +38 @@
 
  free(inst);
- return -1;
+ return 0;
 }
 
@@ -42 +44 @@
  struct codecfilter_vorbis_inst * self = (struct codecfilter_vorbis_inst *) inst;
  long r;
+ long todo = len;
+ long done = 0;
 
- if ( !self->opened == 2 ) {
+// printf("cf_vorbis_read(inst=%p, buf=%p, len=%i) = ?\n", inst, buf, len);
+
+ self->opened++;
+ if ( self->opened == 16 ) {
+  //printf("cf_vorbis_read(*): opening...\n");
   if ( ov_open(self->in, &(self->vf), NULL, 0) < 0 ) {
    free((void*)self);
-   return -1;
+   return 0;
   }
  }
- self->opened++;
 
- r = ov_read(&(self->vf), buf, len, 0, 2, 1, &(self->current_section));
+ if ( self->opened < 16 ) {
+  return -1;
+ }
 
- if ( r == 0 ) {
+ while (todo) {
+  r = ov_read(&(self->vf), buf+done, todo, 0, 2, 1, &(self->current_section));
+  if ( r < 1 ) {
+   break;
+  } else {
+   todo -= r;
+   done += r;
+  }
+ }
+
+ //printf("ov_read(*) = %i\n", done);
+
+ if ( done == 0 ) {
   // do some EOF handling...
-  return -1;
- } else if ( r < 0 ) {
-  return -1; // error in stream
+  return 0;
  } else {
-  return r;
+  return len;
  }
 }