mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-14 23:34:13 +00:00
webrtc video tweaks
This commit is contained in:
Anthony Minessale committed
1 parent
02ddafda3f
commit
eebac2ea95
4 files changed
+126
-65
No files matched your search
@@ -202,7 +202,8 @@ typedef enum {
|
||||
CFLAG_AUDIO_ALWAYS = (1 << 15),
|
||||
CFLAG_ENDCONF_FORCED = (1 << 16),
|
||||
CFLAG_RFC4579 = (1 << 17),
|
||||
CFLAG_FLOOR_CHANGE = (1 << 18)
|
||||
CFLAG_FLOOR_CHANGE = (1 << 18),
|
||||
CFLAG_VID_FLOOR_LOCK = (1 << 19)
|
||||
} conf_flag_t;
|
||||
|
||||
typedef enum {
|
||||
@@ -1454,12 +1455,11 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
|
||||
switch_channel_set_variable(channel, "conference_recording", conference->record_filename);
|
||||
switch_channel_set_variable(channel, CONFERENCE_UUID_VARIABLE, conference->uuid_str);
|
||||
|
||||
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_VIDEO)) {
|
||||
if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) {
|
||||
if (switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) {
|
||||
switch_channel_set_flag(channel, CF_VIDEO_ECHO);
|
||||
} else {
|
||||
switch_channel_clear_flag(channel, CF_VIDEO_ECHO);
|
||||
switch_channel_clear_flag(channel, CF_VIDEO_PASSIVE);
|
||||
}
|
||||
/* Tell the channel to request a fresh vid frame */
|
||||
switch_core_session_refresh_video(member->session);
|
||||
@@ -1577,36 +1577,47 @@ static switch_status_t conference_add_member(conference_obj_t *conference, confe
|
||||
return status;
|
||||
}
|
||||
|
||||
static void conference_set_video_floor_holder(conference_obj_t *conference, conference_member_t *member)
|
||||
static void conference_set_video_floor_holder(conference_obj_t *conference, conference_member_t *member, switch_bool_t force)
|
||||
{
|
||||
switch_event_t *event;
|
||||
conference_member_t *old_member = NULL;
|
||||
int old_id = 0;
|
||||
|
||||
if (switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) {
|
||||
if (switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) || (!force && switch_test_flag(conference, CFLAG_VID_FLOOR_LOCK))) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (conference->video_floor_holder) {
|
||||
if (conference->video_floor_holder == member) {
|
||||
return;
|
||||
} else {
|
||||
} else {
|
||||
old_member = conference->video_floor_holder;
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping video floor %s\n",
|
||||
switch_channel_get_name(conference->video_floor_holder->channel));
|
||||
old_id = conference->video_floor_holder->id;
|
||||
switch_channel_clear_flag(conference->video_floor_holder->channel, CF_VIDEO_PASSIVE);
|
||||
switch_core_session_refresh_video(conference->video_floor_holder->session);
|
||||
switch_channel_get_name(old_member->channel));
|
||||
}
|
||||
}
|
||||
|
||||
if ((conference->video_floor_holder = member)) {
|
||||
|
||||
switch_mutex_lock(conference->mutex);
|
||||
if (member) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Adding video floor %s\n",
|
||||
switch_channel_get_name(conference->video_floor_holder->channel));
|
||||
switch_channel_get_name(member->channel));
|
||||
switch_channel_set_flag(member->channel, CF_VIDEO_PASSIVE);
|
||||
switch_core_session_refresh_video(conference->video_floor_holder->session);
|
||||
switch_set_flag(conference, CFLAG_FLOOR_CHANGE);
|
||||
switch_core_session_refresh_video(member->session);
|
||||
conference->video_floor_holder = member;
|
||||
} else {
|
||||
conference->video_floor_holder = NULL;
|
||||
}
|
||||
|
||||
if (old_id > -1 && test_eflag(conference, EFLAG_FLOOR_CHANGE)) {
|
||||
if (old_member) {
|
||||
old_id = old_member->id;
|
||||
switch_channel_clear_flag(old_member->channel, CF_VIDEO_PASSIVE);
|
||||
}
|
||||
|
||||
switch_set_flag(conference, CFLAG_FLOOR_CHANGE);
|
||||
switch_mutex_unlock(conference->mutex);
|
||||
|
||||
if (test_eflag(conference, EFLAG_FLOOR_CHANGE)) {
|
||||
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
|
||||
conference_add_event_data(conference, event);
|
||||
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "video-floor-change");
|
||||
@@ -1628,33 +1639,44 @@ static void conference_set_video_floor_holder(conference_obj_t *conference, conf
|
||||
static void conference_set_floor_holder(conference_obj_t *conference, conference_member_t *member)
|
||||
{
|
||||
switch_event_t *event;
|
||||
conference_member_t *old_member = NULL;
|
||||
int old_id = 0;
|
||||
|
||||
if (!switch_test_flag(conference, CFLAG_VIDEO_BRIDGE) &&
|
||||
((conference->video_floor_holder && !member) || (member && switch_channel_test_flag(member->channel, CF_VIDEO)))) {
|
||||
conference_set_video_floor_holder(conference, member, SWITCH_FALSE);
|
||||
}
|
||||
|
||||
if (conference->floor_holder) {
|
||||
if (conference->floor_holder == member) {
|
||||
return;
|
||||
} else {
|
||||
old_id = conference->floor_holder->id;
|
||||
if (!conference->video_floor_holder && !switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping floor %s\n",
|
||||
switch_channel_get_name(conference->floor_holder->channel));
|
||||
switch_channel_clear_flag(conference->floor_holder->channel, CF_VIDEO_PASSIVE);
|
||||
switch_core_session_refresh_video(conference->floor_holder->session);
|
||||
}
|
||||
old_member = conference->floor_holder;
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Dropping floor %s\n",
|
||||
switch_channel_get_name(old_member->channel));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
if ((conference->floor_holder = member)) {
|
||||
if (!conference->video_floor_holder && !switch_test_flag(conference, CFLAG_VIDEO_BRIDGE)) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Adding floor %s\n",
|
||||
switch_channel_get_name(conference->floor_holder->channel));
|
||||
switch_channel_set_flag(member->channel, CF_VIDEO_PASSIVE);
|
||||
switch_core_session_refresh_video(conference->floor_holder->session);
|
||||
}
|
||||
switch_set_flag(conference, CFLAG_FLOOR_CHANGE);
|
||||
switch_mutex_lock(conference->mutex);
|
||||
if (member) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "Adding floor %s\n",
|
||||
switch_channel_get_name(member->channel));
|
||||
|
||||
conference->floor_holder = member;
|
||||
} else {
|
||||
conference->floor_holder = NULL;
|
||||
}
|
||||
|
||||
if (old_id > -1 && test_eflag(conference, EFLAG_FLOOR_CHANGE)) {
|
||||
|
||||
if (old_member) {
|
||||
old_id = old_member->id;
|
||||
}
|
||||
|
||||
switch_set_flag(conference, CFLAG_FLOOR_CHANGE);
|
||||
switch_mutex_unlock(conference->mutex);
|
||||
|
||||
if (test_eflag(conference, EFLAG_FLOOR_CHANGE)) {
|
||||
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT);
|
||||
conference_add_event_data(conference, event);
|
||||
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "floor-change");
|
||||
@@ -1763,7 +1785,7 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
|
||||
|
||||
|
||||
if (member == member->conference->video_floor_holder) {
|
||||
conference_set_video_floor_holder(member->conference, NULL);
|
||||
conference_set_video_floor_holder(member->conference, NULL, SWITCH_TRUE);
|
||||
}
|
||||
|
||||
member->conference = NULL;
|
||||
@@ -1779,11 +1801,6 @@ static switch_status_t conference_del_member(conference_obj_t *conference, confe
|
||||
}
|
||||
}
|
||||
|
||||
if (switch_channel_test_flag(channel, CF_VIDEO)) {
|
||||
switch_channel_set_flag(channel, CF_VIDEO_ECHO);
|
||||
switch_channel_clear_flag(channel, CF_VIDEO_PASSIVE);
|
||||
}
|
||||
|
||||
conference_send_presence(conference);
|
||||
switch_channel_set_variable(channel, "conference_call_key", NULL);
|
||||
|
||||
@@ -1914,8 +1931,6 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
|
||||
|
||||
if (conference->video_floor_holder) {
|
||||
floor_holder = conference->video_floor_holder;
|
||||
} else {
|
||||
floor_holder = conference->floor_holder;
|
||||
}
|
||||
|
||||
|
||||
@@ -1924,7 +1939,7 @@ static void *SWITCH_THREAD_FUNC conference_video_thread_run(switch_thread_t *thr
|
||||
goto do_continue;
|
||||
}
|
||||
|
||||
if (!switch_channel_test_flag(switch_core_session_get_channel(floor_holder->session), CF_VIDEO)) {
|
||||
if (!floor_holder->session || !floor_holder->channel || !switch_channel_test_flag(floor_holder->channel, CF_VIDEO)) {
|
||||
yield = 100000;
|
||||
goto do_continue;
|
||||
}
|
||||
@@ -2074,8 +2089,8 @@ static void *SWITCH_THREAD_FUNC conference_thread_run(switch_thread_t *thread, v
|
||||
if (switch_test_flag(imember, MFLAG_RUNNING) && imember->session) {
|
||||
switch_channel_t *channel = switch_core_session_get_channel(imember->session);
|
||||
|
||||
if ((!floor_holder || (imember->score_iir > SCORE_IIR_SPEAKING_MAX && (floor_holder->score_iir < SCORE_IIR_SPEAKING_MIN))) &&
|
||||
(!switch_test_flag(conference, CFLAG_VID_FLOOR) || switch_channel_test_flag(channel, CF_VIDEO))) {
|
||||
if ((!floor_holder || (imember->score_iir > SCORE_IIR_SPEAKING_MAX && (floor_holder->score_iir < SCORE_IIR_SPEAKING_MIN)))) {// &&
|
||||
//(!switch_test_flag(conference, CFLAG_VID_FLOOR) || switch_channel_test_flag(channel, CF_VIDEO))) {
|
||||
floor_holder = imember;
|
||||
}
|
||||
|
||||
@@ -5282,7 +5297,8 @@ static switch_status_t conf_api_sub_clear_vid_floor(conference_obj_t *conference
|
||||
}
|
||||
|
||||
switch_mutex_lock(conference->mutex);
|
||||
conference_set_video_floor_holder(conference, NULL);
|
||||
switch_clear_flag(conference, CFLAG_VID_FLOOR_LOCK);
|
||||
//conference_set_video_floor_holder(conference, NULL);
|
||||
switch_mutex_unlock(conference->mutex);
|
||||
|
||||
return SWITCH_STATUS_SUCCESS;
|
||||
@@ -5307,19 +5323,22 @@ static switch_status_t conf_api_sub_vid_floor(conference_member_t *member, switc
|
||||
force = 1;
|
||||
}
|
||||
|
||||
if (!force && member->conference->video_floor_holder == member) {
|
||||
conference_set_video_floor_holder(member->conference, NULL);
|
||||
if (member->conference->video_floor_holder == member && switch_test_flag(member->conference, CFLAG_VID_FLOOR_LOCK)) {
|
||||
switch_clear_flag(member->conference, CFLAG_VID_FLOOR_LOCK);
|
||||
|
||||
conference_set_floor_holder(member->conference, member);
|
||||
if (stream == NULL) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK floor none\n", member->conference->name);
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK video floor auto\n", member->conference->name);
|
||||
} else {
|
||||
stream->write_function(stream, "OK floor none\n");
|
||||
}
|
||||
|
||||
} else if (force || member->conference->video_floor_holder == NULL) {
|
||||
conference_set_video_floor_holder(member->conference, member);
|
||||
switch_set_flag(member->conference, CFLAG_VID_FLOOR_LOCK);
|
||||
conference_set_video_floor_holder(member->conference, member, SWITCH_TRUE);
|
||||
if (test_eflag(member->conference, EFLAG_FLOOR_CHANGE)) {
|
||||
if (stream == NULL) {
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK floor %d %s\n",
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "conference %s OK video floor %d %s\n",
|
||||
member->conference->name, member->id, switch_channel_get_name(member->channel));
|
||||
} else {
|
||||
stream->write_function(stream, "OK floor %u\n", member->id);
|
||||
|
||||
Reference in new issue
Block a user