From a62a5235cba30cdd413a97210f0fa87db866a3de Mon Sep 17 00:00:00 2001 From: Faisal Hameed Date: Fri, 18 Mar 2016 01:16:53 +0500 Subject: [PATCH] Fixing squid:S1197, squid:S1319 --- src/net/majorkernelpanic/streaming/rtcp/SenderReport.java | 2 +- src/net/majorkernelpanic/streaming/rtp/RtpSocket.java | 2 +- src/net/majorkernelpanic/streaming/rtsp/RtspClient.java | 3 ++- src/net/majorkernelpanic/streaming/rtsp/RtspServer.java | 3 ++- src/net/majorkernelpanic/streaming/video/VideoStream.java | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java b/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java index 7f91be04..5aed2127 100644 --- a/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java +++ b/src/net/majorkernelpanic/streaming/rtcp/SenderReport.java @@ -51,7 +51,7 @@ public class SenderReport { private int mSSRC, mPort = -1; private int mOctetCount = 0, mPacketCount = 0; private long interval, delta, now, oldnow; - private byte mTcpHeader[]; + private byte[] mTcpHeader; public SenderReport(int ssrc) throws IOException { super(); diff --git a/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java b/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java index 9ae91e95..ab463953 100644 --- a/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java +++ b/src/net/majorkernelpanic/streaming/rtp/RtpSocket.java @@ -68,7 +68,7 @@ public class RtpSocket implements Runnable { private int mSsrc, mSeq = 0, mPort = -1; private int mBufferCount, mBufferIn, mBufferOut; private int mCount = 0; - private byte mTcpHeader[]; + private byte[] mTcpHeader; protected OutputStream mOutputStream = null; private AverageBitrate mAverageBitrate; diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java b/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java index cf745fb5..dad6346b 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java +++ b/src/net/majorkernelpanic/streaming/rtsp/RtspClient.java @@ -32,6 +32,7 @@ import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Locale; +import java.util.Map; import java.util.concurrent.Semaphore; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -585,7 +586,7 @@ static class Response { public int status; - public HashMap headers = new HashMap(); + public Map headers = new HashMap<>(); /** Parse the method, URI & headers of a RTSP request */ public static Response parseResponse(BufferedReader input) throws IOException, IllegalStateException, SocketException { diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java index 8d0dab10..ce574846 100644 --- a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java +++ b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java @@ -32,6 +32,7 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.Locale; +import java.util.Map; import java.util.WeakHashMap; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -624,7 +625,7 @@ static class Request { public String method; public String uri; - public HashMap headers = new HashMap(); + public Map headers = new HashMap(); /** Parse the method, uri & headers of a RTSP request */ public static Request parseRequest(BufferedReader input) throws IOException, IllegalStateException, SocketException { diff --git a/src/net/majorkernelpanic/streaming/video/VideoStream.java b/src/net/majorkernelpanic/streaming/video/VideoStream.java index 17f1333e..6f91beb9 100644 --- a/src/net/majorkernelpanic/streaming/video/VideoStream.java +++ b/src/net/majorkernelpanic/streaming/video/VideoStream.java @@ -382,7 +382,7 @@ protected void encodeWithMediaRecorder() throws IOException, ConfNotSupportedExc // This will skip the MPEG4 header if this step fails we can't stream anything :( try { - byte buffer[] = new byte[4]; + byte[] buffer = new byte[4]; // Skip all atoms preceding mdat atom while (!Thread.interrupted()) { while (is.read() != 'm');