Commit Graph

93 Commits

Author SHA1 Message Date
Mike Jerris
f1d56a934b Merge pull request #1514 in FS/freeswitch from ~LAZEDO/freeswitch:feature/FS-11134 to master
* commit 'f44c05e6c2bb46880651dabf80319a7cf60cc925':
  FS-11134 [mod_conference] add created channel uuid to bgdial-result
2019-02-12 16:22:08 +00:00
lazedo
f44c05e6c2 FS-11134 [mod_conference] add created channel uuid to bgdial-result 2019-02-12 16:03:48 +00:00
Dragos Oancea
551ce4c46f FS-11554: fix crash in conference API when no param given to "moh". 2018-12-05 22:04:00 -05:00
kgribunin
6ea0e815a7 FS-11450 [mod_conference] Fix for memory leak when conference json list api command is executed 2018-10-31 19:17:51 +03:00
Mike Jerris
5dd445180c FS-11206: [mod_conference] rework behaviors of conference hold to still toggle states while on hold 2018-08-31 19:05:39 +00:00
Christopher Rienzo
350225a446 Merge pull request #1541 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:bugfix/FS-11276-regression-dedicated-video-layers to master
* commit 'c83f7871fa8c5464c39a04b9b09938081c071155':
  FS-11276: dedicated video layers can no longer become audio floor holder
2018-08-22 21:24:44 +00:00
Mike Jerris
3f51f3b4e4 FS-11206: [mod_conference] add conference hold feature 2018-08-13 18:59:49 +00:00
Chad Phillips
c83f7871fa FS-11276: dedicated video layers can no longer become audio floor holder
In mod_conference 1.6.x, all conference users could get the audio floor
regardless of the kind of video layer they were placed in.

In 1.8.x, the concept of a 'dedicated video layer' was introduced, such that
video layout slots with a reservation ID or a role ID are marked with the
'MFLAG_DED_VID_LAYER' member flag when a member is in the slot, and such
marked layers are prevented from becoming the conference audio/video floor
holder.

This makes sense for the video floor in all circumstances, and the audio floor
in most circumstances.

However, there are some circumstances where allowing users in these dedicated
video layers to become the conference audio floor holder is preferred, such as
when all slots in the layout have reservation IDs, and the audio floor events
are used to manage users in those slots manually.

This adds a conference profile flag, 'ded-vid-layer-audio-floor, which, when
enabled, allows conference members in dedicated video layers to become the
conference audio floor holder.
2018-07-25 20:43:05 -05:00
Chad Phillips
cc084c9fb4 FS-10554: Refactor conference vid-res-id command, add 'force' option
The 'conference vid-res-id' sub command previously used the CONF_API_SUB_MEMBER_TARGET
command parsing strategy. The standard options exposed by that strategy didn't make
sense for this sub command, so it's now been switched to use the CONF_API_SUB_ARGS_SPLIT
command parsing strategy.

A third, optional 'force' argument has also been added. The default behavior of the
command is to toggle the user in and out of a reservation slot, use the force argument
to ensure the user is placed into the reservation slot provided.

The new signature of the sub command is:

  vid-res-id <member_id> <val>|clear [force]
2018-07-25 14:24:30 -05:00
Mike Jerris
7f3878dfcb FS-11206: [mod_conference] add conference hold feature 2018-07-24 07:21:56 +00:00
Mike Jerris
bd794e6e08 FS-10949: [mod_conference] allow vblind vunblind tvblind commands when caller is not sending video 2018-07-24 07:21:55 +00:00
Anthony Minessale
d3aee10e28 FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:46 +00:00
Anthony Minessale
2a82d401a6 FS-11034: [mod_conference] Add border control to video #resolve 2018-07-24 07:21:45 +00:00
Anthony Minessale
054229fb68 FS-11021: [mod_conference] Add video mirror #resolve 2018-07-24 07:21:45 +00:00
Anthony Minessale
b048830414 FS-11017: [mod_conference] Add moh controls to conference #resolve 2018-07-24 07:21:45 +00:00
Anthony Minessale
9140aba9f9 Revert "FS-11057: [mod_conference] CPU race on personal canvas #resolve"
This reverts commit 7acc94be97.
2018-07-24 07:21:44 +00:00
Anthony Minessale
443166dc2b FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:44 +00:00
Brian West
0e33e567e3 revert 2018-07-24 07:21:43 +00:00
Anthony Minessale
b12762dd5a FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:43 +00:00
Brian West
b5a7b74b1c revert 2018-07-24 07:21:43 +00:00
Anthony Minessale
89770f4522 FS-11057: [mod_conference] CPU race on personal canvas #resolve 2018-07-24 07:21:43 +00:00
Brian West
fe05bacb84 FS-10865: [mod_conference] conference transfer event reports incorrect info in New-Conference-Name #resolve 2018-07-24 07:21:38 +00:00
Anthony Minessale
586d3349a7 FS-10243: [mod_conference] Add conference variables 2018-07-24 07:21:37 +00:00
Anthony Minessale
683f59f38d FS-10821: [mod_conference] fix arg parser in file vol command in conference #resolve 2018-07-24 07:21:37 +00:00
Anthony Minessale
86ae01462a FS-10802: [mod_conference] Convert conference floor to id based 2018-07-24 07:21:36 +00:00
Anthony Minessale
b8744e4c6d FS-10803: [mod_conference] Add support for alternate video layout config per conference profile #resolve 2018-07-24 07:21:36 +00:00
Anthony Minessale
2b5b9341e7 FS-10802: [mod_conference] Convert conference floor to id based #resolve 2018-07-24 07:21:36 +00:00
Mike Jerris
1f5c7f6666 Merge pull request #1326 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:feature/FS-10478/cmd_uniform_replies to master
* commit '06f060ebd9a8cd2b3a8f343096f39496892e4e16':
  FS-10478: [mod_conference] make API replies uniform with "+OK" or "-ERR" prefix
2017-08-10 16:18:59 +00:00
Mike Jerris
4f7ffc7bfc FS-10574: fix deadlock on invalid syntax using conference record api 2017-08-05 13:11:59 -05:00
Dragos Oancea
06f060ebd9 FS-10478: [mod_conference] make API replies uniform with "+OK" or "-ERR" prefix 2017-07-07 15:48:18 +01:00
Anthony Minessale
aec11b0948 FS-10448: [mod_conference] Add Video Blind -- add tweak 2017-06-30 10:29:00 -05:00
Anthony Minessale
8734c9070d FS-10448: [mod_conference] Add Video Blind #resolve 2017-06-29 18:11:16 -05:00
Anthony Minessale
73adcdb3d8 FS-10379: [mod_conference] Set canvas size based on a variable #resolve 2017-06-07 18:07:00 -05:00
Anthony Minessale
7e90fe5a25 FS-10274: [mod_conference] Prevent double-recording of conference files and all recording of supercanvas in multi-canvas mode #resolve 2017-04-28 12:26:47 -05:00
Anthony Minessale
f691d139ea FS-9922: [mod_conference] Auto Energy Level -- some clean up 2017-04-27 15:28:59 -05:00
Anthony Minessale
5748b4ddff FS-10270: [mod_conference] Regression in personal canvas -- from: f1d8685566 #resolve 2017-04-26 15:25:04 -05:00
Mike Jerris
cf3ba5a4fe FS-10260: [mod_conference] add conference count api command 2017-04-24 16:34:19 -05:00
Anthony Minessale
69a0776013 FS-10243: [mod_conference] Add conference variables -- fix typo 2017-04-20 13:47:25 -05:00
Anthony Minessale
b84662ae6b FS-10243: [mod_conference] Add conference variables #resolve 2017-04-17 17:00:11 -05:00
Anthony Minessale
1d1cb7e4a1 FS-10097: [mod_conference] Add fgimg to conference video layouts 2017-04-06 13:31:22 -05:00
Anthony Minessale
e61f6e227c FS-10151: [mod_video_filter] Add filters and fg video to mod_video_filter #resolve 2017-03-17 15:16:13 -05:00
Anthony Minessale
f1d8685566 FS-10138: [freeswitch-core,mod_conference] Add alpha video to conference 2017-03-16 14:55:16 -05:00
Anthony Minessale
a62f26803e FS-10121: [mod_conference] Add role-id and layout transitions to conference #resolve 2017-03-09 14:18:16 -06:00
Anthony Minessale
51dd5e87a7 FS-9922: [mod_conference] Auto Energy Level #resolve 2017-03-09 12:03:55 -06:00
Anthony Minessale
da6b9e001c FS-9742: [mod_conference,mod_cv] Refactor canvas zoom code #resolve 2017-03-09 11:54:13 -06:00
Anthony Minessale
115e69a0c0 FS-10114: [mod_conference] Reduce image reads from disk for logo image #resolve 2017-03-08 19:36:18 -06:00
Sergey Safarov
df1ab07ca4 FS-9924: Removed extra space in source files 2017-02-09 23:59:49 -05:00
Anthony Minessale
d8c9b1ed16 FS-10007: [mod_conference] Issue with reservation-id and conference video layouts #resolve 2017-02-03 15:17:17 -06:00
Seven Du
49d730e7f9 FS-9736 #resolve add conference json_list 2016-11-30 23:54:18 +08:00
Anthony Minessale
d429cc2f5a FS-9552 2016-09-29 12:58:09 -05:00