Changeset 1065:a830b78ddb75 in roaraudio
- Timestamp:
- 12/25/08 17:07:11 (15 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
configure
r1063 r1065 41 41 DEFAULT_CHANNELS='' 42 42 DEFAULT_BITS='' 43 44 ALAW=true 45 MULAW=true 46 ALAW_RW=true 47 MULAW_RW=true 43 48 44 49 echo -n "checking for C compiler... " … … 94 99 echo '--default-channels CHANNELS' 95 100 echo '--default-bits BITS' 101 echo '--without-alaw' 102 echo '--without-alaw-rw' 103 echo '--without-mulaw' 104 echo '--without-mulaw-rw' 96 105 exit 0; 97 106 ;; … … 151 160 DEFAULT_BITS="$2" 152 161 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 153 176 ;; 154 177 '--prefix') … … 347 370 [ "$DEFAULT_CHANNELS" = '' ] || echo "#define ROAR_CHANNELS_DEFAULT $DEFAULT_CHANNELS" 348 371 [ "$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' 349 377 echo 350 378 } >&3 -
libroardsp/alaw.c
r817 r1065 56 56 #include "libroardsp.h" 57 57 58 #ifdef ROAR_SUPPORT_ALAW 58 59 int16_t _roardsp_alaw2pcm16[] = { 59 60 /* -------- SUN -------- */ … … 98 99 }; 99 100 101 #ifdef ROAR_SUPPORT_ALAW_RW 100 102 int8_t _roardsp_pcm132alaw[] = { 101 103 /* -------- SUN -------- */ … … 785 787 /* -------- /SUN -------- */ 786 788 }; 789 #endif 790 #endif 787 791 788 792 int roardsp_conv_alaw2pcm16 (int16_t * out, char * in, size_t len) { 793 #ifdef ROAR_SUPPORT_ALAW 789 794 unsigned char * inp = (unsigned char *) in; 790 795 ssize_t i; … … 795 800 796 801 return 0; 802 #else 803 return -1; 804 #endif 797 805 } 798 806 799 807 int roardsp_conv_pcm162alaw (char * out, int16_t * in, size_t len) { 808 #ifdef ROAR_SUPPORT_ALAW_RW 800 809 int i; 801 810 … … 805 814 806 815 return 0; 816 #else 817 return -1; 818 #endif 807 819 } 808 820 821 809 822 //ll -
libroardsp/mulaw.c
r922 r1065 56 56 #include "libroardsp.h" 57 57 58 #ifdef ROAR_SUPPORT_MULAW 58 59 int16_t _roardsp_mulaw2pcm16[] = { 59 60 /* -------- SUN -------- */ … … 98 99 }; 99 100 101 #ifdef ROAR_SUPPORT_MULAW_RW 100 102 int8_t _roardsp_pcm142mulaw[] = { 101 103 /* -------- SUN -------- */ … … 1468 1470 /* -------- /SUN -------- */ 1469 1471 }; 1472 #endif 1473 #endif 1470 1474 1471 1475 int roardsp_conv_mulaw2pcm16 (int16_t * out, char * in, size_t len) { 1476 #ifdef ROAR_SUPPORT_MULAW 1472 1477 unsigned char * inp = (unsigned char *) in; 1473 1478 ssize_t i; … … 1478 1483 1479 1484 return 0; 1485 #else 1486 return -1; 1487 #endif 1480 1488 } 1481 1489 1482 1490 int roardsp_conv_pcm162mulaw (char * out, int16_t * in, size_t len) { 1491 #ifdef ROAR_SUPPORT_MULAW_RW 1483 1492 int i; 1484 1493 … … 1488 1497 1489 1498 return 0; 1499 #else 1500 return -1; 1501 #endif 1490 1502 } 1491 1503 -
roard/codecfilter.c
r1021 r1065 38 38 //#endif 39 39 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 45 71 46 72 #ifdef ROAR_HAVE_BIN_OGG123 -
roard/codecfilter_alaw.c
r818 r1065 24 24 25 25 #include "roard.h" 26 27 #ifdef ROAR_SUPPORT_ALAW 26 28 27 29 int cf_alaw_open(CODECFILTER_USERDATA_T * inst, int codec, … … 55 57 } 56 58 59 #ifdef ROAR_SUPPORT_ALAW_RW 57 60 int cf_alaw_write(CODECFILTER_USERDATA_T inst, char * buf, int len) { 58 61 struct roar_stream_server * s = ROAR_STREAM_SERVER(inst); … … 80 83 } 81 84 } 85 #endif 86 87 #endif 82 88 83 89 //ll -
roard/codecfilter_mulaw.c
r925 r1065 24 24 25 25 #include "roard.h" 26 27 #ifdef ROAR_SUPPORT_MULAW 26 28 27 29 int cf_mulaw_open(CODECFILTER_USERDATA_T * inst, int codec, … … 55 57 } 56 58 59 #ifdef ROAR_SUPPORT_MULAW_RW 57 60 int cf_mulaw_write(CODECFILTER_USERDATA_T inst, char * buf, int len) { 58 61 struct roar_stream_server * s = ROAR_STREAM_SERVER(inst); … … 80 83 } 81 84 } 85 #endif 86 87 #endif 82 88 83 89 //ll
Note: See TracChangeset
for help on using the changeset viewer.