From e8d34ae8345a0f9873896db444607847a66e3cc5 Mon Sep 17 00:00:00 2001 From: Henigan Date: Fri, 30 Apr 2021 16:21:26 -0400 Subject: [PATCH] Make sure mOutputQueue capacity is never < 1 --- .../java/com/smartdevicelink/streaming/StreamPacketizer.java | 2 +- .../com/smartdevicelink/streaming/video/RTPH264Packetizer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java index 097afd089c..5bb682741d 100644 --- a/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java +++ b/android/sdl_android/src/main/java/com/smartdevicelink/streaming/StreamPacketizer.java @@ -86,7 +86,7 @@ public StreamPacketizer(IStreamListener streamListener, InputStream is, SessionT bufferSize = BUFF_READ_SIZE; buffer = new byte[bufferSize]; } - mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize); + mOutputQueue = new LinkedBlockingQueue<>(Math.max(MAX_QUEUE_SIZE / bufferSize, 1)); } public void start() throws IOException { diff --git a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java index ce8d900caf..4e46b36324 100644 --- a/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java +++ b/base/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java @@ -124,7 +124,7 @@ public RTPH264Packetizer(IStreamListener streamListener, bufferSize = MAX_DATA_SIZE_FOR_ENCRYPTED_SERVICE; } - mOutputQueue = new LinkedBlockingQueue<>(MAX_QUEUE_SIZE / bufferSize); + mOutputQueue = new LinkedBlockingQueue<>(Math.max(MAX_QUEUE_SIZE / bufferSize, 1)); mNALUnitReader = new NALUnitReader(); mPayloadType = DEFAULT_RTP_PAYLOAD_TYPE;