From 2cb00153e2574d9bbd87ee34ab3658237827470f Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 27 Apr 2015 15:20:28 -0500 Subject: [PATCH] FS-7513: add fps returned when one is not specified and add 20fps setting --- src/mod/applications/mod_conference/mod_conference.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index fa17ba8a1d..40771f8e86 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -66,6 +66,7 @@ static struct conf_fps FPS_VALS[] = { {10.0f, 100, 900}, {15.0f, 66, 1364}, {16.60f, 60, 1500}, + {20.0f, 50, 4500}, {25.0f, 40, 2250}, {30.0f, 33, 2700}, {33.0f, 30, 2790}, @@ -8697,13 +8698,13 @@ static switch_status_t conf_api_sub_vid_fps(conference_obj_t *conference, switch { float fps = 0; - if (!argv[2]) { - stream->write_function(stream, "Invalid input\n"); + if (!conference->canvas) { + stream->write_function(stream, "Conference is not in mixing mode\n"); return SWITCH_STATUS_SUCCESS; } - if (!conference->canvas) { - stream->write_function(stream, "Conference is not in mixing mode\n"); + if (!argv[2]) { + stream->write_function(stream, "Current FPS [%0.2f]\n", conference->video_fps.fps); return SWITCH_STATUS_SUCCESS; }