From 1b88dba5dbd0a7322e83c3e0345f94c46fc05d2a Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 13 Mar 2017 11:50:34 -0500 Subject: [PATCH] FS-9922: [mod_conference] Auto Energy Level --- src/include/switch_frame.h | 14 +++++++------- .../applications/mod_conference/mod_conference.h | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/switch_frame.h b/src/include/switch_frame.h index ad739331c0..15c02f7839 100644 --- a/src/include/switch_frame.h +++ b/src/include/switch_frame.h @@ -41,13 +41,13 @@ SWITCH_BEGIN_EXTERN_C typedef struct switch_frame_geometry { - uint32_t w; - uint32_t h; - uint32_t x; - uint32_t y; - uint32_t z; - uint32_t M; - uint32_t X; + int32_t w; + int32_t h; + int32_t x; + int32_t y; + int32_t z; + int32_t M; + int32_t X; } switch_frame_geometry_t; /*! \brief An abstraction of a data frame */ diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h index 556380fa85..b13c7c0d58 100644 --- a/src/mod/applications/mod_conference/mod_conference.h +++ b/src/mod/applications/mod_conference/mod_conference.h @@ -663,8 +663,8 @@ typedef struct conference_obj { uint32_t agc_margin; uint32_t agc_change_factor; uint32_t agc_period_len; - uint32_t max_energy_hit_trigger; - uint32_t auto_energy_sec; + int32_t max_energy_hit_trigger; + int32_t auto_energy_sec; uint32_t burst_mute_count; uint8_t min; switch_speech_handle_t lsh; @@ -747,8 +747,8 @@ struct conference_member { switch_buffer_t *mux_buffer; switch_buffer_t *resample_buffer; member_flag_t flags[MFLAG_MAX]; - uint32_t score; - uint32_t last_score; + int32_t score; + int32_t last_score; uint32_t score_iir; switch_mutex_t *flag_mutex; switch_mutex_t *write_mutex; @@ -773,7 +773,7 @@ struct conference_member { int32_t energy_level; int32_t auto_energy_level; int32_t max_energy_level; - uint32_t agc_level; + int32_t agc_level; uint32_t agc_low_energy_level; uint32_t agc_margin; uint32_t agc_change_factor;