Changeset 2120:7f67d164a05d in roaraudio

Timestamp:

07/23/09 15:53:02 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added support to CELT cf for BIDIR streams

Location:

roard

Files:

• codecfilter_celt.c (modified) (5 diffs)
• include/codecfilter_celt.h (modified) (1 diff)

roard/codecfilter_celt.c

@@ -54 +54 @@
  self->encoder              = NULL;
  self->decoder              = NULL;
- self->opened               = 0;
+ self->opened_encoder       = 0;
+ self->opened_decoder       = 0;
  self->s_buf                = s->info.channels * self->frame_size * 2;
  self->ibuf                 = malloc(self->s_buf);
@@ -91 +92 @@
  } else if ( s->dir == ROAR_DIR_MONITOR || s->dir == ROAR_DIR_OUTPUT ) {
    self->encoder = celt_encoder_create(self->mode);
+ } else if ( s->dir == ROAR_DIR_BIDIR ) {
+   self->decoder = celt_decoder_create(self->mode);
+   self->encoder = celt_encoder_create(self->mode);
  } else {
   celt_mode_destroy(self->mode);
@@ -145 +149 @@
 // printf("buf=%p, len=%i\n", buf, len);
 
- if ( !self->opened ) {
+ if ( !self->opened_decoder ) {
   errno = ENOSYS;
   if ( stream_vio_s_read(self->stream, magic, ROAR_CELT_MAGIC_LEN) != ROAR_CELT_MAGIC_LEN )
@@ -153 +157 @@
 
   errno = 0;
-  self->opened = 1;
+  self->opened_decoder = 1;
  }
 
@@ -221 +225 @@
  unsigned char cbits[BS+2];
 
- if ( !self->opened ) {
+ if ( !self->opened_encoder ) {
   if ( stream_vio_s_write(self->stream, ROAR_CELT_MAGIC, ROAR_CELT_MAGIC_LEN) != ROAR_CELT_MAGIC_LEN )
    return -1;
-  self->opened = 1;
+  self->opened_encoder = 1;
  }
 

roard/include/codecfilter_celt.h

@@ -48 +48 @@
  int fi_rest; /* how much is in rest? */
  int fo_rest; /* how much is in rest? */
- int opened;
+ int opened_encoder;
+ int opened_decoder;
 };