Merge pull request #1480 from smartdevicelink/bugfix/issue_1398

Fix Issue 1398 - Avoid deadlock from using blocking queues

Author: JulianKast

android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java

@@ -104,6 +104,8 @@ public void stop() {
 			t = null;
 		}
 
+		mOutputQueue.clear();
+
 	}
 
 	public void run() {
@@ -252,6 +254,10 @@ private void sendArrayData(byte[] data, int offset, int length)
 			throw new ArrayIndexOutOfBoundsException();
 		}
 
+		if (data == null || t == null || t.isInterrupted()) {
+			return;
+		}
+
 		// StreamPacketizer does not need to split a video frame into NAL units
 		ByteBuffer buffer = ByteBuffer.allocate(length);
 		buffer.put(data, offset, length);
@@ -265,7 +271,7 @@ private void sendArrayData(byte[] data, int offset, int length)
 	}
 
 	private void sendByteBufferData(ByteBuffer data, CompletionListener completionListener) {
-		if (data == null || data.remaining() == 0) {
+		if (data == null || data.remaining() == 0 || t == null || t.isInterrupted()) {
 			return;
 		}
 

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

@@ -37,6 +37,7 @@
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.streaming.AbstractPacketizer;
 import com.smartdevicelink.streaming.IStreamListener;
+import com.smartdevicelink.util.DebugTool;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -64,6 +65,8 @@
 @RestrictTo(RestrictTo.Scope.LIBRARY)
 public class RTPH264Packetizer extends AbstractPacketizer implements IVideoStreamListener, Runnable {
 
+	private static final String TAG = "RTPH264Packetizer";
+
 	// Approximate size of data that mOutputQueue can hold in bytes.
 	// By adding a buffer, we accept underlying transport being stuck for a short time. By setting
 	// a limit of the buffer size, we avoid buffer overflows when underlying transport is too slow.
@@ -172,6 +175,10 @@ public void start() throws IOException {
 			return;
 		}
 
+		if(mOutputQueue != null){
+			mOutputQueue.clear();
+		}
+
 		mThread = new Thread(this);
 		mThread.start();
 	}
@@ -295,13 +302,18 @@ private void onEncoderOutput(NALUnitReader nalUnitReader, long ptsInUs) {
 	}
 
 	private boolean outputRTPFrames(ByteBuffer nalUnit, long ptsInUs, boolean isLast) {
+		if((mThread == null || mThread.isInterrupted())) {
+			DebugTool.logError(TAG, "Dropping potential buffer because consumer thread is not alive");
+			return false;
+		}
+
 		if (RTP_HEADER_LEN + nalUnit.remaining() > MAX_RTP_PACKET_SIZE) {
 			// Split into multiple Fragmentation Units ([5.8] in RFC 6184)
 			byte firstByte = nalUnit.get();
 			boolean firstFragment = true;
 			boolean lastFragment = false;
 
-			while (nalUnit.remaining() > 0) {
+			while (nalUnit.remaining() > 0 && mThread != null && !mThread.isInterrupted()) {
 				int payloadLength = MAX_RTP_PACKET_SIZE - (RTP_HEADER_LEN + FU_INDICATOR_LEN + FU_HEADER_LEN);
 				if (nalUnit.remaining() <= payloadLength) {
 					payloadLength = nalUnit.remaining();