Refactor streaming classes into more defined packages

12 files changed, 27 insertions, 31 deletions

diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
index 702b83cad..8d2ef8d20 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/SystemCapabilityManagerTests.java
@@ -12,7 +12,6 @@ import com.smartdevicelink.proxy.interfaces.OnSystemCapabilityListener;
 import com.smartdevicelink.proxy.rpc.AudioPassThruCapabilities;
 import com.smartdevicelink.proxy.rpc.ButtonCapabilities;
 import com.smartdevicelink.proxy.rpc.DisplayCapabilities;
-import com.smartdevicelink.proxy.rpc.GetSystemCapability;
 import com.smartdevicelink.proxy.rpc.GetSystemCapabilityResponse;
 import com.smartdevicelink.proxy.rpc.HMICapabilities;
 import com.smartdevicelink.proxy.rpc.PresetBankCapabilities;
@@ -24,17 +23,13 @@ import com.smartdevicelink.proxy.rpc.enums.HmiZoneCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
-import com.smartdevicelink.streaming.VideoStreamingParameters;
+import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 import com.smartdevicelink.test.Test;
 import com.smartdevicelink.test.Validator;
 import com.smartdevicelink.util.CorrelationIdGenerator;
 
 import java.util.List;
 
-import static android.R.id.list;
-import static android.R.id.message;
-import static com.smartdevicelink.proxy.constants.Names.parameters;
-
 public class SystemCapabilityManagerTests extends AndroidTestCase {
 	public static final String TAG = "SystemCapabilityManagerTests";
 	public static SystemCapabilityManager systemCapabilityManager;
diff --git a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/RTPH264PacketizerTest.java b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/RTPH264PacketizerTest.java
index 70274444c..6d169809a 100644
--- a/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/RTPH264PacketizerTest.java
+++ b/sdl_android/src/androidTest/java/com/smartdevicelink/test/streaming/RTPH264PacketizerTest.java
@@ -35,7 +35,7 @@ import com.smartdevicelink.protocol.ProtocolMessage;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.streaming.IStreamListener;
-import com.smartdevicelink.streaming.RTPH264Packetizer;
+import com.smartdevicelink.streaming.video.RTPH264Packetizer;
 import com.smartdevicelink.transport.BTTransportConfig;
 
 import junit.framework.TestCase;
@@ -46,7 +46,7 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 /**
- * This class includes a unit test for {@link com.smartdevicelink.streaming.RTPH264Packetizer}.
+ * This class includes a unit test for {@link RTPH264Packetizer}.
  *
  * @author Sho Amano
  */
@@ -309,7 +309,7 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#setPayloadType(byte)}
+	 * Test for {@link RTPH264Packetizer#setPayloadType(byte)}
 	 */
 	public void testSetPayloadType() {
 		byte pt = (byte)123;
@@ -340,7 +340,7 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#setSSRC(int)}
+	 * Test for {@link RTPH264Packetizer#setSSRC(int)}
 	 */
 	public void testSetSSRC() {
 		int ssrc = 0xFEDCBA98;
@@ -372,8 +372,8 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#pause()} and
-	 * {@link com.smartdevicelink.streaming.RTPH264Packetizer#resume()}
+	 * Test for {@link RTPH264Packetizer#pause()} and
+	 * {@link RTPH264Packetizer#resume()}
 	 */
 	public void testPauseResume() {
 		int index = 0;
@@ -443,7 +443,7 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#sendFrame(byte[], int, int, long)}
+	 * Test for {@link RTPH264Packetizer#sendFrame(byte[], int, int, long)}
 	 */
 	public void testSendFrameInterfaceWithArray() {
 		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
@@ -472,7 +472,7 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#sendFrame(ByteBuffer, long)}
+	 * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
 	 */
 	public void testSendFrameInterfaceWithByteBuffer() {
 		StreamVerifier verifier = new StreamVerifier(SAMPLE_STREAM);
@@ -501,7 +501,7 @@ public class RTPH264PacketizerTest extends TestCase {
 	}
 
 	/**
-	 * Test for {@link com.smartdevicelink.streaming.RTPH264Packetizer#sendFrame(ByteBuffer, long)}
+	 * Test for {@link RTPH264Packetizer#sendFrame(ByteBuffer, long)}
 	 * with direct ByteBuffer
 	 */
 	public void testSendFrameInterfaceWithDirectByteBuffer() {
diff --git a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
index f4a9fb97f..20bcc0cc8 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/SdlConnection/SdlSession.java
@@ -16,6 +16,7 @@ import android.util.Log;
 import android.view.Surface;

 

 import com.smartdevicelink.encoder.SdlEncoder;

+import com.smartdevicelink.encoder.VirtualDisplayEncoder;

 import com.smartdevicelink.exception.SdlException;

 import com.smartdevicelink.protocol.ProtocolMessage;

 import com.smartdevicelink.protocol.enums.SessionType;

@@ -32,10 +33,10 @@ import com.smartdevicelink.security.ISecurityInitializedListener;
 import com.smartdevicelink.security.SdlSecurityBase;

 import com.smartdevicelink.streaming.AbstractPacketizer;

 import com.smartdevicelink.streaming.IStreamListener;

-import com.smartdevicelink.streaming.RTPH264Packetizer;

+import com.smartdevicelink.streaming.video.RTPH264Packetizer;

 import com.smartdevicelink.streaming.StreamPacketizer;

 import com.smartdevicelink.streaming.StreamRPCPacketizer;

-import com.smartdevicelink.streaming.VideoStreamingParameters;

+import com.smartdevicelink.streaming.video.VideoStreamingParameters;

 import com.smartdevicelink.transport.BaseTransportConfig;

 import com.smartdevicelink.transport.MultiplexTransport;

 import com.smartdevicelink.transport.enums.TransportType;

@@ -58,6 +59,7 @@ public class SdlSession implements ISdlConnectionListener, IHeartbeatMonitorList
 	AbstractPacketizer mVideoPacketizer = null;

 	StreamPacketizer mAudioPacketizer = null;

 	SdlEncoder mSdlEncoder = null;

+	VirtualDisplayEncoder virtualDisplayEncoder = null;

 	private final static int BUFF_READ_SIZE = 1024;

     private int sessionHashId = 0;

 	private HashMap<SessionType, CopyOnWriteArrayList<ISdlServiceListener>> serviceListeners;

diff --git a/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java b/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
index 4df5aedf7..619e2d54d 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/encoder/VirtualDisplayEncoder.java
@@ -13,7 +13,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.SystemClock;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Display;
 import android.view.MotionEvent;
@@ -29,7 +28,7 @@ import com.smartdevicelink.proxy.rpc.TouchCoord;
 import com.smartdevicelink.proxy.rpc.TouchEvent;
 import com.smartdevicelink.proxy.rpc.VideoStreamingFormat;
 import com.smartdevicelink.proxy.rpc.enums.TouchType;
-import com.smartdevicelink.streaming.VideoStreamingParameters;
+import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -39,8 +38,6 @@ import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 
-import static android.R.attr.format;
-
 @TargetApi(21)
 public class VirtualDisplayEncoder {
     private static final String TAG = "VirtualDisplayEncoder";
diff --git a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
index d79dbe27f..72482d47e 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/protocol/WiProProtocol.java
@@ -14,7 +14,7 @@ import com.smartdevicelink.proxy.rpc.VideoStreamingFormat;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec;

 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol;

 import com.smartdevicelink.security.SdlSecurityBase;

-import com.smartdevicelink.streaming.VideoStreamingParameters;

+import com.smartdevicelink.streaming.video.VideoStreamingParameters;

 import com.smartdevicelink.util.BitConverter;

 import com.smartdevicelink.util.DebugTool;

 import com.smartdevicelink.util.Version;

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 8614791d0..3c59257f3 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
@@ -93,10 +93,10 @@ import com.smartdevicelink.proxy.rpc.listeners.OnPutFileUpdateListener;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;

 import com.smartdevicelink.proxy.rpc.listeners.OnRPCResponseListener;

 import com.smartdevicelink.security.SdlSecurityBase;

-import com.smartdevicelink.streaming.AudioStreamingCodec;

-import com.smartdevicelink.streaming.AudioStreamingParams;

+import com.smartdevicelink.streaming.audio.AudioStreamingCodec;

+import com.smartdevicelink.streaming.audio.AudioStreamingParams;

 import com.smartdevicelink.streaming.StreamRPCPacketizer;

-import com.smartdevicelink.streaming.VideoStreamingParameters;

+import com.smartdevicelink.streaming.video.VideoStreamingParameters;

 import com.smartdevicelink.trace.SdlTrace;

 import com.smartdevicelink.trace.TraceDeviceInfo;

 import com.smartdevicelink.trace.enums.InterfaceActivityDirection;

diff --git a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
index 2d67f93d7..9177a146b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/proxy/interfaces/ISdl.java
@@ -4,7 +4,7 @@ import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.RPCRequest;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
-import com.smartdevicelink.streaming.VideoStreamingParameters;
+import com.smartdevicelink.streaming.video.VideoStreamingParameters;
 
 /*
  * Copyright (c) 2017 Livio, Inc.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingCodec.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java
index 8e8cb3857..bf69a792b 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingCodec.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingCodec.java
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.smartdevicelink.streaming;
+package com.smartdevicelink.streaming.audio;
 
 /**
  * Enum for each type of audio streaming codec.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingLPCMParams.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java
index 551a1f032..bde6abc4c 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingLPCMParams.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingLPCMParams.java
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.smartdevicelink.streaming;
+package com.smartdevicelink.streaming.audio;
 
 /**
  * A struct to hold LPCM specific audio format information.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingParams.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
index cd95ed95a..fe0f7a981 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/AudioStreamingParams.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/audio/AudioStreamingParams.java
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.smartdevicelink.streaming;
+package com.smartdevicelink.streaming.audio;
 
 /**
  * A struct to hold audio format information that are common to codecs.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/RTPH264Packetizer.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
index 2a7646579..6946d1fbb 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/RTPH264Packetizer.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/RTPH264Packetizer.java
@@ -28,7 +28,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.smartdevicelink.streaming;
+package com.smartdevicelink.streaming.video;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -44,6 +44,8 @@ import com.smartdevicelink.protocol.enums.SessionType;
 import com.smartdevicelink.proxy.interfaces.IVideoStreamListener;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingCodec;
 import com.smartdevicelink.proxy.rpc.enums.VideoStreamingProtocol;
+import com.smartdevicelink.streaming.AbstractPacketizer;
+import com.smartdevicelink.streaming.IStreamListener;
 
 /*
  * Note for testing.
diff --git a/sdl_android/src/main/java/com/smartdevicelink/streaming/VideoStreamingParameters.java b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
index cac4ebbb8..d2e6754ca 100644
--- a/sdl_android/src/main/java/com/smartdevicelink/streaming/VideoStreamingParameters.java
+++ b/sdl_android/src/main/java/com/smartdevicelink/streaming/video/VideoStreamingParameters.java
@@ -1,4 +1,4 @@
-package com.smartdevicelink.streaming;
+package com.smartdevicelink.streaming.video;
 
 import android.content.Intent;
 import android.util.DisplayMetrics;