提交 57da9ed8 authored 作者: Anthony Minessale's avatar Anthony Minessale

more tweaks for google compat

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2326 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 1003a4d4
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN) all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
depends: depends:
MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.11.1.tar.gz --prefix=$(PREFIX) MAKE=$(MAKE) $(BASE)/build/buildlib.sh $(BASE) install speex-1.1.12.tar.gz --prefix=$(PREFIX)
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c $(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o $(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
......
...@@ -205,6 +205,7 @@ static switch_status_t switch_speex_encode(switch_codec_t *codec, ...@@ -205,6 +205,7 @@ static switch_status_t switch_speex_encode(switch_codec_t *codec,
speex_bits_pack(&context->encoder_bits, 15, 5); speex_bits_pack(&context->encoder_bits, 15, 5);
*encoded_data_len = speex_bits_write(&context->encoder_bits, (char *) encoded_data, context->encoder_frame_size); *encoded_data_len = speex_bits_write(&context->encoder_bits, (char *) encoded_data, context->encoder_frame_size);
speex_bits_reset(&context->encoder_bits); speex_bits_reset(&context->encoder_bits);
(*encoded_data_len)--;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -287,10 +288,10 @@ static const switch_codec_implementation_t speex_32k_implementation = { ...@@ -287,10 +288,10 @@ static const switch_codec_implementation_t speex_32k_implementation = {
static const switch_codec_implementation_t speex_16k_implementation = { static const switch_codec_implementation_t speex_16k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 100, /*.ianacode */ 99,
/*.iananame */ "speex", /*.iananame */ "speex",
/*.samples_per_second */ 22000, /*.samples_per_second */ 16000,
/*.bits_per_second */ 128000, /*.bits_per_second */ 22000,
/*.nanoseconds_per_frame */ 20000, /*.nanoseconds_per_frame */ 20000,
/*.samples_per_frame */ 320, /*.samples_per_frame */ 320,
/*.bytes_per_frame */ 640, /*.bytes_per_frame */ 640,
...@@ -307,14 +308,14 @@ static const switch_codec_implementation_t speex_16k_implementation = { ...@@ -307,14 +308,14 @@ static const switch_codec_implementation_t speex_16k_implementation = {
static const switch_codec_implementation_t speex_8k_implementation = { static const switch_codec_implementation_t speex_8k_implementation = {
/*.codec_type */ SWITCH_CODEC_TYPE_AUDIO, /*.codec_type */ SWITCH_CODEC_TYPE_AUDIO,
/*.ianacode */ 97, /*.ianacode */ 98,
/*.iananame */ "speex", /*.iananame */ "speex",
/*.samples_per_second */ 8000, /*.samples_per_second */ 8000,
/*.bits_per_second */ 11000, /*.bits_per_second */ 11000,
/*.nanoseconds_per_frame */ 20000, /*.nanoseconds_per_frame */ 20000,
/*.samples_per_frame */ 160, /*.samples_per_frame */ 160,
/*.bytes_per_frame */ 320, /*.bytes_per_frame */ 320,
/*.encoded_bytes_per_frame */ 28, /*.encoded_bytes_per_frame */ 0,
/*.number_of_channels */ 1, /*.number_of_channels */ 1,
/*.pref_frames_per_packet */ 1, /*.pref_frames_per_packet */ 1,
/*.max_frames_per_packet */ 1, /*.max_frames_per_packet */ 1,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论