From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 6 Apr 2017 22:29:47 +0000 (-0500)
Subject: FS-10216: [mod_conference] add no-video-blanks member flag #resolve
X-Git-Tag: v1.8.0~627
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5dc27c6e6ccdcaa10a0cabd86a4c32b0494b349;p=thirdparty%2Ffreeswitch.git

FS-10216: [mod_conference] add no-video-blanks member flag #resolve
---

diff --git a/src/mod/applications/mod_conference/conference_utils.c b/src/mod/applications/mod_conference/conference_utils.c
index d3d7bac566..aef72e13f1 100644
--- a/src/mod/applications/mod_conference/conference_utils.c
+++ b/src/mod/applications/mod_conference/conference_utils.c
@@ -146,6 +146,8 @@ void conference_utils_set_mflags(const char *flags, member_flag_t *f)
 				f[MFLAG_NO_POSITIONAL] = 1;
 			} else if (!strcasecmp(argv[i], "join-vid-floor")) {
 				f[MFLAG_JOIN_VID_FLOOR] = 1;
+			} else if (!strcasecmp(argv[i], "no-video-blanks")) {
+				f[MFLAG_NO_VIDEO_BLANKS] = 1;
 			} else if (!strcasecmp(argv[i], "no-minimize-encoding")) {
 				f[MFLAG_NO_MINIMIZE_ENCODING] = 1;
 			} else if (!strcasecmp(argv[i], "second-screen")) {
diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index 1d4238c614..c86c6db2bf 100644
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -2554,11 +2554,11 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t
 					conference_video_reset_video_bitrate_counters(member);
 				}
 
-				if (member->auto_avatar && member->good_img > vid_params.fps * 3) {
+				if (member->auto_avatar && member->good_img > 1) {
 					conference_video_check_flush(member, SWITCH_TRUE);
 				}
 
-			} else {
+			} else if (!conference_utils_member_test_flag(member, MFLAG_NO_VIDEO_BLANKS)) {
 				member->blanks++;
 
 
diff --git a/src/mod/applications/mod_conference/mod_conference.h b/src/mod/applications/mod_conference/mod_conference.h
index 1c52416f43..668b95cf6a 100644
--- a/src/mod/applications/mod_conference/mod_conference.h
+++ b/src/mod/applications/mod_conference/mod_conference.h
@@ -213,6 +213,7 @@ typedef enum {
 	MFLAG_INDICATE_DEAF,
 	MFLAG_INDICATE_UNDEAF,
 	MFLAG_TALK_DATA_EVENTS,
+	MFLAG_NO_VIDEO_BLANKS,
 	///////////////////////////
 	MFLAG_MAX
 } member_flag_t;