ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-12 20:47:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

FS-7513: move thread create and fix missing mutex unlock

Browse Source
This commit is contained in:
Anthony Minessale authored and Michael Jerris committed 2015-05-28 12:47:08 -05:00
1 parent 5b9ada2b43
commit 7fe734e1f9
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/applications/mod_conference/mod_conference.c
+5 -3
View File
@@ -1759,6 +1759,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
if (imember->video_codec_index < 0) { if (imember->video_codec_index < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Codec Error\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Codec Error\n");
switch_core_session_rwunlock(imember->session);
continue; continue;
} }
} }
@@ -4622,9 +4623,6 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
} }
if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO)) { if (switch_channel_ready(channel) && switch_channel_test_flag(channel, CF_VIDEO)) {
if (conference->video_layout_name && !conference->video_muxing_thread) {
launch_conference_video_muxing_thread(conference);
}
members_with_video++; members_with_video++;
} }
@@ -12643,6 +12641,10 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c
switch_core_hash_insert(globals.conference_hash, conference->name, conference); switch_core_hash_insert(globals.conference_hash, conference->name, conference);
switch_mutex_unlock(globals.hash_mutex); switch_mutex_unlock(globals.hash_mutex);
if (conference->video_layout_name && !conference->video_muxing_thread) {
launch_conference_video_muxing_thread(conference);
}
end: end:
switch_mutex_unlock(globals.hash_mutex); switch_mutex_unlock(globals.hash_mutex);