784 Commits

Author SHA1 Message Date
Seven Du
7764b4ea32 FS-7513: cleanup white spaces 2015-05-28 12:46:58 -05:00
Anthony Minessale
3e323e3b09 FS-7513: add auto layout advance based on group 2015-05-28 12:46:58 -05:00
Anthony Minessale
a56e65bace FS-7513: add flag to choose between encoding each frame and using central encoder per codec, add parsing for floor fields and reservation fields in layouts, add param to control bandwidth for consolidated codecs, add audio-position attr to images in layout to sync with virtual HRTF 2015-05-28 12:46:58 -05:00
Anthony Minessale
fa5d6af2cd FS-7513: refactor conference video muxing to create one distinct encoder per codec used and only create one encoded frame per distinct codec, store current image used by layer on the layer so it is not destroyed before the canvas is written, refactor and rearrange some functions 2015-05-28 12:46:57 -05:00
Seven Du
58a8d5daa6 FS-7513: remove extra memset since it's already garanteed in switch_core_alloc 2015-05-28 12:46:57 -05:00
Anthony Minessale
7400d73c93 FS-7513: refactor thread 2015-05-28 12:46:57 -05:00
Seven Du
74f4b1800b FS-7513: fix copy and paste error 2015-05-28 12:46:57 -05:00
Seven Du
4b1979a119 FS-7513: fix compiler warning about uninitialized var and make sure allocated memory is filled with 0 2015-05-28 12:46:57 -05:00
Anthony Minessale
a6dbc2c6f8 FS-7513: fix overlap 2015-05-28 12:46:57 -05:00
Anthony Minessale
8915516c13 FS-7513: here's a story....... of a lovely feature 2015-05-28 12:46:56 -05:00
Seven Du
7bdd80499d FS-7513: fix assert 2015-05-28 12:46:56 -05:00
Anthony Minessale
91c20769ed FS-7513: conf WIP 2015-05-28 12:46:56 -05:00
Anthony Minessale
260e277f36 FS-7513: conf WIP hard code 4x4 squares in 720p more to come 2015-05-28 12:46:56 -05:00
Seven Du
bc4e9704b8 FS-7513: refactor mcu code, put everyone on a canvas and send out using a dedicated thread with a constant FPS 2015-05-28 12:46:55 -05:00
Anthony Minessale
d87cfae0c9 FS-7513: more conf vid WIP 2015-05-28 12:46:55 -05:00
Anthony Minessale
387cbc9dda FS-7513: WIP CONF STUFF 2015-05-28 12:46:55 -05:00
Anthony Minessale
e79a24ed2b FS-7513: more floor stuff 2015-05-28 12:46:54 -05:00
Anthony Minessale
deca70c270 FS-7513: adjust floor change code 2015-05-28 12:46:54 -05:00
Anthony Minessale
d2bbd50791 FS-7513: tweak locking on video read callback 2015-05-28 12:46:54 -05:00
Anthony Minessale
d56a681f0a FS-7513: reduce complexity of video_bridge feature 2015-05-28 12:46:54 -05:00
Anthony Minessale
9e4eff192f FS-7513: fix vid floor logic 2015-05-28 12:46:54 -05:00
Anthony Minessale
d026624631 FS-7513: restore video relationships and refactor conference to use video_read callbacks instead of its own thread and change behavior so video floor holder never sees their own video unless they are the only one with video in the conference 2015-05-28 12:46:54 -05:00
Anthony Minessale
970064294c FS-7500: refactoring 2015-05-28 12:46:50 -05:00
Anthony Minessale
2ea12656ea FS-7500: improvement for conf vid 2015-05-28 12:46:49 -05:00
Anthony Minessale
01fda5748c FS-7500: another round of trying to make things work 2015-05-28 12:46:48 -05:00
Anthony Minessale
b90d24a05f FS-7513: fix video switching in conference 2015-05-28 12:46:48 -05:00
Anthony Minessale
79bc5bcda2 FS-7513: add video decode conference flag 2015-05-28 12:46:47 -05:00
Anthony Minessale
c584bf5511 FS-7500: reverse default for CF_VIDEO_ECHO to false and now it must be enabled when desired instead of disabled when not needed 2015-05-28 12:46:47 -05:00
Anthony Minessale
0cd5658caa FS-7500: another refactoring pass, temp code still in place, WORK IN PROGRESS 2015-05-28 12:46:44 -05:00
Seven Du
055de41484 FS-7513: let the core thread to read video if vid-floor in conference already locked-hold by someone else 2015-05-28 12:46:43 -05:00
William King
4fc94e3907 FS-7500 S-7513: Few build fixes 2015-05-28 12:46:43 -05:00
Seven Du
99ed41a4bd FS-7513: Example code to use the core video thread with a custom callback
It by default remains the default behaviour

However, you can setup a relationship between members to let the
member choose to see anyone else but the floor, e.g.:

  conference 3000 relate 1 2 sendvideo

In the above command member 2 will see member 1's video regardless
member 1 has video floor or not
2015-05-28 12:46:43 -05:00
Seven Du
422a1f0419 FS-7513: show relationships 2015-05-28 12:46:43 -05:00
Seven Du
48c1363476 FS-7513: force floor on member join 2015-05-28 12:46:43 -05:00
Seven Du
67334bea27 FS-7513: [mod_conference] video recording in conference
conference 3000 record /tmp/testrecord.fsv
call 9194 try to playback
mp4 should also work with the mp4 file format, will be available soon
2015-05-28 12:46:41 -05:00
Michael Jerris
b3cb89a1fb FS-7342: regression from FS-7230 957c8fc9. Don't destroy buffers we are currently using, only create them if they are not yet created 2015-03-04 11:35:08 -05:00
Brian West
957c8fc910 FS-7230 #comment try this #resolve 2015-02-20 12:41:48 -06:00
Brian West
3ad1628ff0 FS-7230 #resolve #comment please update 2015-02-18 09:21:00 -06:00
Anthony Minessale
5904bec1b6 FS-7236 refactor to fix audio problem from 7c6367052cc35c457cf6bcee49e473e744422d29 2015-02-12 16:44:55 -06:00
Mike Jerris
7c6367052c FS-7236: fix mutex use before init error caused by 27c8622 2015-02-09 11:23:58 -06:00
Michael Jerris
9e15c4e5b5 FS-7236: fix code before declaration 2015-02-05 12:45:14 -05:00
Anthony Minessale
27c8622eab FS-7236 #resolve 2015-02-05 16:53:07 -06:00
Simon Ditner
85b8631d62 Add conference member data to floor event
Between v1.2 and v1.4, member data was factored out. This makes it so
that one can not determine who the originator of a floor change event
is.

With this change, the meta data related to the conference member whom
initiated the floor change event is added to the event.

See FS-7136
2015-01-06 12:43:16 -05:00
Anthony Minessale
5ca609e637 factor channel count into flush len 2014-12-08 20:36:25 -06:00
Brian West
7c0da5cc40 FS-6957 fix regression 2014-11-17 10:36:03 -06:00
Anthony Minessale
0c68bb6d89 FS-6957 #resolve 2014-11-11 13:37:46 -06:00
Hristo Trendev
94278b5e54 allow enter and exit sounds to interrupt the MOH in a wait_mod conference
This patch does the following:
* only starts MOH if no other file (sync or async) is currently playing
* adds a variable "conference_permanent_wait_mod_moh" that controls the
  behavior of how the enter and exit sounds interact with the MOH when
  wait_mod is set. When the variable is set, the MOH keeps playing and
  the enter and exit sounds are mixed with the MOH. When the variable
  is unset, then any playing MOH is first stopped, then the enter or
  exit sound is played and the MOH is started again.

This functionality is useful in case the enter and exit sounds are
used to announce the name of the caller, who is joining or leaving a
conference.

FS-5159 #resolve
2014-11-06 19:32:17 +01:00
Mike Jerris
fbe81ff886 Merge pull request #69 in FS/freeswitch from ~HRISTO/freeswitch:conference-flags to master
* commit '3695bdd9e4e0d925ab7296d2f4ce120bf656f623':
  set conference flags from a dial plan variable or via +flags{ }
2014-11-05 16:25:40 -06:00
Anthony Minessale
8f3c157f12 FS-6957 #resolve 2014-11-03 11:32:40 -06:00
Anthony Minessale
30e793a7ef fix missing paren in logic for hard mute enter muted mode 2014-10-29 12:16:32 -05:00