Changeset 994:43a7c78b4bf9 in roaraudio for roard/codecfilter_fishsound.c

Timestamp:

12/18/08 23:40:21 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

seems that I got it finally rung experimental

File:

• roard/codecfilter_fishsound.c (modified) (5 diffs)

roard/codecfilter_fishsound.c

@@ -40 +40 @@
  } data;
 
+ ROAR_WARN("cf_fishsound_decoded_float(fsound=%p, pcm=%p, frames=%li, user_data=%p) = ?", fsound, pcm, frames, user_data);
+
+ ROAR_WARN("cf_fishsound_decoded_float(*): self->opened=%i", self->opened);
+
  if (!self->opened) {
    fish_sound_command(fsound, FISH_SOUND_GET_INFO, &(self->fsinfo),
@@ -45 +49 @@
  }
 
- if ( roar_buffer_new(&buf, frames*stream->info.bits*stream->info.channels) == -1 )
+ if ( roar_buffer_new(&buf, frames*stream->info.bits*stream->info.channels/8) == -1 )
   return -1;
 
@@ -148 +152 @@
  struct roar_stream * s = ROAR_STREAM(self->stream);
  long inlen;
+ int need_data = 0;
+ struct roar_buffer_stats stats;
+ size_t stlen;
+
+ ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);
 
 /*
@@ -166 +175 @@
 */
 
- if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 )
-  return -1;
-
- oggz_read_input(self->oggz, (unsigned char *)buf, inlen);
+ if ( self->buffer == NULL ) {
+  need_data = 1;
+ } else {
+  if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 )
+   return -1;
+
+  if ( stats.bytes < len )
+   need_data = 1;
+ }
+
+ ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
+
+ while (need_data) {
+  if ( (inlen = stream_vio_s_read(self->stream, buf, len)) == -1 )
+   return -1;
+
+  oggz_read_input(self->oggz, (unsigned char *)buf, inlen);
+
+  if ( roar_buffer_ring_stats(self->buffer, &stats) == -1 )
+   return -1;
+
+  if ( stats.bytes < len ) {
+   need_data = 1;
+  } else {
+   need_data = 0;
+  }
+ }
+
+ ROAR_WARN("cf_fishsound_read(*): need_data=%i, self->opened=%i", need_data, self->opened);
 
  if ( !self->opened ) {
@@ -178 +212 @@
   self->opened     = 1;
   errno            = EAGAIN;
-  return -1;
- }
-
- return -1;
+  ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // errno=EAGAIN", inst, buf, len);
+  return -1;
+ }
+
+ // ok, now we should have all the data we want...
+
+ stlen = len;
+ if ( roar_buffer_shift_out(&(self->buffer), buf, &stlen) == -1 ) {
+  ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = -1 // roar_buffer_shift_out() failed", inst, buf, len);
+  return -1;
+ }
+
+ ROAR_WARN("cf_fishsound_read(inst=%p, buf=%p, len=%i) = %i", inst, buf, len, (int)stlen);
+ return stlen;
 }