提交 7fe734e1 authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Michael Jerris

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

上级 5b9ada2b
...@@ -1759,6 +1759,7 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -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 ...@@ -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 ...@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论