Changeset 608:745a06132506 in roaraudio

Timestamp:

08/19/08 21:01:30 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make codec filter fuse vio

Location:

roard

Files:

• codecfilter_celt.c (modified) (3 diffs)
• codecfilter_speex.c (modified) (4 diffs)

roard/codecfilter_celt.c

@@ -115 +115 @@
 int cf_celt_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_celt_inst * self = (struct codecfilter_celt_inst *) inst;
- int fh = ((struct roar_stream *)self->stream)->fh;
  int r = 0;
  uint16_t fs;
@@ -129 +128 @@
 
  while ( r <= (len - self->s_buf) ) {
-  if ( read(fh, &fs, 2) != 2 )
+  if ( stream_vio_s_read(self->stream, &fs, 2) != 2 )
    break;
 
   fs = ROAR_NET2HOST16(fs);
 
-  if ( read(fh, self->ibuf, fs) != fs )
+  if ( stream_vio_s_read(self->stream, self->ibuf, fs) != fs )
    break;
 
@@ -148 +147 @@
  if ( r < len ) {
 //  printf("r < len!\n");
-  if ( read(fh, &fs, 2) == 2 ) {
+  if ( stream_vio_s_read(self->stream, &fs, 2) == 2 ) {
    fs = ROAR_NET2HOST16(fs);
 //   printf("next: fs=%i\n", fs);
-   if ( read(fh, self->ibuf, fs) == fs ) {
+   if ( stream_vio_s_read(self->stream, self->ibuf, fs) == fs ) {
 //    printf("got data!\n");
     if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs, (celt_int16_t *) self->obuf) >= 0 ) {

roard/codecfilter_speex.c

@@ -67 +67 @@
 int cf_speex_read(CODECFILTER_USERDATA_T   inst, char * buf, int len) {
  struct codecfilter_speex_inst * self = (struct codecfilter_speex_inst *) inst;
- struct roar_stream * s = (struct roar_stream *) self->stream;
  int mode;
  uint16_t ui;
@@ -78 +77 @@
  if ( ! self->decoder ) {
   ROAR_DBG("cf_speex_read(*): no decoder, starting one!");
-  if ( read(s->fh, &ui, 2) != 2 )
+  if ( stream_vio_s_read(self->stream, &ui, 2) != 2 )
    return 0;
 
@@ -137 +136 @@
  while (still_todo) {
   ROAR_WARN("cf_speex_read(*): we sill need %i frames", still_todo);
-  if ( read(s->fh, &ui, 2) != 2 )
+  if ( stream_vio_s_read(self->stream, &ui, 2) != 2 )
    return -1;
 
@@ -145 +144 @@
    return 0;
 
-  if ( read(s->fh, self->cc, ui) != ui )
+  if ( stream_vio_s_read(self->stream, self->cc, ui) != ui )
    break;