Scale Workaround for High Res Ford/Linc displays

Author: RHenigan

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java

@@ -950,6 +950,9 @@ public boolean removeOnRPCListener(FunctionID messageId, OnRPCListener listener)
 		@Override
 		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) { }
 
+		@Override
+		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse(){return null;}
+
 		@Override
 		public SdlMsgVersion getSdlMsgVersion(){
 			return null;

android/sdl_android/src/main/java/com/smartdevicelink/managers/SdlManager.java

@@ -866,6 +866,11 @@ public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCap
 			proxy.getCapability(systemCapabilityType, scListener);
 		}
 
+		@Override
+		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
+			return proxy.getRegisterAppInterfaceResponse();
+		}
+
 		@Override
 		public boolean isCapabilitySupported(SystemCapabilityType systemCapabilityType){
 			return proxy.isCapabilitySupported(systemCapabilityType);

android/sdl_android/src/main/java/com/smartdevicelink/managers/video/VideoStreamManager.java

@@ -95,6 +95,7 @@ public class VideoStreamManager extends BaseVideoStreamManager {
 	private IVideoStreamListener streamListener;
 	private boolean isTransportAvailable = false;
 	private boolean hasStarted;
+	private String vehicleMake;
 
 	// INTERNAL INTERFACES
 
@@ -176,10 +177,10 @@ public void onNotified(RPCNotification notification) {
 	};
 
 	// MANAGER APIs
-
 	public VideoStreamManager(ISdl internalInterface){
 		super(internalInterface);
 
+		vehicleMake = internalInterface.getRegisterAppInterfaceResponse().getVehicleType().getMake();
 		virtualDisplayEncoder = new VirtualDisplayEncoder();
 		hmiLevel = HMILevel.HMI_NONE;
 
@@ -218,7 +219,7 @@ private void getVideoStreamingParams(){
 				@Override
 				public void onCapabilityRetrieved(Object capability) {
 					VideoStreamingParameters params = new VideoStreamingParameters();
-					params.update((VideoStreamingCapability)capability);	//Streaming parameters are ready time to stream
+					params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
 					VideoStreamManager.this.parameters = params;
 
 					checkState();
@@ -270,7 +271,7 @@ public void startRemoteDisplayStream(Context context, Class<? extends SdlRemoteD
 					@Override
 					public void onCapabilityRetrieved(Object capability) {
 						VideoStreamingParameters params = new VideoStreamingParameters();
-						params.update((VideoStreamingCapability)capability);	//Streaming parameters are ready time to stream
+						params.update((VideoStreamingCapability)capability, vehicleMake);	//Streaming parameters are ready time to stream
 						startStreaming(params, encrypted);
 					}
 

android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java

@@ -444,6 +444,11 @@ public Object getCapability(SystemCapabilityType systemCapabilityType){
 			return SdlProxyBase.this.getCapability(systemCapabilityType);
 		}
 
+		@Override
+		public RegisterAppInterfaceResponse getRegisterAppInterfaceResponse() {
+			return SdlProxyBase.this.getRegisterAppInterfaceResponse();
+		}
+
 		@Override
 		public void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener) {
 			SdlProxyBase.this.getCapability(systemCapabilityType, scListener);

base/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java

@@ -6,6 +6,7 @@
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCMessage;
 import com.smartdevicelink.proxy.RPCRequest;
+import com.smartdevicelink.proxy.rpc.RegisterAppInterfaceResponse;
 import com.smartdevicelink.proxy.rpc.SdlMsgVersion;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
@@ -218,6 +219,12 @@ public interface ISdl {
      */
     void getCapability(SystemCapabilityType systemCapabilityType, OnSystemCapabilityListener scListener);
 
+    /**
+     * Get RegisterAppInterfaceResponse
+     * @return the RegisterAppInterfaceResponse if available, null if not
+     */
+    RegisterAppInterfaceResponse getRegisterAppInterfaceResponse();
+
     /**
      * Check if capability is supported
      * @param systemCapabilityType a system capability type that should be checked for support

base/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java

@@ -134,6 +134,48 @@ public void update(VideoStreamingParameters params){
      * @see com.smartdevicelink.proxy.SystemCapabilityManager
      * @see VideoStreamingCapability
      */
+    public void update(VideoStreamingCapability capability, String vehicleMake){
+        if(capability.getMaxBitrate()!=null){ this.bitrate = capability.getMaxBitrate() * 1000; } // NOTE: the unit of maxBitrate in getSystemCapability is kbps.
+        double scale = DEFAULT_SCALE;
+        if(capability.getScale() != null) { scale = capability.getScale(); }
+        ImageResolution resolution = capability.getPreferredResolution();
+        if(resolution!=null){
+
+            if((vehicleMake.contains("Ford") || vehicleMake.contains("Lincoln")) && ((resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 800) || (resolution.getResolutionWidth() !=null && resolution.getResolutionWidth() > 800))) {
+                scale = 1.0 / 0.75;
+            }
+
+            if(resolution.getResolutionHeight()!=null && resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight((int)(resolution.getResolutionHeight() / scale)); }
+            if(resolution.getResolutionWidth()!=null && resolution.getResolutionWidth() > 0){ this.resolution.setResolutionWidth((int)(resolution.getResolutionWidth() / scale)); }
+        }
+
+        // This should be the last call as it will return out once a suitable format is found
+        final List<VideoStreamingFormat> formats = capability.getSupportedFormats();
+        if(formats != null && formats.size()>0){
+            for(VideoStreamingFormat format : formats){
+                for(int i = 0; i < CURRENTLY_SUPPORTED_FORMATS.length; i ++){
+                    if(CURRENTLY_SUPPORTED_FORMATS[i].equals(format) ){
+                        this.format = format;
+                        return;
+                    }
+                }
+            }
+            DebugTool.logWarning("The VideoStreamingFormat has not been updated because none of the provided formats are supported.");
+
+            //TODO In the future we should set format to null, but might be a breaking change
+            // For now, format will remain whatever was set prior to this update
+        }
+
+    }
+
+    /**
+     * Update the values contained in the capability that should have been returned through the SystemCapabilityManager.
+     * This update will use the most preferred streaming format from the module.
+     * @param capability the video streaming capability returned from the SystemCapabilityManager
+     * @see com.smartdevicelink.proxy.SystemCapabilityManager
+     * @see VideoStreamingCapability
+     */
+    @Deprecated
     public void update(VideoStreamingCapability capability){
         if(capability.getMaxBitrate()!=null){ this.bitrate = capability.getMaxBitrate() * 1000; } // NOTE: the unit of maxBitrate in getSystemCapability is kbps.
         double scale = DEFAULT_SCALE;