Changeset 396:97fac0a6c84c in roaraudio

Timestamp:

08/07/08 01:13:45 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

replaced one non working code with another

Location:

roard

Files:

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

roard/codecfilter_speex.c

@@ -74 +74 @@
  int ret = 0;
 
+ ROAR_WARN("cf_speex_read(inst=%p, buf=%p, len=%i) = ?", inst, buf, len);
+
  if ( ! self->decoder ) {
   ROAR_DBG("cf_speex_read(*): no decoder, starting one!");
@@ -113 +115 @@
  }
 
- ROAR_WARN("cf_speex_read(*): Have a working decoder!");
+ ROAR_DBG("cf_speex_read(*): Have a working decoder!");
 
- ROAR_WARN("cf_speex_read(*): frame_size=%i (%i bytes)", self->frame_size, self->frame_size*2);
- ROAR_WARN("cf_speex_read(*): i_rest is %i bytes after cd", self->i_rest - self->cd);
+ ROAR_DBG("cf_speex_read(*): frame_size=%i (%i bytes)", self->frame_size, self->frame_size*2);
+ ROAR_DBG("cf_speex_read(*): i_rest is %i bytes after cd", ((void*)self->i_rest - (void*)self->cd));
 
 
@@ -127 +129 @@
    memcpy(buf, self->i_rest, self->fi_rest);
    buf += self->fi_rest;
+   still_todo -= self->fi_rest/2;
+   ret += self->fi_rest;
    self->fi_rest = 0;
   }
@@ -163 +167 @@
  }
 
+ if ( still_todo ) {
+  ROAR_WARN("cf_speex_read(*): could not read all reqquested data, returning %i byte less", still_todo*2);
+ }
+
+ ROAR_WARN("cf_speex_read(*) = %i", ret);
+
  return ret;
 }

roard/include/codecfilter_speex.h

@@ -14 +14 @@
  struct roar_stream_server * stream;
  int frame_size;
- int16_t  * cd; /* current data */
+ void     * cd; /* current data */
  char       cc[ROAR_SPEEX_MAX_CC]; /* buffer for read() and write() */
- int16_t  * i_rest; /* rest... */
+ void     * i_rest; /* rest... */
  int fi_rest;