diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-10-10 12:03:53 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2017-10-10 12:03:53 -0400 |
| commit | 19b02e309632579f8d55cf8bf08ae2c161e2df86 (patch) | |
| tree | a8d9e1d687411c27a50850f6aeee4a25312069d4 | |
| parent | 84abc594553f78c12b24c6b08a08858514f87067 (diff) | |
| download | sdl_android-19b02e309632579f8d55cf8bf08ae2c161e2df86.tar.gz | |
SdlProxyBase and SdlRemoteDisplay cleanup
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java | 12 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java | 7 |
2 files changed, 13 insertions, 6 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java index 4b96a1755..d49030c6d 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6227,11 +6227,14 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> VideoStreamingManager manager;
public void startRemoteDisplayStream(Context context, final Class<? extends SdlRemoteDisplay> remoteDisplay, final VideoStreamingParameters parameters, final boolean encrypted){
- if(getWiProVersion() > 4 && !_systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)){
+ if(getWiProVersion() >= 5 && !_systemCapabilityManager.isCapabilitySupported(SystemCapabilityType.VIDEO_STREAMING)){
Log.e(TAG, "Video streaming not supported on this module");
+ return;
}
//Create streaming manager
- manager = new VideoStreamingManager(context,this._internalInterface);
+ if(manager == null){
+ manager = new VideoStreamingManager(context,this._internalInterface);
+ }
if(parameters == null){
if(getWiProVersion() >= 5) {
@@ -6260,7 +6263,6 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> sdlSession.setDesiredVideoParams(parameters);
manager.startVideoStreaming(remoteDisplay,parameters, encrypted);
}
- //Start service w/params
}
public void stopRemoteDisplayStream(){
@@ -6270,7 +6272,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> }
@TargetApi(21)
- private class VideoStreamingManager implements ISdlServiceListener{
+ private class VideoStreamingManager implements ISdlServiceListener{ //THis should move out of the SdlProxyBase and into the SdlSession once we are able to make it public
Context context;
ISdl internalInterface;
volatile VirtualDisplayEncoder encoder;
@@ -6319,7 +6321,7 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void stopStreaming(){
if(remoteDisplay!=null){
- remoteDisplay.dismiss();
+ remoteDisplay.stop();
}
if(encoder!=null){
encoder.shutDown();
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java index 509f67599..f4e2a315a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java +++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/SdlRemoteDisplay.java @@ -22,7 +22,7 @@ import java.util.concurrent.Callable; @TargetApi(21) public class SdlRemoteDisplay extends Presentation { private static final String TAG = "SdlRemoteDisplay"; - private static final int REFRESH_RATE_MS = 100; + private static final int REFRESH_RATE_MS = 50; protected Window w; protected View mainView; @@ -80,6 +80,11 @@ public class SdlRemoteDisplay extends Presentation { }); } + public void stop(){ + stopRefreshTask(); + dismissPresentation(); + } + public void dismissPresentation() { uiHandler.post(new Runnable() { @Override |