diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-10-09 17:41:00 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2017-10-09 17:41:00 -0400 |
| commit | 84abc594553f78c12b24c6b08a08858514f87067 (patch) | |
| tree | e9532eed1c06f5027ce110ef2805d16168bc4eb7 | |
| parent | 936272ebc7811b082825f87d295a1c7024fa4abc (diff) | |
| download | sdl_android-84abc594553f78c12b24c6b08a08858514f87067.tar.gz | |
Fix incorrect video streaming capability logic
| -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/VideoStreamingParameters.java | 4 |
2 files changed, 8 insertions, 8 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 04456ab34..4b96a1755 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java +++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java @@ -6239,13 +6239,9 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> @Override
public void onCapabilityRetrieved(Object capability) {
VideoStreamingParameters params = new VideoStreamingParameters();
- List<VideoStreamingCapability> caps = SystemCapabilityManager.convertToList(capability, VideoStreamingCapability.class);
- if (caps != null && caps.size() > 0) {
- params.update(caps.get(0)); //Update our streaming parameters with the capabilities we retrieved
- }
- //Streaming parameters are ready time to stream
+ params.update((VideoStreamingCapability)capability); //Streaming parameters are ready time to stream
sdlSession.setDesiredVideoParams(params);
- manager.startVideoStreaming(remoteDisplay, parameters, encrypted);
+ manager.startVideoStreaming(remoteDisplay, params, encrypted);
}
@Override
@@ -6305,6 +6301,10 @@ public abstract class SdlProxyBase<proxyListenerType extends IProxyListenerBase> public void startVideoStreaming(Class<? extends SdlRemoteDisplay> remoteDisplayClass, VideoStreamingParameters parameters, boolean encrypted){
streamListener = startVideoStream(encrypted,parameters);
+ if(streamListener == null){
+ Log.e(TAG, "Error starting video service");
+ return;
+ }
this.remoteDisplayClass = remoteDisplayClass;
try {
encoder.init(context,streamListener,parameters);
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java index b35d2e8d9..a370421d0 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java +++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java @@ -70,8 +70,8 @@ public class VideoStreamingParameters { if(params.bitrate > 0){ this.bitrate = params.bitrate; } if(params.interval > 0){ this.interval = params.interval; } if(params.resolution !=null){ - if(params.resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight(params.resolution.getResolutionHeight()); } - if(params.resolution.getResolutionWidth() > 0){ this.resolution.setResolutionWidth(params.resolution.getResolutionWidth()); } + if(params.resolution.getResolutionHeight()!=null && params.resolution.getResolutionHeight() > 0){ this.resolution.setResolutionHeight(params.resolution.getResolutionHeight()); } + if(params.resolution.getResolutionWidth() !=null && params.resolution.getResolutionWidth() > 0){ this.resolution.setResolutionWidth(params.resolution.getResolutionWidth()); } } if(params.format != null){this.format = params.format;} } |