From 2a329aa5e724d96b1abe93d2cd33c3bcb1d9985f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Sat, 14 Jan 2006 16:44:52 +0000 Subject: [PATCH] make all buffers the same size git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@384 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_types.h | 2 +- src/mod/endpoints/mod_exosip/mod_exosip.c | 2 +- src/mod/endpoints/mod_iax/mod_iax.c | 2 +- src/mod/endpoints/mod_opal/mod_opal.c | 2 +- src/mod/endpoints/mod_portaudio/mod_portaudio.c | 2 +- src/mod/endpoints/mod_wanpipe/mod_wanpipe.c | 2 +- src/mod/endpoints/mod_woomera/mod_woomera.c | 2 +- src/switch_core.c | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 383a0417db..3494ab245f 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -41,7 +41,7 @@ extern "C" { #include #include -#define SWITCH_GLOBAL_VERSION "1" +#define SWITCH_RECCOMMENDED_BUFFER_SIZE 131072 #define SWITCH_MAX_CODECS 30 diff --git a/src/mod/endpoints/mod_exosip/mod_exosip.c b/src/mod/endpoints/mod_exosip/mod_exosip.c index 82ad91696d..aef165afc0 100644 --- a/src/mod/endpoints/mod_exosip/mod_exosip.c +++ b/src/mod/endpoints/mod_exosip/mod_exosip.c @@ -92,7 +92,7 @@ struct private_object { switch_frame read_frame; switch_codec read_codec; switch_codec write_codec; - unsigned char read_buf[1024]; + unsigned char read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_caller_profile *caller_profile; int cid; int did; diff --git a/src/mod/endpoints/mod_iax/mod_iax.c b/src/mod/endpoints/mod_iax/mod_iax.c index 4f1bd7cac9..612a8cf6e2 100644 --- a/src/mod/endpoints/mod_iax/mod_iax.c +++ b/src/mod/endpoints/mod_iax/mod_iax.c @@ -80,7 +80,7 @@ struct private_object { switch_codec read_codec; switch_codec write_codec; struct switch_frame read_frame; - unsigned char databuf[1024]; + unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_core_session *session; struct iax_session *iax_session; switch_caller_profile *caller_profile; diff --git a/src/mod/endpoints/mod_opal/mod_opal.c b/src/mod/endpoints/mod_opal/mod_opal.c index 8b251fa2e7..8159f23f34 100644 --- a/src/mod/endpoints/mod_opal/mod_opal.c +++ b/src/mod/endpoints/mod_opal/mod_opal.c @@ -52,7 +52,7 @@ static struct { struct private_object { unsigned int flags; struct switch_frame frame; - unsigned char databuf[1024]; + unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_core_session *session; switch_caller_profile *caller_profile; }; diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c index dc831ff985..787ce0d83c 100644 --- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c +++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c @@ -83,7 +83,7 @@ struct private_object { switch_codec read_codec; switch_codec write_codec; struct switch_frame read_frame; - unsigned char databuf[1024]; + unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_core_session *session; switch_caller_profile *caller_profile; char call_id[50]; diff --git a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c index c624475f47..a15784c407 100644 --- a/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c +++ b/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c @@ -88,7 +88,7 @@ static struct { struct private_object { unsigned int flags; /* FLAGS */ struct switch_frame frame; /* Frame for Writing */ - unsigned char databuf[1024]; + unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; struct sangoma_pri *spri; pri_event ring_event; pri_event hangup_event; diff --git a/src/mod/endpoints/mod_woomera/mod_woomera.c b/src/mod/endpoints/mod_woomera/mod_woomera.c index c3403b29d1..0f6ce7de66 100644 --- a/src/mod/endpoints/mod_woomera/mod_woomera.c +++ b/src/mod/endpoints/mod_woomera/mod_woomera.c @@ -138,7 +138,7 @@ struct private_object { switch_pollfd_t read_poll; switch_pollfd_t write_poll; switch_pollfd_t command_poll; - unsigned char databuf[2048]; + unsigned char databuf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_mutex_t *iolock; switch_sockaddr_t *udpread; switch_sockaddr_t *udpwrite; diff --git a/src/switch_core.c b/src/switch_core.c index 751fb6193c..dbb55986d5 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -58,18 +58,18 @@ struct switch_core_session { struct switch_io_event_hooks event_hooks; switch_codec *read_codec; switch_codec *write_codec; - // TBD Make these 128k buffers size themselves dynamicly + switch_buffer *raw_write_buffer; switch_frame raw_write_frame; switch_frame enc_write_frame; - unsigned char *raw_write_buf[131072]; - unsigned char *enc_write_buf[131072]; + unsigned char *raw_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + unsigned char *enc_write_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_buffer *raw_read_buffer; switch_frame raw_read_frame; switch_frame enc_read_frame; - unsigned char *raw_read_buf[131072]; - unsigned char *enc_read_buf[131072]; + unsigned char *raw_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; + unsigned char *enc_read_buf[SWITCH_RECCOMMENDED_BUFFER_SIZE]; switch_audio_resampler *read_resampler;