提交 d5dc27c6 authored 作者: Anthony Minessale's avatar Anthony Minessale

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

上级 d2f96796
...@@ -146,6 +146,8 @@ void conference_utils_set_mflags(const char *flags, member_flag_t *f) ...@@ -146,6 +146,8 @@ void conference_utils_set_mflags(const char *flags, member_flag_t *f)
f[MFLAG_NO_POSITIONAL] = 1; f[MFLAG_NO_POSITIONAL] = 1;
} else if (!strcasecmp(argv[i], "join-vid-floor")) { } else if (!strcasecmp(argv[i], "join-vid-floor")) {
f[MFLAG_JOIN_VID_FLOOR] = 1; 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")) { } else if (!strcasecmp(argv[i], "no-minimize-encoding")) {
f[MFLAG_NO_MINIMIZE_ENCODING] = 1; f[MFLAG_NO_MINIMIZE_ENCODING] = 1;
} else if (!strcasecmp(argv[i], "second-screen")) { } else if (!strcasecmp(argv[i], "second-screen")) {
......
...@@ -2554,11 +2554,11 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t ...@@ -2554,11 +2554,11 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t
conference_video_reset_video_bitrate_counters(member); 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); conference_video_check_flush(member, SWITCH_TRUE);
} }
} else { } else if (!conference_utils_member_test_flag(member, MFLAG_NO_VIDEO_BLANKS)) {
member->blanks++; member->blanks++;
......
...@@ -213,6 +213,7 @@ typedef enum { ...@@ -213,6 +213,7 @@ typedef enum {
MFLAG_INDICATE_DEAF, MFLAG_INDICATE_DEAF,
MFLAG_INDICATE_UNDEAF, MFLAG_INDICATE_UNDEAF,
MFLAG_TALK_DATA_EVENTS, MFLAG_TALK_DATA_EVENTS,
MFLAG_NO_VIDEO_BLANKS,
/////////////////////////// ///////////////////////////
MFLAG_MAX MFLAG_MAX
} member_flag_t; } member_flag_t;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论