FS-8293 add quality level 0 to conference (default is 1) and fix some logic in auto bw

diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index 3ff7c286c478e8dc462212544cf8264481e792fb..9b47911e10b30d362734482ffe28b19c734b16a0 100644 (file)
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -995,14 +995,20 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 #define SWITCH_READ_ACCEPTABLE(status) (status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK || status == SWITCH_STATUS_INUSE)
 
 
-static inline int32_t switch_calc_bitrate(int w, int h, int quality, int fps)
+static inline int32_t switch_calc_bitrate(int w, int h, int quality, double fps)
 {
+       int r;
+
        /* KUSH GAUGE*/
 
        if (!fps) fps = 15;
-       if (!quality) quality = 2;
        
-       return (int32_t)((float)(w * h * fps * quality) * 0.07) / 1000;
+       r = (int32_t)((double)(w * h * fps * (quality ? quality : 1)) * 0.07) / 1000;
+
+       if (!quality) r /= 2;
+
+       return r;
+
 }
 
 static inline int32_t switch_parse_bandwidth_string(const char *bwv)

diff --git a/src/mod/applications/mod_av/avcodec.c b/src/mod/applications/mod_av/avcodec.c
index de6fb8a280b0407d2a2a73e6338aee93cc8df8a4..5349e11708b862199340e9e5d98084a422d86505 100644 (file)
--- a/src/mod/applications/mod_av/avcodec.c
+++ b/src/mod/applications/mod_av/avcodec.c
@@ -845,7 +845,7 @@ static switch_status_t open_encoder(h264_codec_context_t *context, uint32_t widt
        if (context->codec_settings.video.bandwidth) {
                context->bandwidth = context->codec_settings.video.bandwidth * 8;
        } else {
-               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0) * 8;
+               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15) * 8;
        }
 
        sane = switch_calc_bitrate(1920, 1080, 2, 30);

diff --git a/src/mod/applications/mod_conference/conference_video.c b/src/mod/applications/mod_conference/conference_video.c
index dfece45d97743b1e5726ef7dfad0488897f78fc2..45ca7c41c77565f2d438561c1b6280ae2f38807b 100644 (file)
--- a/src/mod/applications/mod_conference/conference_video.c
+++ b/src/mod/applications/mod_conference/conference_video.c
@@ -894,7 +894,7 @@ switch_status_t conference_video_attach_video_layer(conference_member_t *member,
        channel = switch_core_session_get_channel(member->session);
 
 
-       if (!switch_channel_test_flag(channel, CF_VIDEO) && !member->avatar_png_img) {
+       if (!switch_channel_test_flag(channel, CF_VIDEO_READY) && !member->avatar_png_img) {
                return SWITCH_STATUS_FALSE;
        }
 
@@ -1267,7 +1267,7 @@ void conference_video_write_canvas_image_to_codec_group(conference_obj_t *confer
                                        continue;
                                }
 
-                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
                                        switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                        continue;
                                }
@@ -1590,7 +1590,7 @@ void conference_video_check_avatar(conference_member_t *member, switch_bool_t fo
        canvas = conference_video_get_canvas_locked(member);
 
        if (conference_utils_test_flag(member->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) &&
-               (!switch_channel_test_flag(member->channel, CF_VIDEO) || switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY)) {
+               (!switch_channel_test_flag(member->channel, CF_VIDEO_READY) || switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY)) {
                if (canvas) {
                        conference_video_release_canvas(&canvas);
                }
@@ -1603,7 +1603,7 @@ void conference_video_check_avatar(conference_member_t *member, switch_bool_t fo
 
        member->avatar_patched = 0;
 
-       if (!force && switch_channel_test_flag(member->channel, CF_VIDEO) && switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY) {
+       if (!force && switch_channel_test_flag(member->channel, CF_VIDEO_READY) && switch_core_session_media_flow(member->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY) {
                conference_utils_member_set_flag_locked(member, MFLAG_ACK_VIDEO);
        } else {
                if (member->conference->no_video_avatar) {
@@ -1639,7 +1639,7 @@ void conference_video_check_flush(conference_member_t *member)
 {
        int flushed;
 
-       if (!member->channel || !switch_channel_test_flag(member->channel, CF_VIDEO)) {
+       if (!member->channel || !switch_channel_test_flag(member->channel, CF_VIDEO_READY)) {
                return;
        }
 
@@ -1798,7 +1798,7 @@ void conference_video_pop_next_image(conference_member_t *member, switch_image_t
        int size = 0;
        void *pop;
 
-       if (!member->avatar_png_img && switch_channel_test_flag(member->channel, CF_VIDEO)) {
+       if (!member->avatar_png_img && switch_channel_test_flag(member->channel, CF_VIDEO_READY)) {
                do {
                        if (switch_queue_trypop(member->video_queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
                                switch_img_free(&img);
@@ -1870,7 +1870,7 @@ void conference_video_set_absolute_incoming_bitrate_member(conference_member_t *
        member->max_bw_in = 0;
        member->force_bw_in = kps;
        member->managed_kps = 0;
-       if (!conference_utils_test_flag(member->conference, CFLAG_MANAGE_INBOUND_VIDEO_BITRATE) && switch_channel_test_flag(member->channel, CF_VIDEO)) {
+       if (!conference_utils_test_flag(member->conference, CFLAG_MANAGE_INBOUND_VIDEO_BITRATE) && switch_channel_test_flag(member->channel, CF_VIDEO_READY)) {
                conference_video_set_incoming_bitrate(member, kps);
        }
 }
@@ -1903,6 +1903,13 @@ void conference_video_set_absolute_incoming_bitrate(conference_obj_t *conference
 
 void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_t *layer)
 {
+       switch_vid_params_t vid_params = { 0 };
+       
+       switch_core_media_get_vid_params(member->session, &vid_params);
+
+       if (!switch_channel_test_flag(member->channel, CF_VIDEO_READY) || !vid_params.width || !vid_params.height) {
+               return;
+       }
 
        if (switch_channel_test_flag(member->channel, CF_VIDEO_BITRATE_UNMANAGABLE)) {
                member->managed_kps = 0;
@@ -1926,15 +1933,12 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
                                                          switch_channel_get_name(member->channel), kps);
                } else {
                        int max = 0;
-                       switch_vid_params_t vid_params = { 0 };
                        
-                       switch_core_media_get_vid_params(member->session, &vid_params);
-
                        if (w > vid_params.width || h > vid_params.height) {
                                w = vid_params.width;
                                h = vid_params.height;
                        }
-
+                       
                        if (layer) {
                                kps = switch_calc_bitrate(w, h, member->conference->video_quality, (int)(member->conference->video_fps.fps));
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "%s auto-setting bitrate to %dkps to accomodate %dx%d resolution\n",
@@ -1953,7 +1957,9 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
                                                                  switch_channel_get_name(member->channel), kps);
                        }
                }
-               conference_video_set_incoming_bitrate(member, kps);
+               if (kps) {
+                       conference_video_set_incoming_bitrate(member, kps);
+               }
        }
 }
 
@@ -2093,7 +2099,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
 
                        switch_mutex_lock(conference->member_mutex);
                        for (imember = conference->members; imember; imember = imember->next) {
-                               if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO) && 
+                               if (imember->channel && switch_channel_ready(imember->channel) && switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && 
                                        conference_utils_member_test_flag(imember, MFLAG_RUNNING) 
                                        && imember->canvas_id == canvas->canvas_id && imember->video_media_flow != SWITCH_MEDIA_FLOW_SENDONLY) {
                                        canvas_count++;
@@ -2141,7 +2147,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                for (imember = conference->members; imember; imember = imember->next) {
                                        if (imember->canvas_id != canvas->canvas_id) continue;
 
-                                       if (imember->session && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+                                       if (imember->session && switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                                                switch_core_session_request_video_refresh(imember->session);
                                                switch_core_media_gen_key_frame(imember->session);
                                        }
@@ -2167,7 +2173,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        switch_image_t *img = NULL;
                        int i;
 
-                       if (!imember->session || (!switch_channel_test_flag(imember->channel, CF_VIDEO) && !imember->avatar_png_img) ||
+                       if (!imember->session || (!switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && !imember->avatar_png_img) ||
                                conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS) || switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                continue;
                        }
@@ -2182,7 +2188,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                !conference_utils_member_test_flag(imember, MFLAG_NO_MINIMIZE_ENCODING)) {
                                min_members++;
 
-                               if (switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+                               if (switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                                        if (imember->video_codec_index < 0 && (check_codec = switch_core_session_get_video_write_codec(imember->session))) {
                                                for (i = 0; write_codecs[i] && switch_core_codec_ready(&write_codecs[i]->codec) && i < MAX_MUX_CODECS; i++) {
                                                        if (check_codec->implementation->codec_id == write_codecs[i]->codec.implementation->codec_id) {
@@ -2272,7 +2278,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                switch_img_free(&img);
                        }
 
-                       if (!layer && (!conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || ((switch_channel_test_flag(imember->channel, CF_VIDEO) && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY)))) {
+                       if (!layer && (!conference_utils_test_flag(imember->conference, CFLAG_VIDEO_REQUIRED_FOR_CANVAS) || ((switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && switch_core_session_media_flow(imember->session, SWITCH_MEDIA_TYPE_VIDEO) != SWITCH_MEDIA_FLOW_SENDONLY)))) {
                                if (conference_video_find_layer(conference, canvas, imember, &layer) == SWITCH_STATUS_SUCCESS) {
                                        imember->layer_timeout = 0;
                                } else {
@@ -2382,7 +2388,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        
                        for (imember = conference->members; imember; imember = imember->next) {
 
-                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
                                        switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                        continue;
                                }
@@ -2505,7 +2511,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                        mcu_layer_t *layer = NULL;
                                        switch_image_t *use_img = NULL;
 
-                                       if (!omember->session || !switch_channel_test_flag(omember->channel, CF_VIDEO) ||
+                                       if (!omember->session || !switch_channel_test_flag(omember->channel, CF_VIDEO_READY) ||
                                                switch_core_session_media_flow(omember->session, SWITCH_MEDIA_TYPE_VIDEO) == SWITCH_MEDIA_FLOW_SENDONLY) {
                                                continue;
                                        }
@@ -2603,7 +2609,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                        for (imember = conference->members; imember; imember = imember->next) {
                                switch_frame_t *dupframe;
 
-                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
                                        switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                        continue;
                                }
@@ -2782,7 +2788,7 @@ void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread_t *thr
                                        continue;
                                }
 
-                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                               if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
                                        switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                        continue;
                                }
@@ -2982,7 +2988,7 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_
                for (imember = conference->members; imember; imember = imember->next) {
                        int i;
 
-                       if (!imember->session || (!switch_channel_test_flag(imember->channel, CF_VIDEO) && !imember->avatar_png_img) ||
+                       if (!imember->session || (!switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && !imember->avatar_png_img) ||
                                conference_utils_test_flag(conference, CFLAG_PERSONAL_CANVAS) || switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                continue;
                        }
@@ -2997,7 +3003,7 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_
                                !conference_utils_member_test_flag(imember, MFLAG_NO_MINIMIZE_ENCODING)) {
                                min_members++;
 
-                               if (switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+                               if (switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                                        if (imember->video_codec_index < 0 && (check_codec = switch_core_session_get_video_write_codec(imember->session))) {
                                                for (i = 0; write_codecs[i] && switch_core_codec_ready(&write_codecs[i]->codec) && i < MAX_MUX_CODECS; i++) {
                                                        if (check_codec->implementation->codec_id == write_codecs[i]->codec.implementation->codec_id) {
@@ -3130,7 +3136,7 @@ void *SWITCH_THREAD_FUNC conference_video_super_muxing_thread_run(switch_thread_
                        }
 
                        
-                       if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO) ||
+                       if (!imember->session || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ||
                                switch_core_session_read_lock(imember->session) != SWITCH_STATUS_SUCCESS) {
                                continue;
                        }
@@ -3228,7 +3234,7 @@ void conference_video_find_floor(conference_member_t *member, switch_bool_t ente
                        continue;
                }
 
-               if (!switch_channel_test_flag(imember->channel, CF_VIDEO) && !imember->avatar_png_img) {
+               if (!switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && !imember->avatar_png_img) {
                        continue;
                }
 
@@ -3316,7 +3322,7 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
        if (!member) {
                switch_mutex_lock(conference->member_mutex);
                for (imember = conference->members; imember; imember = imember->next) {
-                       if (imember->id != conference->video_floor_holder && imember->channel && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+                       if (imember->id != conference->video_floor_holder && imember->channel && switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                                member = imember;
                                break;
                        }
@@ -3359,7 +3365,7 @@ void conference_video_set_floor_holder(conference_obj_t *conference, conference_
 
        switch_mutex_lock(conference->member_mutex);
        for (imember = conference->members; imember; imember = imember->next) {
-               if (!imember->channel || !switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+               if (!imember->channel || !switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                        continue;
                }
 
@@ -3436,11 +3442,11 @@ void conference_video_write_frame(conference_obj_t *conference, conference_membe
                        switch_channel_clear_flag(imember->channel, CF_VIDEO_REFRESH_REQ);
                }
 
-               if (isession && switch_channel_test_flag(imember->channel, CF_VIDEO)) {
+               if (isession && switch_channel_test_flag(imember->channel, CF_VIDEO_READY)) {
                        int send_frame = 0;
 
                        if (conference->canvases[0] && conference_utils_test_flag(imember->conference, CFLAG_VIDEO_BRIDGE_FIRST_TWO)) {
-                               if (switch_channel_test_flag(imember->channel, CF_VIDEO) && (conference->members_with_video == 1 || imember != floor_holder)) {
+                               if (switch_channel_test_flag(imember->channel, CF_VIDEO_READY) && (conference->members_with_video == 1 || imember != floor_holder)) {
                                        send_frame = 1;
                                }
                        } else if (!conference_utils_member_test_flag(imember, MFLAG_RECEIVING_VIDEO) &&
@@ -3483,7 +3489,7 @@ void conference_video_write_frame(conference_obj_t *conference, conference_membe
                                continue;
                        }
                        
-                       if (switch_channel_test_flag(imember->channel, CF_VIDEO) ) {
+                       if (switch_channel_test_flag(imember->channel, CF_VIDEO_READY) ) {
                                switch_core_session_request_video_refresh(imember->session);    
                        }
                        

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index f9c9fc68c9a5acfd9e8ea5560df382dd6c6df86e..6a4df4a6a19c91f323f5efb6f7c0703929443359 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -2725,10 +2725,10 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
                        } else if (!strcasecmp(var, "video-quality") && !zstr(val)) {
                                int tmp = atoi(val);
 
-                               if (tmp > 0 && tmp < 5) {
+                               if (tmp > -1 && tmp < 5) {
                                        conference_video_quality = tmp;
                                } else {
-                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video quality must be between 1 and 4\n");
+                                       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Video quality must be between 0 and 4\n");
                                }
                                
                        } else if (!strcasecmp(var, "video-mode") && !zstr(val)) {
@@ -2874,7 +2874,7 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
 
                if (video_codec_bandwidth) {
                        if (!strcasecmp(video_codec_bandwidth, "auto")) {
-                               conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, conference->video_quality, (int)conference->video_fps.fps);
+                               conference->video_codec_settings.video.bandwidth = switch_calc_bitrate(canvas_w, canvas_h, conference->video_quality, conference->video_fps.fps);
                        } else {
                                conference->video_codec_settings.video.bandwidth = switch_parse_bandwidth_string(video_codec_bandwidth);
                        }

diff --git a/src/mod/codecs/mod_openh264/mod_openh264.cpp b/src/mod/codecs/mod_openh264/mod_openh264.cpp
index 723462b1f21d123cbd31bb932ee26eff008fbd29..0e8beaf100d72b4162fc1a0f47184efd49fcfa89 100644 (file)
--- a/src/mod/codecs/mod_openh264/mod_openh264.cpp
+++ b/src/mod/codecs/mod_openh264/mod_openh264.cpp
@@ -95,7 +95,7 @@ int FillSpecificParameters(h264_codec_context_t *context) {
        if (context->codec_settings.video.bandwidth) {
                context->bandwidth = context->codec_settings.video.bandwidth;
        } else {
-               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0);
+               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15);
        }
 
        if (context->bandwidth > 5120) {

diff --git a/src/mod/codecs/mod_vpx/mod_vpx.c b/src/mod/codecs/mod_vpx/mod_vpx.c
index 2826cb886601bbb51d7353a4a8fc0ba9921c3039..4b70ad280978cee384bd5e960c71580167801293 100644 (file)
--- a/src/mod/codecs/mod_vpx/mod_vpx.c
+++ b/src/mod/codecs/mod_vpx/mod_vpx.c
@@ -317,7 +317,7 @@ static switch_status_t init_encoder(switch_codec_t *codec)
        if (context->codec_settings.video.bandwidth) {
                context->bandwidth = context->codec_settings.video.bandwidth;
        } else {
-               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 0, 0);
+               context->bandwidth = switch_calc_bitrate(context->codec_settings.video.width, context->codec_settings.video.height, 1, 15);
 
        }