Repository: openmeetings Updated Branches: refs/heads/master 8ecd1353b -> 90a07234b
[OPENMEETINGS-1785] audio in room is fixed, test recording is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/90a07234 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/90a07234 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/90a07234 Branch: refs/heads/master Commit: 90a07234b989256050680ddda84334d5b3e7333e Parents: 8ecd135 Author: Maxim Solodovnik <[email protected]> Authored: Wed Dec 27 10:30:10 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Dec 27 10:30:33 2017 +0700 ---------------------------------------------------------------------- .../flex/org/apache/openmeetings/OmVideo.as | 58 ++++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/90a07234/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as ---------------------------------------------------------------------- diff --git a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as index 3ba4ec1..14d8b0d 100644 --- a/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as +++ b/openmeetings-flash/src/main/flex/org/apache/openmeetings/OmVideo.as @@ -189,37 +189,35 @@ public class OmVideo { if (ns !== null){ reset(); } - nc.call("resize", new Responder(function ():void { - this.mode = _mode; - this.mic = _mic; - createStream(); + this.mode = _mode; + this.mic = _mic; + createStream(); - ns.publish(name, (mode === BROADCAST) ? LIVE : mode); - ns.attachCamera(cam); - attachCamera(cam); - if (cam !== null) { - var videoStreamSettings:VideoStreamSettings = null; - debug("codec = " + params.videoCodec); - if (params.videoCodec === CODEC_H264) { - var vss:H264VideoStreamSettings = new H264VideoStreamSettings(); - vss.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_5_1); - videoStreamSettings = vss; - } else { - videoStreamSettings = new VideoStreamSettings(); - } - videoStreamSettings.setQuality(cam.bandwidth, cam.quality); - videoStreamSettings.setKeyFrameInterval(cam.keyFrameInterval); - debug("::camera settings ", cam.keyFrameInterval, cam.width, cam.height, cam.fps); - videoStreamSettings.setMode(cam.width, cam.height, cam.fps); - ns.videoStreamSettings = videoStreamSettings; + ns.publish(name, (mode === BROADCAST) ? LIVE : mode); + ns.attachCamera(cam); + attachCamera(cam); + if (cam !== null) { + var videoStreamSettings:VideoStreamSettings = null; + debug("codec = " + params.videoCodec); + if (params.videoCodec === CODEC_H264) { + var vss:H264VideoStreamSettings = new H264VideoStreamSettings(); + vss.setProfileLevel(H264Profile.BASELINE, H264Level.LEVEL_5_1); + videoStreamSettings = vss; + } else { + videoStreamSettings = new VideoStreamSettings(); } - ns.attachAudio(mic); - _setVolume(volume); + videoStreamSettings.setQuality(cam.bandwidth, cam.quality); + videoStreamSettings.setKeyFrameInterval(cam.keyFrameInterval); + debug("::camera settings ", cam.keyFrameInterval, cam.width, cam.height, cam.fps); + videoStreamSettings.setMode(cam.width, cam.height, cam.fps); + ns.videoStreamSettings = videoStreamSettings; + } + ns.attachAudio(mic); + _setVolume(volume); - if (f !== null) { - f.call(); - } - }), cam === null ? 0 : cam.width, cam === null ? 0 : cam.height); + if (f !== null) { + f.call(); + } } private function _connect(_url:String, callback:Function):void { @@ -305,7 +303,9 @@ public class OmVideo { public function broadcast(name:String, cam:Camera, _mic:Microphone):void { connect(function():void { - _publish(BROADCAST, name, cam, _mic, null); + nc.call("resize", new Responder(function ():void { + _publish(BROADCAST, name, cam, _mic, null); + }), cam === null ? 0 : cam.width, cam === null ? 0 : cam.height); }); }
