提交 893f3ace authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-10019

上级 334ae304
...@@ -389,6 +389,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob ...@@ -389,6 +389,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
} }
switch_mutex_lock(conference->file_mutex);
/* If a file or speech event is being played */ /* If a file or speech event is being played */
if (conference->fnode && !switch_test_flag(conference->fnode, NFLAG_PAUSE)) { if (conference->fnode && !switch_test_flag(conference->fnode, NFLAG_PAUSE)) {
/* Lead in time */ /* Lead in time */
...@@ -495,6 +496,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob ...@@ -495,6 +496,7 @@ void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, void *ob
} }
} }
} }
switch_mutex_lock(conference->file_mutex);
if (ready || has_file_data) { if (ready || has_file_data) {
/* Use more bits in the main_frame to preserve the exact sum of the audio samples. */ /* Use more bits in the main_frame to preserve the exact sum of the audio samples. */
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论