Changeset 2120:7f67d164a05d in roaraudio
- Timestamp:
- 07/23/09 15:53:02 (15 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- roard
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
roard/codecfilter_celt.c
r1144 r2120 54 54 self->encoder = NULL; 55 55 self->decoder = NULL; 56 self->opened = 0; 56 self->opened_encoder = 0; 57 self->opened_decoder = 0; 57 58 self->s_buf = s->info.channels * self->frame_size * 2; 58 59 self->ibuf = malloc(self->s_buf); … … 91 92 } else if ( s->dir == ROAR_DIR_MONITOR || s->dir == ROAR_DIR_OUTPUT ) { 92 93 self->encoder = celt_encoder_create(self->mode); 94 } else if ( s->dir == ROAR_DIR_BIDIR ) { 95 self->decoder = celt_decoder_create(self->mode); 96 self->encoder = celt_encoder_create(self->mode); 93 97 } else { 94 98 celt_mode_destroy(self->mode); … … 145 149 // printf("buf=%p, len=%i\n", buf, len); 146 150 147 if ( !self->opened ) {151 if ( !self->opened_decoder ) { 148 152 errno = ENOSYS; 149 153 if ( stream_vio_s_read(self->stream, magic, ROAR_CELT_MAGIC_LEN) != ROAR_CELT_MAGIC_LEN ) … … 153 157 154 158 errno = 0; 155 self->opened = 1;159 self->opened_decoder = 1; 156 160 } 157 161 … … 221 225 unsigned char cbits[BS+2]; 222 226 223 if ( !self->opened ) {227 if ( !self->opened_encoder ) { 224 228 if ( stream_vio_s_write(self->stream, ROAR_CELT_MAGIC, ROAR_CELT_MAGIC_LEN) != ROAR_CELT_MAGIC_LEN ) 225 229 return -1; 226 self->opened = 1;230 self->opened_encoder = 1; 227 231 } 228 232 -
roard/include/codecfilter_celt.h
r1144 r2120 48 48 int fi_rest; /* how much is in rest? */ 49 49 int fo_rest; /* how much is in rest? */ 50 int opened; 50 int opened_encoder; 51 int opened_decoder; 51 52 }; 52 53
Note: See TracChangeset
for help on using the changeset viewer.