975 Commits

Author SHA1 Message Date
Mike Jerris
5339a9f558 fix issue on single core or similar vm causing conference to spin in loop 2015-08-07 05:45:25 +00:00
Anthony Minessale
c38a0f33a4 don't mix personal canvas and multi-canvas modes 2015-08-06 19:08:31 -05:00
Anthony Minessale
b3c248048e destroy personal canvas after member is out of the list 2015-08-06 18:57:59 -05:00
Brian West
240cfef430 Merge branch 'master' of https://freeswitch.org/stash/scm/fs/freeswitch 2015-08-05 10:21:32 -05:00
Anthony Minessale
78ac8e5560 FS-7940 #resolve 2015-08-05 10:21:23 -05:00
Michael Jerris
b5b7740a1d FS-7728: working windows build minus video features 2015-08-05 01:35:05 -05:00
Brian West
25d9184e10 whatev %noWIR 2015-08-04 00:16:09 -05:00
Brian West
8835487172 fix regression in bugged layers 2015-08-03 22:37:04 -05:00
Anthony Minessale
90b7ed72d7 fix regressions from last commit %noWIR 2015-08-01 01:37:25 -05:00
Anthony Minessale
c4242dd9d8 conference optimizations %noWIR 2015-07-31 13:49:13 -05:00
Anthony Minessale
852c0dcfae move scale_and_patch operation to session specific thread to speed up central mux thread 2015-07-30 18:49:30 -05:00
Brian West
ab7f83c654 FS-7769
fixed vmute on personal canvas
fixed changing layouts on personal canvas
2015-07-30 14:29:09 -05:00
Mike Jerris
40f95f28d8 FS-7919: [mod_conference] fix rebuild dependency on header file 2015-07-30 10:32:18 -05:00
Anthony Minessale
51b38145e4 FS-7760 add clear vs allclear to logo and banner api to clear variable too 2015-07-29 21:31:56 -05:00
Anthony Minessale
06758f6f4f FS-7913 #resolve 2015-07-29 16:00:22 -05:00
Anthony Minessale
43b7accfd9 don't reset logo on banner change 2015-07-28 20:18:24 -05:00
Anthony Minessale
34fd0e9ad8 FS-7769 More features
add var=val member lookup usable wherver member_id is valid in api commands
add bgimg to layouts with api command or config for global setting
fix bug with overlap layouts combined with odd sized layers
improve switch_img_fit to take a modifier for fit, streach or both at once
2015-07-28 19:43:04 -05:00
Anthony Minessale
75e46cedb8 FS-7893 --resolve 2015-07-25 12:52:46 -05:00
Anthony Minessale
9665956431 FS-7887 #resolve 2015-07-24 13:47:48 -05:00
Mike Jerris
51185079c2 Merge pull request #365 in FS/freeswitch from ~THEHUNMONKGROUP/freeswitch:FS-7882 to master
* commit '1d7a496889dcf1dbb4cb9bb40a3b4b449cdfd60a':
  Allow JSON API commands to send third arg for muting
2015-07-24 10:32:32 -05:00
Michael Jerris
12a6b8bc53 FS-7889: [mod_conference] move conference chat to use an event channel so messages only go to the right 'room' for the conference 2015-07-23 19:09:24 -05:00
Chad Phillips
1d7a496889 Allow JSON API commands to send third arg for muting
The mod_conference API supports passing an optional third arg for all
mute commands (mute, unmute, tmute, vmute, unvmute, tvmute). This patch
adds support for the optional third arg to the JSON API.

FS-7882 #resolve
2015-07-22 21:58:32 -07:00
Michael Jerris
cbc489fe27 FS-7870: [mod_conference] allow jsonapi commands to take string variant of id attr 2015-07-22 21:06:35 -04:00
Michael Jerris
64cbb72ac8 FS-7870: [mod_conference] allow jsonapi commands to take string variant of id attr 2015-07-22 18:13:10 -04:00
Anthony Minessale
16915ea996 FS-7874 #resolve 2015-07-22 14:42:58 -05:00
Brian West
e2f17ea04a FS-7869: [mod_conference] fix deadlock on shutdown after playing video file that will not display video 2015-07-21 18:41:49 -05:00
Anthony Minessale
cbccadaa2f factor out conference->canvas and allow per canvas record and play 2015-07-21 16:54:23 -05:00
Brian West
02539c6c4f FS-7861, FS-7862: [mod_conference] fix crash and other issues caused by multi canvas feature 2015-07-21 15:43:14 -05:00
Chad Phillips
bb75a34f34 Restoring commit lost in mod_conference refactor.
Commit c49f87313ad3d6c65d0a68c80763822772c42cbd, which added a vmute
option to the conference member flags, was somehow lost in the
mod_conference refactor. This commit restores the lost code.

FS-7813 #resolve
2015-07-20 21:36:17 -07:00
Anthony Minessale
3148b1ad74 FS-7847 fix logo ratios and add borders too 2015-07-17 20:18:26 -05:00
Mike Jerris
3b2b09c3df FS-7847: [mod_conference] add layers that do not match the aspect ration of conference by using the new hscale layer param for horizontal scale, and add zoom=true param to crop layer instead of letterbox, add grid-zoom layout group that demonstrates these layouts 2015-07-17 16:37:24 -05:00
Anthony Minessale
7b47e29919 fix whitespace snafu 2015-07-17 11:47:22 -05:00
William King
59d1bdae1e FS-7845 whitespace and indention 2015-07-16 17:43:12 -07:00
William King
d8194e9edb FS-7845 File rename to remove mod_* prefix to local module C files. Change
function name prefixes from shorthand 'conf' to longer form
'conference'. Also fixes the channel variable names which had been
caught in an over zealous perl -pi -e command...
2015-07-16 17:15:09 -07:00
William King
14aa720512 FS-7845 Rename functions so that they relate to the file that they are
located in.
2015-07-16 14:36:58 -07:00
William King
756ef77b7b FS-7845 Refactor of mod_conference to improve compilation speed, and
logical organization.
2015-07-16 14:36:58 -07:00
Chad Phillips
c49f87313a Add vmute member flag to mod_conference.
A 'vmute' flag can be applied to individual conferees when entering the
conference. When the flag is passed, conferees will enter the conference
with their video muted.

FS-7813 #resolve
2015-07-15 13:00:12 -07:00
Anthony Minessale
56ee6537ca allow groups to show up in layer list, add delay for new layers to change canvases to give it time to auto adust in group situations 2015-07-15 12:16:16 -05:00
Michael Jerris
d18c964ba7 FS-7769: fix build issue 2015-07-13 18:14:10 -04:00
Anthony Minessale
f726cb9a53 FS-7769: [mod_conference] Add new multi-canvas and telepresence features
mod_conference new features:
add conference layout "1x1+2x1" and add to layout group grid
add conference flag video-bridge-first-two conference flag
add conference flag video-required-for-canvas to only use avatars for members with video
add conference flag video-muxing-personal-canvas
add conf_verto_ prefix for variables to pass on live array subscription notice
add api command conference foo vid-canvas <member_id|all|last|non_moderator> [<newval>]
add api command conference foo vid-layer <member_id|all|last|non_moderator> [<newval>]
add api command conference foo vid-watching-canvas <member_id|all|last|non_moderator> [<newval>]
changed api command conference foo vid-layout, args are now "<layout name>|group <group name> [<canvas_id>]"
add channel vars you can set before entering conference video_initial_canvas and video_initial_watching_canvas
add many new output status vars to conference list api
add new conference member flag "second-screen"
add config param video-canvas-count
add config param video-super-canvas-label-layers
add config param video-super-canvas-show-all-layers
add config param video-super-canvas-bgcolor

verto client:
add google login
add hipchat js file
conf_verto_hipchatURL= to control what hipchat server appears if any
global device init and overrides
allow passing sessid
add confMan.canvasCount
add handling of multiple canvases and launching them, and controlling all of their layouts
re-layout moderator controls and add support for changing the watching and input canvas and layers
when launching another canvas, watch subscriptions for the original call so we can automatically close the additional window
maintain camera settings on call recovery
2015-07-13 18:03:16 -04:00
Anthony Minessale
178ed75571 FS-7775: [mod_conference] fix threading issue causing stuck worker threads 2015-07-03 16:46:04 -05:00
Anthony Minessale
2f836a2c53 FS-7744 amend 2015-07-02 16:12:28 -05:00
Anthony Minessale
fcbdc48592 FS-7744 #resolve 2015-07-02 13:39:56 -05:00
Michael Jerris
f727cdb9d1 FS-7724: [mod_conference] fix segfault when missing fonts when trying to render banner 2015-06-24 17:10:24 -05:00
Anthony Minessale
385a3b545c FS-7656 fix various edge cases with video and non video files mixed into a source, fix a typo bug in file_read_video and fix same bug in mod_vlc, add a new flag to file_read_video to check if the handle is has active video, make mod_conference move the video in and out of a layer when the stream has video or not 2015-06-19 00:57:02 -05:00
Mike Jerris
2283270b8b Merge pull request #288 in FS/freeswitch from ~MICHAELGG/freeswitch:winperf to master
* commit '81190c6d89aa7bedbda041c8a8519081856effff':
  FS-7644. Fix build on VS2013/Win by creating and forcing nf (nofork) to true.
  FS-7644. Remove non-existent projects.
  FS-7644. Add switch_core_video.c and switch_vidderbuffer.c to VS2013 FreeSwitchCore.2013.vcxproj
  FS-7644. Change 2013.vcxproj references to 2013
2015-06-18 15:35:02 -05:00
Anthony Minessale
bc92a8bf4a add auto bandwidth for conference config 2015-06-18 13:01:42 -05:00
Michael Giagnocavo
f116387443 FS-7644. Change 2013.vcxproj references to 2013 2015-06-18 04:17:53 -06:00
Michael Jerris
4ad0aa91a4 FS-7655: attempt to make libvpx and libyuv optional (none of the video features will work without them) The following modules require these libraries to be installed still: mod_av mod_cv mod_fsv mod_mp4v2 mod_openh264 mod_vpx mod_imagick mod_vpx mod_yuv mod_png mod_vlc 2015-06-16 18:24:35 -05:00
Anthony Minessale
7cc657e1eb FS-7665 #resolve 2015-06-16 11:55:00 -05:00