FS-10379: [mod_conference] Set canvas size based on a variable -- lock width and...

diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c
index c26f7e67a42cc110c710abc486028202b705e1c6..af6ab7c57f0f734e58547a5602c92e7f7701c857 100644 (file)
--- a/src/mod/applications/mod_conference/mod_conference.c
+++ b/src/mod/applications/mod_conference/mod_conference.c
@@ -3142,6 +3142,14 @@ conference_obj_t *conference_new(char *name, conference_xml_cfg_t cfg, switch_co
                        }
                }
 
+               if ((canvas_w % 2) != 0) {
+                       canvas_w++;
+               }
+
+               if ((canvas_h % 2) != 0) {
+                       canvas_h++;
+               }
+
                if (canvas_w < 320 || canvas_h < 180) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s video-canvas-size, falling back to %ux%u\n",
                                                          video_canvas_size ? "Invalid" : "Unspecified", CONFERENCE_CANVAS_DEFAULT_WIDTH, CONFERENCE_CANVAS_DEFAULT_HIGHT);