From b0fb1b8a3b4f1c260f5dd6e9c90006d205b4f482 Mon Sep 17 00:00:00 2001 From: uyuy2043 Date: Tue, 27 Jun 2023 19:36:47 +0800 Subject: [PATCH 1/2] crash when video call --- src/switch_ivr.c | 1 + src/switch_rtp.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 77d957fb7c..c91aba657e 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -3600,6 +3600,7 @@ SWITCH_DECLARE(void) switch_ivr_delay_echo(switch_core_session_t *session, uint3 switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setting delay to %dms (%d frames)\n", delay_ms, qlen); switch_jb_create(&jb, SJB_AUDIO, qlen, qlen, switch_core_session_get_pool(session)); + switch_jb_set_session(jb, session); if ((var = switch_channel_get_variable(channel, "delay_echo_debug_level"))) { debug = atoi(var); diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 05b0858313..c68c800f92 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -8402,6 +8402,7 @@ static int rtp_common_write(switch_rtp_t *rtp_session, } switch_jb_create(&rtp_session->vbw, SJB_VIDEO, nack_size, nack_size, rtp_session->pool); + switch_jb_set_session(rtp_session->vbw, rtp_session->session); if (rtp_session->vbw) { switch_jb_set_flag(rtp_session->vbw, SJB_QUEUE_ONLY); From 3c4fc234d8046566037bd5c216103598a00c4f9d Mon Sep 17 00:00:00 2001 From: uyuy2043 Date: Tue, 11 Jul 2023 17:28:03 +0800 Subject: [PATCH 2/2] vid-write-png crash --- src/mod/applications/mod_conference/conference_api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mod/applications/mod_conference/conference_api.c b/src/mod/applications/mod_conference/conference_api.c index 8bcfc5862f..38a04284c7 100644 --- a/src/mod/applications/mod_conference/conference_api.c +++ b/src/mod/applications/mod_conference/conference_api.c @@ -1977,7 +1977,7 @@ switch_status_t conference_api_sub_write_png(conference_obj_t *conference, switc if (conference->canvas_count > 1) { /* pick super canvas */ - canvas = conference->canvases[conference->canvas_count]; + canvas = conference->canvases[conference->canvas_count-1]; } else { canvas = conference->canvases[0]; }