You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/02/16 06:11:58 UTC
svn commit: r1783172 - in
/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf:
commonVideoViewContentSWF10.lzx video/editRecordStreamSWF10.lzx
Author: solomax
Date: Thu Feb 16 06:11:57 2017
New Revision: 1783172
URL: http://svn.apache.org/viewvc?rev=1783172&view=rev
Log:
[OPENMEETINGS-1557] camera resolution works as expected
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1783172&r1=1783171&r2=1783172&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx Thu Feb 16 06:11:57 2017
@@ -661,7 +661,7 @@
]]>
</method>
- <method name="getCam" args="valCam, videoview">
+ <method name="getCam" args="valCam, width, height">
<![CDATA[
if ($debug) Debug.write("Entering getCam ...", valCam);
if (valCam == null) {
@@ -669,17 +669,17 @@
}
var _camera = Camera.getCamera(valCam);
if (_camera != null) {
- if ($debug) Debug.write("videoview: ", videoview);
+ if ($debug) Debug.write("size: ", width, height);
if ($debug) Debug.write("_camera.setQuality BEST: ", canvas.isInterview, (canvas.bandwidthNeededBest * 2), canvas.camQualityBest);
if (canvas.isInterview) {
//we need a fixed frame rate for the videos to merge them later on
- _camera.setMode(videoview.width, videoview.height, 24, true);
+ _camera.setMode(320, 260, 24, true); //FIXME TODO hardcoded in different places
if ($debug) Debug.warn("IS INTERVIEW ");
_camera.setQuality(0, 98);
} else {
- if ($debug) Debug.write("_camera.setMode: ", videoview.width, videoview.height, canvas.framesPerSecond, true);
- _camera.setMode(videoview.width, videoview.height, canvas.framesPerSecond, true);
+ if ($debug) Debug.write("_camera.setMode: ", width, height, canvas.framesPerSecond, true);
+ _camera.setMode(width, height, canvas.framesPerSecond, true);
if ($debug) Debug.warn("IS NO INTERVIEW ");
_camera.setQuality(canvas.bandwidthNeededBest, canvas.camQualityBest);
}
@@ -791,7 +791,7 @@
if ($debug) Debug.write("videoWindow: ", videoWindow);
videoWindow.setAttribute('isremote', false);
var _micro = getMic(getAvSetting('mic', g, 0));
- var _camera = getCam(getAvSetting('cam', g, 0), videoview);
+ var _camera = getCam(getAvSetting('cam', g, 0), canvas.currentClient.VWidth, canvas.currentClient.VHeight);
if ($debug) Debug.write("startAvBroadcast", _camera, _micro, settings, videoview);
if ($debug) Debug.write("BroadcastId: ", canvas.currentClient.broadCastID);
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1783172&r1=1783171&r2=1783172&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Thu Feb 16 06:11:57 2017
@@ -252,7 +252,7 @@
//stop will not call clear as there is no NetStream
videoview._stop();
videoview.clear();
- var _camera = canvas.commonVideoViewContent.getCam(availableCams.getValue(), videoview);
+ var _camera = canvas.commonVideoViewContent.getCam(availableCams.getValue(), cam_default_width, cam_default_height);
if (_camera != null) {
videoview.attachCamera(_camera);
}