mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 14:58:34 +00:00
FS-9748 #resolve [Locking contention with mod_shout playing conference moh] %backport=1.6
This commit is contained in:
1 parent
4cf0ff9a17
commit
232d171577
3 files changed
+3
-1
No files matched your search
@@ -237,6 +237,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
|
||||
uint32_t conference_energy = 0;
|
||||
int nomoh = 0;
|
||||
conference_member_t *floor_holder;
|
||||
switch_status_t moh_status = SWITCH_STATUS_SUCCESS;
|
||||
|
||||
/* Sync the conference to a single timing source */
|
||||
if (switch_core_timer_next(&timer) != SWITCH_STATUS_SUCCESS) {
|
||||
|
||||
@@ -683,6 +683,7 @@ typedef struct conference_obj {
|
||||
int scale_h264_canvas_height;
|
||||
int scale_h264_canvas_fps_divisor;
|
||||
char *scale_h264_canvas_bandwidth;
|
||||
uint32_t moh_wait;
|
||||
} conference_obj_t;
|
||||
|
||||
/* Relationship with another member */
|
||||
|
||||
Reference in new issue
Block a user