Fix warnings in encoder

3 files changed, 9 insertions, 9 deletions

diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
index 8f3001294..5fd3f417d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/EncoderUtils.java
@@ -87,14 +87,18 @@ public final class EncoderUtils {
         }
 
         ByteBuffer sps = format.getByteBuffer("csd-0");
-        int spsLen = sps.remaining();
+        int spsLen = sps != null ? sps.remaining() : 0;
         ByteBuffer pps = format.getByteBuffer("csd-1");
-        int ppsLen = pps.remaining();
+        int ppsLen = pps != null ? pps.remaining() : 0;
 
         byte[] output = new byte[spsLen + ppsLen];
         try {
-            sps.get(output, 0, spsLen);
-            pps.get(output, spsLen, ppsLen);
+            if (sps != null) {
+                sps.get(output, 0, spsLen);
+            }
+            if (pps != null) {
+                pps.get(output, spsLen, ppsLen);
+            }
         } catch (Exception e) {
             // should not happen
             DebugTool.logWarning(TAG, "Error while copying H264 codec specific data: " + e);
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
index 7172b0225..968662b79 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/SdlEncoder.java
@@ -214,7 +214,7 @@ public class SdlEncoder {
 
 				if (mBufferInfo.size != 0) {
 					ByteBuffer encoderOutputBuffer = encoderOutputBuffers[encoderStatus];
-					byte[] dataToWrite = null;
+					byte[] dataToWrite;
 					int dataOffset = 0;
 
 					// append SPS and PPS in front of every IDR NAL unit
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index 766e10aaa..bd9d4913d 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -101,17 +101,14 @@ public class VirtualDisplayEncoder {
         initPassed = true;
     }
 
-    @SuppressWarnings("unused")
     public VideoStreamingParameters getStreamingParams(){
         return this.streamingParams;
     }
 
-    @SuppressWarnings("unused")
     public void setStreamingParams(int displayDensity, ImageResolution resolution, int frameRate, int bitrate, int interval, VideoStreamingFormat format) {
         this.streamingParams = new VideoStreamingParameters(displayDensity, frameRate, bitrate, interval, resolution, format);
     }
 
-    @SuppressWarnings("unused")
     public void setStreamingParams(VideoStreamingParameters streamingParams) {
         this.streamingParams = streamingParams;
     }
@@ -321,7 +318,6 @@ public class VirtualDisplayEncoder {
             }
         }
 
-        @SuppressWarnings("deprecation")
         void drainEncoder(boolean endOfStream) {
             if (mVideoEncoder == null || mOutputListener == null) {
                 return;