Changeset 1065:a830b78ddb75 in roaraudio


Ignore:
Timestamp:
12/25/08 17:07:11 (15 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

added support to disbale support for A-Law and mu-Law (all or just readwrite)

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • configure

    r1063 r1065  
    4141DEFAULT_CHANNELS='' 
    4242DEFAULT_BITS='' 
     43 
     44ALAW=true 
     45MULAW=true 
     46ALAW_RW=true 
     47MULAW_RW=true 
    4348 
    4449echo -n "checking for C compiler... " 
    … …  
    9499   echo '--default-channels CHANNELS' 
    95100   echo '--default-bits BITS' 
     101   echo '--without-alaw' 
     102   echo '--without-alaw-rw' 
     103   echo '--without-mulaw' 
     104   echo '--without-mulaw-rw' 
    96105   exit 0; 
    97106  ;; 
    … …  
    151160   DEFAULT_BITS="$2" 
    152161   shift; 
     162  ;; 
     163  '--without-alaw') 
     164   ALAW=false 
     165   ALAW_RW=false 
     166  ;; 
     167  '--without-alaw-rw') 
     168   ALAW_RW=false 
     169  ;; 
     170  '--without-mulaw') 
     171   MULAW=false 
     172   MULAW_RW=false 
     173  ;; 
     174  '--without-mulaw-rw') 
     175   MULAW_RW=false 
    153176  ;; 
    154177  '--prefix') 
    … …  
    347370 [ "$DEFAULT_CHANNELS" = '' ] || echo "#define ROAR_CHANNELS_DEFAULT $DEFAULT_CHANNELS" 
    348371 [ "$DEFAULT_BITS"     = '' ] || echo "#define ROAR_BITS_DEFAULT     $DEFAULT_BITS" 
     372 echo 
     373 $ALAW     && echo '#define ROAR_SUPPORT_ALAW' 
     374 $ALAW_RW  && echo '#define ROAR_SUPPORT_ALAW_RW' 
     375 $MULAW    && echo '#define ROAR_SUPPORT_MULAW' 
     376 $MULAW_RW && echo '#define ROAR_SUPPORT_MULAW_RW' 
    349377 echo 
    350378} >&3 

  • libroardsp/alaw.c

    r817 r1065  
    5656#include "libroardsp.h" 
    5757 
     58#ifdef ROAR_SUPPORT_ALAW 
    5859int16_t _roardsp_alaw2pcm16[] = { 
    5960/* -------- SUN -------- */ 
    … …  
    9899}; 
    99100 
     101#ifdef ROAR_SUPPORT_ALAW_RW 
    100102int8_t _roardsp_pcm132alaw[] = { 
    101103/* -------- SUN -------- */ 
    … …  
    785787/* -------- /SUN -------- */ 
    786788}; 
     789#endif 
     790#endif 
    787791 
    788792int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len) { 
     793#ifdef ROAR_SUPPORT_ALAW 
    789794 unsigned char * inp = (unsigned char *) in; 
    790795 ssize_t i; 
    … …  
    795800 
    796801 return 0; 
     802#else 
     803 return -1; 
     804#endif 
    797805} 
    798806 
    799807int roardsp_conv_pcm162alaw (char * out, int16_t * in, size_t len) { 
     808#ifdef ROAR_SUPPORT_ALAW_RW 
    800809 int i; 
    801810 
    … …  
    805814 
    806815 return 0; 
     816#else 
     817 return -1; 
     818#endif 
    807819} 
    808820 
     821 
    809822//ll 

  • libroardsp/mulaw.c

    r922 r1065  
    5656#include "libroardsp.h" 
    5757 
     58#ifdef ROAR_SUPPORT_MULAW 
    5859int16_t _roardsp_mulaw2pcm16[] = { 
    5960/* -------- SUN -------- */ 
    … …  
    9899}; 
    99100 
     101#ifdef ROAR_SUPPORT_MULAW_RW 
    100102int8_t _roardsp_pcm142mulaw[] = { 
    101103/* -------- SUN -------- */ 
    … …  
    14681470/* -------- /SUN -------- */ 
    14691471}; 
     1472#endif 
     1473#endif 
    14701474 
    14711475int roardsp_conv_mulaw2pcm16 (int16_t * out, char * in, size_t len) { 
     1476#ifdef ROAR_SUPPORT_MULAW 
    14721477 unsigned char * inp = (unsigned char *) in; 
    14731478 ssize_t i; 
    … …  
    14781483 
    14791484 return 0; 
     1485#else 
     1486 return -1; 
     1487#endif 
    14801488} 
    14811489 
    14821490int roardsp_conv_pcm162mulaw (char * out, int16_t * in, size_t len) { 
     1491#ifdef ROAR_SUPPORT_MULAW_RW 
    14831492 int i; 
    14841493 
    … …  
    14881497 
    14891498 return 0; 
     1499#else 
     1500 return -1; 
     1501#endif 
    14901502} 
    14911503 

  • roard/codecfilter.c

    r1021 r1065  
    3838//#endif 
    3939 
    40  {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE, 
    41   cf_alaw_open, cf_alaw_close, NULL, cf_alaw_write, cf_alaw_read, NULL}, 
    42  
    43  {ROAR_CODEC_MULAW, "mulaw", "mu-Law", NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE, 
    44   cf_mulaw_open, cf_mulaw_close, NULL, cf_mulaw_write, cf_mulaw_read, NULL}, 
     40#ifdef ROAR_SUPPORT_ALAW 
     41 {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, 
     42#ifdef ROAR_SUPPORT_ALAW_RW 
     43  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE, 
     44#else 
     45  ROAR_CODECFILTER_READ, 
     46#endif 
     47  cf_alaw_open, cf_alaw_close, NULL, 
     48#ifdef ROAR_SUPPORT_ALAW_RW 
     49  cf_alaw_write, 
     50#else 
     51  NULL, 
     52#endif 
     53  cf_alaw_read, NULL}, 
     54#endif 
     55 
     56#ifdef ROAR_SUPPORT_MULAW 
     57 {ROAR_CODEC_MULAW, "mulaw", "mu-Law", NULL, 
     58#ifdef ROAR_SUPPORT_MULAW_RW 
     59  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE, 
     60#else 
     61  ROAR_CODECFILTER_READ, 
     62#endif 
     63  cf_mulaw_open, cf_mulaw_close, NULL, 
     64#ifdef ROAR_SUPPORT_MULAW_RW 
     65  cf_mulaw_write, 
     66#else 
     67  NULL, 
     68#endif 
     69  cf_mulaw_read, NULL}, 
     70#endif 
    4571 
    4672#ifdef ROAR_HAVE_BIN_OGG123 

  • roard/codecfilter_alaw.c

    r818 r1065  
    2424 
    2525#include "roard.h" 
     26 
     27#ifdef ROAR_SUPPORT_ALAW 
    2628 
    2729int cf_alaw_open(CODECFILTER_USERDATA_T * inst, int codec, 
    … …  
    5557} 
    5658 
     59#ifdef ROAR_SUPPORT_ALAW_RW 
    5760int cf_alaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) { 
    5861 struct roar_stream_server * s = ROAR_STREAM_SERVER(inst); 
    … …  
    8083 } 
    8184} 
     85#endif 
     86 
     87#endif 
    8288 
    8389//ll 

  • roard/codecfilter_mulaw.c

    r925 r1065  
    2424 
    2525#include "roard.h" 
     26 
     27#ifdef ROAR_SUPPORT_MULAW 
    2628 
    2729int cf_mulaw_open(CODECFILTER_USERDATA_T * inst, int codec, 
    … …  
    5557} 
    5658 
     59#ifdef ROAR_SUPPORT_MULAW_RW 
    5760int cf_mulaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len) { 
    5861 struct roar_stream_server * s = ROAR_STREAM_SERVER(inst); 
    … …  
    8083 } 
    8184} 
     85#endif 
     86 
     87#endif 
    8288 
    8389//ll 
Note: See TracChangeset for help on using the changeset viewer.