提交 7507636d authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-8595 contd

上级 7f80d750
...@@ -1920,6 +1920,12 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_ ...@@ -1920,6 +1920,12 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
if (!switch_channel_test_flag(member->channel, CF_VIDEO_READY) || !vid_params.width || !vid_params.height) { if (!switch_channel_test_flag(member->channel, CF_VIDEO_READY) || !vid_params.width || !vid_params.height) {
return; return;
} }
if (vid_params.width != member->vid_params.width || vid_params.height != member->vid_params.height) {
member->managed_kps = 0;
}
member->vid_params = vid_params;
if (switch_channel_test_flag(member->channel, CF_VIDEO_BITRATE_UNMANAGABLE)) { if (switch_channel_test_flag(member->channel, CF_VIDEO_BITRATE_UNMANAGABLE)) {
member->managed_kps = 0; member->managed_kps = 0;
...@@ -1929,7 +1935,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_ ...@@ -1929,7 +1935,7 @@ void conference_video_check_auto_bitrate(conference_member_t *member, mcu_layer_
int min = 0; int min = 0;
kps = switch_calc_bitrate(layer->screen_w, layer->screen_h, member->conference->video_quality, (int)(member->conference->video_fps.fps)); kps = switch_calc_bitrate(layer->screen_w, layer->screen_h, member->conference->video_quality, (int)(member->conference->video_fps.fps));
min = kps / 4; min = switch_calc_bitrate(vid_params.width, vid_params.height, member->conference->video_quality, (int)(member->conference->video_fps.fps)) / 4;
if (member->conference->max_bw_in) { if (member->conference->max_bw_in) {
max = member->conference->max_bw_in; max = member->conference->max_bw_in;
......
...@@ -748,6 +748,7 @@ struct conference_member { ...@@ -748,6 +748,7 @@ struct conference_member {
char *video_logo; char *video_logo;
char *video_mute_png; char *video_mute_png;
char *video_reservation_id; char *video_reservation_id;
switch_vid_params_t vid_params;
switch_frame_buffer_t *fb; switch_frame_buffer_t *fb;
switch_image_t *avatar_png_img; switch_image_t *avatar_png_img;
switch_image_t *video_mute_img; switch_image_t *video_mute_img;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论