Changeset 4953:bbb95f1eaaad in roaraudio


Ignore:
Timestamp:
05/12/11 12:58:15 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Done some libroardsp header cleanup (Closes: #36)

Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • ChangeLog

    r4950 r4953  
    88        * Added support for role based handling in roard (Closes: #49) 
    99        * Added support for non-stream execs (Closes: #32) 
     10        * Done some libroardsp header cleanup (Closes: #36) 
    1011 
    1112v. 0.4beta5 - Tue Apr 26 2011 08:42 CEST 
  • include/libroardsp/filter.h

    r4708 r4953  
    118118}; 
    119119 
    120 #ifdef ROAR_HAVE_LIBM 
    121 struct roardsp_lowp { 
    122  uint32_t freq; // in mHz (0Hz..4MHz) 
    123  uint16_t a, b; 
    124  int32_t  old[ROAR_MAX_CHANNELS]; 
    125 }; 
    126  
    127 struct roardsp_highp { 
    128  uint32_t freq; // in mHz (0Hz..4MHz) 
    129  int32_t  a, b, c; 
    130  int32_t  oldout[ROAR_MAX_CHANNELS]; 
    131  int32_t  oldin[ROAR_MAX_CHANNELS]; 
    132 }; 
    133 #endif 
    134  
    135 struct roardsp_amp { 
    136  int32_t  mul; 
    137  int32_t  div; 
    138 }; 
    139  
    140 struct roardsp_dcblock { 
    141  int cur; 
    142  int32_t dc[ROARDSP_DCBLOCK_NUMBLOCKS]; 
    143 }; 
    144  
    145 struct roardsp_swap { 
    146  int map[ROAR_MAX_CHANNELS]; 
    147 }; 
    148  
    149 struct roardsp_agc { 
    150  struct roardsp_filter * amp; 
    151  uint32_t target_amp; 
    152 }; 
    153  
    154 struct roardsp_speex_prep { 
    155 #ifdef _SPEEX_TYPES_H 
    156  SpeexPreprocessState *preprocess; 
    157  int frame_size; 
    158 #else 
    159  char dummy[8]; 
    160 #endif 
    161 }; 
    162  
    163120 
    164121// funcs: 
     
    174131 
    175132 
    176 // filter: 
    177  
    178 #ifdef ROAR_HAVE_LIBM 
    179 int roardsp_lowp_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    180 int roardsp_lowp_uninit(struct roardsp_filter * filter); 
    181 int roardsp_lowp_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    182 int roardsp_lowp_ctl   (struct roardsp_filter * filter, int cmd, void * data); 
    183 int roardsp_lowp_reset (struct roardsp_filter * filter, int what); 
    184  
    185 int roardsp_highp_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    186 int roardsp_highp_uninit(struct roardsp_filter * filter); 
    187 int roardsp_highp_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    188 int roardsp_highp_ctl   (struct roardsp_filter * filter, int cmd, void * data); 
    189 int roardsp_highp_reset (struct roardsp_filter * filter, int what); 
    190 #endif 
    191  
    192 int roardsp_amp_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    193 int roardsp_amp_uninit(struct roardsp_filter * filter); 
    194 int roardsp_amp_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    195 int roardsp_amp_calc8 (struct roardsp_filter * filter, void * data, size_t samples); 
    196 int roardsp_amp_ctl   (struct roardsp_filter * filter, int cmd, void * data); 
    197 int roardsp_amp_reset (struct roardsp_filter * filter, int what); 
    198  
    199 int roardsp_add_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    200 int roardsp_add_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    201 int roardsp_add_reset (struct roardsp_filter * filter, int what); 
    202  
    203 int roardsp_quantify_init  (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    204 int roardsp_quantify_uninit(struct roardsp_filter * filter); 
    205 int roardsp_quantify_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    206 int roardsp_quantify_ctl   (struct roardsp_filter * filter, int cmd, void * data); 
    207 int roardsp_quantify_reset (struct roardsp_filter * filter, int what); 
    208  
    209 int roardsp_clip_calc16(struct roardsp_filter * filter, void * data, size_t samples); 
    210 int roardsp_clip_ctl   (struct roardsp_filter * filter, int cmd, void * data); 
    211 int roardsp_clip_reset (struct roardsp_filter * filter, int what); 
    212  
    213 int roardsp_downmix_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    214 int roardsp_downmix_calc162(struct roardsp_filter * filter, void * data, size_t samples); 
    215 int roardsp_downmix_ctl    (struct roardsp_filter * filter, int cmd, void * data); 
    216 int roardsp_downmix_reset  (struct roardsp_filter * filter, int what); 
    217  
    218 int roardsp_dcblock_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    219 int roardsp_dcblock_uninit (struct roardsp_filter * filter); 
    220 int roardsp_dcblock_calc16 (struct roardsp_filter * filter, void * data, size_t samples); 
    221 int roardsp_dcblock_reset  (struct roardsp_filter * filter, int what); 
    222  
    223 int roardsp_swap_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    224 int roardsp_swap_uninit (struct roardsp_filter * filter); 
    225 int roardsp_swap_calc162(struct roardsp_filter * filter, void * data, size_t samples); 
    226 int roardsp_swap_ctl    (struct roardsp_filter * filter, int cmd, void * data); 
    227 int roardsp_swap_reset  (struct roardsp_filter * filter, int what); 
    228  
    229 int roardsp_agc_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    230 int roardsp_agc_uninit (struct roardsp_filter * filter); 
    231 int roardsp_agc_ctl    (struct roardsp_filter * filter, int cmd, void * data); 
    232 int roardsp_agc_reset  (struct roardsp_filter * filter, int what); 
    233  
    234 #ifdef _SPEEX_TYPES_H 
    235 #define ROAR_HAVE_SPEEX_FILTER 
    236 int roardsp_speex_prep_init   (struct roardsp_filter * filter, struct roar_stream * stream, int id); 
    237 int roardsp_speex_prep_uninit (struct roardsp_filter * filter); 
    238 int roardsp_speex_prep_calc161(struct roardsp_filter * filter, void * data, size_t samples); 
    239 int roardsp_speex_prep_ctl    (struct roardsp_filter * filter, int cmd, void * data); 
    240 int roardsp_speex_prep_reset  (struct roardsp_filter * filter, int what); 
    241 #endif 
    242  
    243133#endif 
    244134 
  • include/libroardsp/libroardsp.h

    r4758 r4953  
    5656#include "filter.h" 
    5757#include "filterchain.h" 
     58#include "filters.h" 
     59#include "codecs.h" 
    5860#include "transcode.h" 
    5961#include "vio_transcode.h" 
     
    7072#endif 
    7173 
    72 // codecs: 
    73 int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len); 
    74 int roardsp_conv_pcm162alaw (char * out, int16_t * in, size_t len); 
    75  
    76 int roardsp_conv_autlaw2pcm32 (int32_t * out, int16_t * in, size_t len); 
    77 int roardsp_conv_pcm322autlaw (int16_t * out, int32_t * in, size_t len); 
    78  
    79 int roardsp_conv_mulaw2pcm16 (int16_t * out, char * in, size_t len); 
    80 int roardsp_conv_pcm162mulaw (char * out, int16_t * in, size_t len); 
    81  
    8274__END_DECLS 
    8375 
Note: See TracChangeset for help on using the changeset viewer.