Author: mikej Date: Wed Sep 6 00:47:34 2006 New Revision: 2531 Modified: freeswitch/branches/james/conf/freeswitch.xml freeswitch/branches/james/src/mod/codecs/mod_amr/mod_amr.c Log: update to trunk Modified: freeswitch/branches/james/conf/freeswitch.xml ============================================================================== --- freeswitch/branches/james/conf/freeswitch.xml (original) +++ freeswitch/branches/james/conf/freeswitch.xml Wed Sep 6 00:47:34 2006 @@ -398,12 +398,6 @@ </condition> </extension> - <extension name="testmusic"> - <condition field="destination_number" expression="^1234$"> - <action application="bridge" data="exosip/1234@66.250.68.194"/> - </condition> - </extension> - <!-- Enter an existing conference --> <extension name="1000"> <condition field="destination_number" expression="^1000$"> Modified: freeswitch/branches/james/src/mod/codecs/mod_amr/mod_amr.c ============================================================================== --- freeswitch/branches/james/src/mod/codecs/mod_amr/mod_amr.c (original) +++ freeswitch/branches/james/src/mod/codecs/mod_amr/mod_amr.c Wed Sep 6 00:47:34 2006 @@ -88,8 +88,6 @@ AMR_BITRATE_1220 }; -//static short bytes_per_frame[16]={ 13, 14, 16, 18, 19, 21, 26, 31, 6, 0, 0, 0, 0, 0, 0, 0 }; - #define AMR_Mode 7 static switch_status_t switch_amr_init(switch_codec_t *codec, switch_codec_flag_t flags, @@ -173,9 +171,6 @@ unsigned int *flag) { struct amr_context *context = codec->private_info; - //int dec_mode; - - //dec_mode = (*(char *)encoded_data >> 3) & 0xF; if (!context) { return SWITCH_STATUS_FALSE; @@ -183,7 +178,7 @@ Decoder_Interface_Decode( context->decoder_state, (void *)encoded_data, (void *)decoded_data, 0 ); - *decoded_data_len = codec->implementation->samples_per_frame; + *decoded_data_len = codec->implementation->bytes_per_frame; return SWITCH_STATUS_SUCCESS; } @@ -198,7 +193,7 @@ /*.bits_per_second */ 0, /*.microseconds_per_frame */ 20000, /*.samples_per_frame */ 160, - /*.bytes_per_frame */ 0, + /*.bytes_per_frame */ 320, /*.encoded_bytes_per_frame */ 0, /*.number_of_channels */ 1, /*.pref_frames_per_packet */ 1,