fixes android

Author: Mgonand

src/android/com/dooble/phonertc/PhoneRTCPlugin.java

@@ -188,10 +188,10 @@ public void run() {
 					}
 
 					_videoParams = new WebView.LayoutParams(
-							_videoConfig.getContainer().getWidth() * _videoConfig.getDevicePixelRatio(),
-							_videoConfig.getContainer().getHeight() * _videoConfig.getDevicePixelRatio(),
-							_videoConfig.getContainer().getX() * _videoConfig.getDevicePixelRatio(),
-							_videoConfig.getContainer().getY() * _videoConfig.getDevicePixelRatio());
+							(int)(_videoConfig.getContainer().getWidth() * _videoConfig.getDevicePixelRatio()),
+							(int)(_videoConfig.getContainer().getHeight() * _videoConfig.getDevicePixelRatio()),
+							(int)(_videoConfig.getContainer().getX() * _videoConfig.getDevicePixelRatio()),
+							(int)(_videoConfig.getContainer().getY() * _videoConfig.getDevicePixelRatio()));
 
 					if (_videoView == null) {
 						// createVideoView();
@@ -340,8 +340,8 @@ public void removeRemoteVideoTrack(VideoTrack videoTrack) {
 
 	private void createVideoView() {
 		Point size = new Point();
-		size.set(_videoConfig.getContainer().getWidth() * _videoConfig.getDevicePixelRatio(),
-				_videoConfig.getContainer().getHeight() * _videoConfig.getDevicePixelRatio());
+		size.set((int)(_videoConfig.getContainer().getWidth() * _videoConfig.getDevicePixelRatio()),
+				(int)(_videoConfig.getContainer().getHeight() * _videoConfig.getDevicePixelRatio()));
 
 		_videoView = new VideoGLView(cordova.getActivity(), size);
 		VideoRendererGui.setView(_videoView, null);
@@ -395,16 +395,16 @@ private void refreshVideoView() {
 
                     int widthPercentage = videoSizeAsPercentage;
                     int heightPercentage = videoSizeAsPercentage;
-                    while((x + widthPercentage) > 100){
-                        widthPercentage--;
+                    if((x + widthPercentage) > 100){
+                        widthPercentage = widthPercentage - x;
                     }
-                    while((y + heightPercentage) > 100){
-                        heightPercentage--;
+                    if((y + heightPercentage) > 100){
+						heightPercentage = heightPercentage - y;
                     }
 
 					pair.setVideoRenderer(new VideoRenderer(
 							VideoRendererGui.create(x, y, widthPercentage, heightPercentage,
-									RendererCommon.ScalingType.SCALE_ASPECT_FILL, true)));
+									RendererCommon.ScalingType.SCALE_ASPECT_BALANCED, true)));
 
 					pair.getVideoTrack().addRenderer(pair.getVideoRenderer());
 

src/android/com/dooble/phonertc/VideoConfig.java

@@ -8,7 +8,7 @@ public class VideoConfig {
 
 	private VideoLayoutParams _container;
 	private VideoLayoutParams _local;
-	private int _devicePixelRatio;
+	private float _devicePixelRatio;
 
 	public VideoLayoutParams getContainer() {
 		return _container;
@@ -29,7 +29,7 @@ public void setLocal(VideoLayoutParams _local) {
 	public static VideoConfig fromJSON(JSONObject json) throws JSONException {
 		VideoConfig config = new VideoConfig();
 		config.setContainer(VideoLayoutParams.fromJSON(json.getJSONObject("containerParams")));
-		config.setDevicePixelRatio(json.getInt("devicePixelRatio"));
+		config.setDevicePixelRatio((float)json.getDouble("devicePixelRatio"));
 
 		if (json.has("local")) {
 			config.setLocal(VideoLayoutParams.fromJSON(json.getJSONObject("local")));
@@ -38,11 +38,11 @@ public static VideoConfig fromJSON(JSONObject json) throws JSONException {
 		return config;
 	}
 
-	public int getDevicePixelRatio() {
+	public float getDevicePixelRatio() {
 		return _devicePixelRatio;
 	}
 
-	public void setDevicePixelRatio(int _devicePixelRatio) {
+	public void setDevicePixelRatio(float _devicePixelRatio) {
 		this._devicePixelRatio = _devicePixelRatio;
 	}
 

www/phonertc.js

@@ -158,13 +158,13 @@ function getLayoutParams(videoElement) {
   if (cordova.platformId === 'android') {
     return {
       position: [boundingRect.left + window.scrollX, boundingRect.top + window.scrollY],
-      size: [videoElement.offsetWidth, videoElement.offsetHeight]
+      size: [boundingRect.width, boundingRect.height]
     };
   }
 
   return {
     position: [boundingRect.left, boundingRect.top],
-    size: [videoElement.offsetWidth, videoElement.offsetHeight]
+    size: [boundingRect.width, boundingRect.height]
   };
 }