Changeset 331:e4abcd91c94f in roaraudio


Ignore:
Timestamp:
07/25/08 03:27:05 (16 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

seperated rest into i_rest and o_rest

Location:
roard
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • roard/codecfilter_celt.c

    r328 r331  
    3131 self->encoder              = NULL; 
    3232 self->decoder              = NULL; 
    33  self->s_buf                = s->info.channels * self->frame_size; 
     33 self->s_buf                = s->info.channels * self->frame_size * 2; 
    3434 self->ibuf                 = malloc(self->s_buf); 
    3535 self->obuf                 = malloc(self->s_buf); 
    36  self->rest                 = malloc(self->s_buf); 
    37  self->f_rest               = 0; 
     36 self->i_rest               = malloc(self->s_buf); 
     37 self->o_rest               = malloc(self->s_buf); 
     38 self->fi_rest              = 0; 
     39 self->fo_rest              = 0; 
    3840 
    39  if ( !(self->ibuf && self->obuf && self->rest) ) { 
     41 if ( !(self->ibuf && self->obuf && self->i_rest && self->o_rest) ) { 
    4042  if ( self->ibuf ) 
    4143   free(self->ibuf); 
    … …  
    4446   free(self->obuf); 
    4547 
    46   if ( self->rest ) 
    47    free(self->rest); 
     48  if ( self->i_rest ) 
     49   free(self->o_rest); 
     50 
     51  if ( self->o_rest ) 
     52   free(self->o_rest); 
    4853 
    4954  free(self); 
    … …  
    97102  free(self->obuf); 
    98103 
    99  if ( self->rest ) 
    100   free(self->rest); 
     104 if ( self->i_rest ) 
     105  free(self->i_rest); 
     106 
     107 if ( self->o_rest ) 
     108  free(self->o_rest); 
    101109 
    102110 free(inst); 
    … …  
    109117 int r = 0; 
    110118 uint16_t fs; 
     119 char * cbuf; 
     120 
     121// printf("buf=%p, len=%i\n", buf, len); 
    111122 
    112123 while ( r <= (len - self->s_buf) ) { 
    … …  
    119130   break; 
    120131 
    121   if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs, (celt_int16_t *) ((char *) buf+r)) < 0 ) 
     132  cbuf = buf + r; 
     133 
     134  printf("buf=%p, r=%i // cbuf=%p\n", buf, r, cbuf); 
     135  if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs, (celt_int16_t *) cbuf) < 0 ) 
    122136   break; 
    123137 

  • roard/include/codecfilter_celt.h

    r324 r331  
    1818 char * ibuf; 
    1919 char * obuf; 
    20  char * rest; 
     20 char * i_rest; 
     21 char * o_rest; 
    2122 int s_buf; 
    22  int f_rest; /* how much is in rest? */ 
     23 int fi_rest; /* how much is in rest? */ 
     24 int fo_rest; /* how much is in rest? */ 
    2325}; 
    2426 
Note: See TracChangeset for help on using the changeset viewer.