Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

[mod_verto] get the conference to send a keyframe when you reload/attach so the video shows up faster

This commit is contained in:
Anthony Minessale 2020-04-10 21:36:37 +00:00 committed by Andrey Volk
parent ff48868dc4
commit 91c0379041
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/applications/mod_conference/conference_video.c
View File

@ -3344,7 +3344,8 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
if (imember->watching_canvas_id == canvas->canvas_id && switch_channel_test_flag(imember->channel, CF_VIDEO_REFRESH_REQ)) {
switch_channel_clear_flag(imember->channel, CF_VIDEO_REFRESH_REQ);
send_keyframe = SWITCH_TRUE;
canvas->send_keyframe = 30;
send_keyframe = 1;
}
if (conference_utils_test_flag(conference, CFLAG_MINIMIZE_VIDEO_ENCODING) &&

18
src/mod/endpoints/mod_verto/mod_verto.c
View File

@ -1239,6 +1239,8 @@ static void tech_reattach(verto_pvt_t *tech_pvt, jsock_t *jsock)
switch_channel_get_name(tech_pvt->channel),
tech_pvt->mparams->local_sdp_str);
set_call_params(params, tech_pvt);
switch_core_media_gen_key_frame(tech_pvt->session);
switch_channel_set_flag(tech_pvt->channel, CF_VIDEO_REFRESH_REQ);
jsock_queue_event(jsock, &msg, SWITCH_TRUE);
}
@ -3484,6 +3486,17 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
}
}
if (tech_pvt) {
if (err) {
if (tech_pvt->channel) {
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_BEARERCAPABILITY_NOTAVAIL);
}
} else {
switch_core_media_gen_key_frame(tech_pvt->session);
switch_channel_set_flag(tech_pvt->channel, CF_VIDEO_REFRESH_REQ);
}
}
if (session) {
switch_core_session_rwunlock(session);
}
@ -3492,11 +3505,6 @@ static switch_bool_t verto__attach_func(const char *method, cJSON *params, jsock
return SWITCH_TRUE;
}
if (tech_pvt && tech_pvt->channel) {
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_BEARERCAPABILITY_NOTAVAIL);
}
cJSON_AddItemToObject(obj, "code", cJSON_CreateNumber(CODE_SESSION_ERROR));
return SWITCH_FALSE;