- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r2496 - freeswitch/trunk/src/mod/codecs/mod_lpc10
by Freeswitch SVN 04 Sep '06

04 Sep '06

Author: brian Date: Sun Sep 3 22:13:20 2006 New Revision: 2496 Added: freeswitch/trunk/src/mod/codecs/mod_lpc10/ freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Log: Ok this actually passes the right RTP sizes but no audio. Work in progress Added: freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/Makefile Sun Sep 3 22:13:20 2006 @@ -0,0 +1,16 @@ +LDFLAGS +=-llpc10 + +all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install codec/lpc10 --prefix=$(PREFIX) + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c ../../../include/switch_bitpack.h + $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o + $(CC) $(SOLINK) $(MODNAME).o -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(LDFLAGS) + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/codecs/mod_lpc10/mod_lpc10.c Sun Sep 3 22:13:20 2006 @@ -0,0 +1,214 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Brian K. West <brian.west(a)mac.com> + * + * + * mod_lpc10.c -- LPC10 Codec Module + * + */ + +#include "switch.h" +#include "lpc10/lpc10.h" + +enum { + SamplesPerFrame = 180, + BitsPerFrame = 54, + BytesPerFrame = (BitsPerFrame+7)/8, + BitsPerSecond = 2400 +}; + +#define SampleValueScale 32768.0 +#define MaxSampleValue 32767.0 +#define MinSampleValue -32767.0 + +static const char modname[] = "mod_lpc10"; + +struct lpc10_context { + struct lpc10_encoder_state encoder_object; + struct lpc10_decoder_state decoder_object; +}; + +static switch_status_t switch_lpc10_init(switch_codec_t *codec, switch_codec_flag_t flags, + const switch_codec_settings_t *codec_settings) +{ + uint32_t encoding, decoding; + struct lpc10_context *context = NULL; + + encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); + decoding = (flags & SWITCH_CODEC_FLAG_DECODE); + + if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct lpc10_context))))) { + return SWITCH_STATUS_FALSE; + } else { + + if (encoding) { + init_lpc10_encoder_state(&context->encoder_object); + } + + if (decoding) { + init_lpc10_decoder_state(&context->decoder_object); + } + + codec->private_info = context; + + return SWITCH_STATUS_SUCCESS; + } +} + + +static switch_status_t switch_lpc10_destroy(switch_codec_t *codec) +{ + codec->private_info = NULL; + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_lpc10_encode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *decoded_data, + + uint32_t decoded_data_len, + uint32_t decoded_rate, + void *encoded_data, + + uint32_t *encoded_data_len, + uint32_t *encoded_rate, + unsigned int *flag) +{ + struct lpc10_context *context = codec->private_info; + int i; + INT32 bits[BitsPerFrame]; + real speech[SamplesPerFrame]; + short * sampleBuffer = (short *)encoded_data; + unsigned char * buffer = (unsigned char *)decoded_data; + + + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + for (i = 0; i < SamplesPerFrame; i++) + speech[i] = (real)(sampleBuffer[i]/SampleValueScale); + + lpc10_encode(speech, bits, &context->encoder_object); + + memset(encoded_data, 0, BytesPerFrame); + for (i = 0; i < BitsPerFrame; i++) { + if (bits[i]) + buffer[i>>3] |= 1 << (i&7); + } + + *encoded_data_len = BytesPerFrame; + + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t switch_lpc10_decode(switch_codec_t *codec, + switch_codec_t *other_codec, + void *encoded_data, + + uint32_t encoded_data_len, + uint32_t encoded_rate, + void *decoded_data, + + uint32_t *decoded_data_len, + uint32_t *decoded_rate, + unsigned int *flag) +{ + struct lpc10_context *context = codec->private_info; + int i; + INT32 bits[BitsPerFrame]; + real speech[SamplesPerFrame]; + short * sampleBuffer = (short *)decoded_data; + unsigned char * buffer = (unsigned char *)encoded_data; + + if (!context) { + return SWITCH_STATUS_FALSE; + } + + for (i = 0; i < BitsPerFrame; i++) + bits[i] = (buffer[i>>3]&(1<<(i&7))) != 0; + + lpc10_decode(bits, speech, &context->decoder_object); + + for (i = 0; i < SamplesPerFrame; i++) { + real sample = (real)(speech[i]*SampleValueScale); + if (sample < MinSampleValue) + sample = MinSampleValue; + else if (sample > MaxSampleValue) + sample = MaxSampleValue; + sampleBuffer[i] = (short)sample; + } + + *decoded_data_len = SamplesPerFrame*2; + + return SWITCH_STATUS_SUCCESS; +} + +/* Registration */ + +static const switch_codec_implementation_t lpc10_implementation = { + /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, + /*.ianacode */ 7, + /*.iananame */ "LPC", + /*.samples_per_second */ 8000, + /*.bits_per_second */ 240, + /*.microseconds_per_frame */ 22500, + /*.samples_per_frame */ 180, + /*.bytes_per_frame */ 360, + /*.encoded_bytes_per_frame */ 7, + /*.number_of_channels */ 1, + /*.pref_frames_per_packet */ 1, + /*.max_frames_per_packet */ 1, + /*.init */ switch_lpc10_init, + /*.encode */ switch_lpc10_encode, + /*.decode */ switch_lpc10_decode, + /*.destroy */ switch_lpc10_destroy, +}; + +const switch_codec_interface_t lpc10_codec_interface = { + /*.interface_name */ "LPC-10 2.4kbps", + /*.implementations */ &lpc10_implementation, +}; + +static switch_loadable_module_interface_t lpc10_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ &lpc10_codec_interface, + /*.application_interface */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, + char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &lpc10_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +}

1 0

[commit] r2495 - freeswitch/trunk
by Freeswitch SVN 04 Sep '06

04 Sep '06

Author: brian Date: Sun Sep 3 20:05:15 2006 New Revision: 2495 Modified: freeswitch/trunk/AUTHORS Log: Update Credits file. Thanks stkn Modified: freeswitch/trunk/AUTHORS ============================================================================== --- freeswitch/trunk/AUTHORS (original) +++ freeswitch/trunk/AUTHORS Sun Sep 3 20:05:15 2006 @@ -23,6 +23,7 @@ James Martelletti <james(a)nerdc0re.com> - All around cool guy (mod_syslog) Johny Kadarisman <jkr888(a)gmail.com> Yossi Neiman of Cartis Solutions, Inc. <freeswitch AT cartissolutions.com> - implementation of mod_cdr (perldd, mysql, csv) + Stefan Knoblich - Various patches and support. Thanks. A big THANK YOU goes to:

1 0

[commit] r2494 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 04 Sep '06

04 Sep '06

Author: brian Date: Sun Sep 3 20:03:20 2006 New Revision: 2494 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: Missing end tag Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Sun Sep 3 20:03:20 2006 @@ -1569,8 +1569,8 @@ NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), NUTAG_AUTOALERT(0), - SIPTAG_SUPPORTED_STR("100rel, precondition") - ); + SIPTAG_SUPPORTED_STR("100rel, precondition"), + TAG_END()); for (node = profile->aliases; node; node = node->next) { @@ -1584,7 +1584,8 @@ NUTAG_EARLY_MEDIA(1), NUTAG_AUTOANSWER(0), SIPTAG_SUPPORTED_STR("100rel, precondition"), - NUTAG_AUTOALERT(0)); + NUTAG_AUTOALERT(0), + TAG_END()); }

1 0

[commit] r2493 - freeswitch/branches/xconsole
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: sphere Date: Sun Sep 3 15:33:28 2006 New Revision: 2493 Added: freeswitch/branches/xconsole/ Log: Creating empty folder for xconsole

1 0

[commit] r2492 - freeswitch/branches/shrhoads
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: sphere Date: Sun Sep 3 10:51:26 2006 New Revision: 2492 Added: freeswitch/branches/shrhoads/ Log: Creating empty folder for shrhoads

1 0

[commit] r2491 - freeswitch/trunk/src/include
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: anthm Date: Sun Sep 3 10:35:35 2006 New Revision: 2491 Modified: freeswitch/trunk/src/include/switch_bitpack.h Log: tweak Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Sep 3 10:35:35 2006 @@ -75,8 +75,12 @@ \param mode RFC3551 or AAL2 mode (curse you backwards folks) */ DoxyDefine(void switch_bitpack_init(switch_bitpack_t *pack, int32_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode)) -static inline void switch_bitpack_init(switch_bitpack_t *pack, switch_byte_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode) +static inline int8_t switch_bitpack_init(switch_bitpack_t *pack, switch_byte_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode) { + if (!pack || (bitlen > SWITCH_BITS_PER_BYTE) || !buf || !buflen) { + return -1; + } + memset(pack, 0, sizeof(*pack)); memset(buf, 0, buflen); pack->frame_bits = bitlen; @@ -84,6 +88,8 @@ pack->buflen = buflen; pack->cur = pack->buf; pack->mode = mode; + + return 0; } static inline void pack_check_over(switch_bitpack_t *pack)

1 0

[commit] r2490 - freeswitch/trunk/libs/codec/g726
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: mikej Date: Sun Sep 3 10:30:42 2006 New Revision: 2490 Modified: freeswitch/trunk/libs/codec/g726/libg726.vcproj Log: turn off edit and continue... Modified: freeswitch/trunk/libs/codec/g726/libg726.vcproj ============================================================================== --- freeswitch/trunk/libs/codec/g726/libg726.vcproj (original) +++ freeswitch/trunk/libs/codec/g726/libg726.vcproj Sun Sep 3 10:30:42 2006 @@ -47,7 +47,7 @@ UsePrecompiledHeader="0" WarningLevel="4" Detect64BitPortabilityProblems="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool"

1 0

[commit] r2489 - in freeswitch/trunk/src: include mod/codecs/mod_g726
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: anthm Date: Sun Sep 3 10:28:08 2006 New Revision: 2489 Modified: freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: compiler warning cleanup (part 3 [getting old]) Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Sep 3 10:28:08 2006 @@ -264,7 +264,7 @@ pack->bytes++; pack->bits_cur = pack->shiftby = 0; } else { - pack->bits_cur = next; + pack->bits_cur = (switch_byte_t) next; } } Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Sun Sep 3 10:28:08 2006 @@ -64,7 +64,7 @@ if (!(encoding || decoding) || (!(handle = switch_core_alloc(codec->memory_pool, sizeof(*handle))))) { return SWITCH_STATUS_FALSE; } else { - handle->bytes = codec->implementation->encoded_bytes_per_frame; + handle->bytes = (switch_byte_t) codec->implementation->encoded_bytes_per_frame; switch(handle->bytes) { case 100: @@ -95,7 +95,7 @@ g726_init_state(&handle->context); codec->private_info = handle; - handle->bits_per_frame = (switch_byte_t) codec->implementation->bits_per_second / (codec->implementation->samples_per_second); + handle->bits_per_frame = (switch_byte_t) (codec->implementation->bits_per_second / (codec->implementation->samples_per_second)); handle->mode = (flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2")) ? SWITCH_BITPACK_MODE_AAL2 : SWITCH_BITPACK_MODE_RFC3551; return SWITCH_STATUS_SUCCESS; @@ -144,7 +144,7 @@ for (x = 0; x < loops && new_len < *encoded_data_len; x++) { int edata = handle->encoder(*ddp, AUDIO_ENCODING_LINEAR, context); - switch_bitpack_in(&handle->pack, edata); + switch_bitpack_in(&handle->pack, (switch_byte_t) edata); ddp++; } switch_bitpack_done(&handle->pack);

1 0

[commit] r2488 - in freeswitch/trunk/src: include mod/codecs/mod_g726
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: anthm Date: Sun Sep 3 10:22:56 2006 New Revision: 2488 Modified: freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: compiler warning cleanup (part 2) Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Sep 3 10:22:56 2006 @@ -253,7 +253,7 @@ if (pack->mode == SWITCH_BITPACK_MODE_RFC3551) { in <<= pack->shiftby; *pack->cur |= in; - pack->shiftby += pack->frame_bits; + pack->shiftby = (switch_byte_t)(pack->shiftby + pack->frame_bits); } else { *pack->cur <<= pack->frame_bits; *pack->cur |= in; Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Sun Sep 3 10:22:56 2006 @@ -41,7 +41,7 @@ typedef struct { g726_state context; - uint8_t bits_per_frame; + switch_byte_t bits_per_frame; encoder_t encoder; decoder_t decoder; switch_bitpack_t pack; @@ -55,7 +55,7 @@ static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) { - switch_byte_t encoding, decoding; + uint32_t encoding, decoding; g726_handle_t *handle; encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); @@ -95,7 +95,7 @@ g726_init_state(&handle->context); codec->private_info = handle; - handle->bits_per_frame = codec->implementation->bits_per_second / (codec->implementation->samples_per_second); + handle->bits_per_frame = (switch_byte_t) codec->implementation->bits_per_second / (codec->implementation->samples_per_second); handle->mode = (flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2")) ? SWITCH_BITPACK_MODE_AAL2 : SWITCH_BITPACK_MODE_RFC3551; return SWITCH_STATUS_SUCCESS; @@ -137,7 +137,7 @@ if (decoded_data_len % len == 0) { uint32_t new_len = 0; int16_t *ddp = decoded_data; - uint8_t *edp = encoded_data; + switch_byte_t *edp = encoded_data; uint32_t x, loops = decoded_data_len / (sizeof(*ddp)); switch_bitpack_init(&handle->pack, handle->bits_per_frame, edp, *encoded_data_len, handle->mode);

1 0

[commit] r2487 - in freeswitch/trunk/src: include mod/codecs/mod_g726
by Freeswitch SVN 03 Sep '06

03 Sep '06

Author: anthm Date: Sun Sep 3 10:15:02 2006 New Revision: 2487 Modified: freeswitch/trunk/src/include/switch_bitpack.h freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Log: compiler warning cleanup Modified: freeswitch/trunk/src/include/switch_bitpack.h ============================================================================== --- freeswitch/trunk/src/include/switch_bitpack.h (original) +++ freeswitch/trunk/src/include/switch_bitpack.h Sun Sep 3 10:15:02 2006 @@ -75,7 +75,7 @@ \param mode RFC3551 or AAL2 mode (curse you backwards folks) */ DoxyDefine(void switch_bitpack_init(switch_bitpack_t *pack, int32_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode)) -static inline void switch_bitpack_init(switch_bitpack_t *pack, int32_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode) +static inline void switch_bitpack_init(switch_bitpack_t *pack, switch_byte_t bitlen, switch_byte_t *buf, uint32_t buflen, switch_bitpack_mode_t mode) { memset(pack, 0, sizeof(*pack)); memset(buf, 0, buflen); @@ -147,7 +147,7 @@ { switch_byte_t this_byte; - if (unpack->cur - unpack->buf > unpack->buflen) { + if ((uint32_t)(unpack->cur - unpack->buf) > unpack->buflen) { return -1; } @@ -218,14 +218,14 @@ { int next = pack->bits_cur + pack->frame_bits; - if (pack->cur - pack->buf > pack->buflen) { + if ((uint32_t)(pack->cur - pack->buf) > pack->buflen) { return -1; } pack->bits_tot += pack->frame_bits; if (next > SWITCH_BITS_PER_BYTE) { - int a = 0, b = 0, rem, nxt; + switch_byte_t a = 0, b = 0, rem, nxt; rem = SWITCH_BITS_PER_BYTE - pack->bits_cur; nxt = pack->frame_bits - rem ; if (pack->mode == SWITCH_BITPACK_MODE_RFC3551) { Modified: freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c (original) +++ freeswitch/trunk/src/mod/codecs/mod_g726/mod_g726.c Sun Sep 3 10:15:02 2006 @@ -193,7 +193,7 @@ switch_bitpack_out(&handle->unpack, in[z++]); } for(y = 0; y < handle->bytes; y++) { - *ddp++ = handle->decoder(handle->buf[y], AUDIO_ENCODING_LINEAR, context); + *ddp++ = (int16_t) handle->decoder(handle->buf[y], AUDIO_ENCODING_LINEAR, context); new_len += 2; } switch_bitpack_done(&handle->unpack);

1 0