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 d3d7bac5662a5c7e2b98df813a7973245018037e..aef72e13f1207e9f6f5d5f4d09daa2ccdaec0d0c 100644 (file)
--- 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 1d4238c61433bd402430a308fe699286250d8a58..c86c6db2bf9132186d39f3554f671c788c465714 100644 (file)
--- 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 1c52416f43ac19c8ffe6b8a6028c001602727e8f..668b95cf6a978739cf051896a4cb89d8c8bdccda 100644 (file)
--- 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;