提交 7fc019a9 authored 作者: Brian West's avatar Brian West 提交者: Michael Jerris

FS-7513: fix segfault on conference hangup

上级 d34c85ae
...@@ -1553,7 +1553,7 @@ static void write_canvas_image_to_codec_group(conference_obj_t *conference, code ...@@ -1553,7 +1553,7 @@ static void write_canvas_image_to_codec_group(conference_obj_t *conference, code
//switch_core_session_write_encoded_video_frame(imember->session, frame, 0, 0); //switch_core_session_write_encoded_video_frame(imember->session, frame, 0, 0);
switch_set_flag(frame, SFF_ENCODED); switch_set_flag(frame, SFF_ENCODED);
if (switch_frame_buffer_dup(imember->fb, frame, &dupframe) == SWITCH_STATUS_SUCCESS) { if (switch_frame_buffer_dup(imember->fb, frame, &dupframe) == SWITCH_STATUS_SUCCESS) {
switch_queue_push(imember->mux_out_queue, dupframe); switch_queue_push(imember->mux_out_queue, dupframe);
dupframe = NULL; dupframe = NULL;
...@@ -6591,7 +6591,6 @@ static void conference_loop_output(conference_member_t *member) ...@@ -6591,7 +6591,6 @@ static void conference_loop_output(conference_member_t *member)
if (member->video_muxing_write_thread) { if (member->video_muxing_write_thread) {
switch_queue_push(member->mux_out_queue, NULL); switch_queue_push(member->mux_out_queue, NULL);
switch_thread_join(&st, member->video_muxing_write_thread); switch_thread_join(&st, member->video_muxing_write_thread);
switch_frame_buffer_destroy(&member->fb);
} }
} }
...@@ -11754,6 +11753,10 @@ SWITCH_STANDARD_APP(conference_function) ...@@ -11754,6 +11753,10 @@ SWITCH_STANDARD_APP(conference_function)
switch_buffer_destroy(&member.audio_buffer); switch_buffer_destroy(&member.audio_buffer);
switch_buffer_destroy(&member.mux_buffer); switch_buffer_destroy(&member.mux_buffer);
if (member.fb) {
switch_frame_buffer_destroy(&member.fb);
}
if (conference) { if (conference) {
switch_mutex_lock(conference->mutex); switch_mutex_lock(conference->mutex);
if (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) { if (switch_test_flag(conference, CFLAG_DYNAMIC) && conference->count == 0) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论