Skip to content

Commit 4f4a27c

Browse files
author
Noel Algora
committed
libstreaming refactoring
1 parent dbf43d0 commit 4f4a27c

19 files changed

Lines changed: 77 additions & 77 deletions

‎app/src/main/java/d2d/testing/streaming/MediaStream.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import java.io.OutputStream;
2323
import java.net.InetAddress;
2424
import java.util.Random;
25-
import net.majorkernelpanic.streaming.audio.AudioStream;
26-
import net.majorkernelpanic.streaming.rtp.AbstractPacketizer;
27-
import net.majorkernelpanic.streaming.video.VideoStream;
25+
import d2d.testing.streaming.audio.AudioStream;
26+
import d2d.testing.streaming.rtp.AbstractPacketizer;
27+
import d2d.testing.streaming.video.VideoStream;
2828
import android.annotation.SuppressLint;
2929
import android.media.MediaCodec;
3030
import android.media.MediaRecorder;
@@ -246,8 +246,8 @@ public boolean isStreaming() {
246246

247247
/**
248248
* Configures the stream with the settings supplied with
249-
* {@link VideoStream#setVideoQuality(net.majorkernelpanic.streaming.video.VideoQuality)}
250-
* for a {@link VideoStream} and {@link AudioStream#setAudioQuality(net.majorkernelpanic.streaming.audio.AudioQuality)}
249+
* {@link VideoStream#setVideoQuality(d2d.testing.streaming.video.VideoQuality)}
250+
* for a {@link VideoStream} and {@link AudioStream#setAudioQuality(d2d.testing.streaming.audio.AudioQuality)}
251251
* for a {@link AudioStream}.
252252
*/
253253
public synchronized void configure() throws IllegalStateException, IOException {
@@ -315,7 +315,7 @@ public synchronized void stop() {
315315
public abstract String getSessionDescription();
316316

317317
/**
318-
* Returns the SSRC of the underlying {@link net.majorkernelpanic.streaming.rtp.RtpSocket}.
318+
* Returns the SSRC of the underlying {@link d2d.testing.streaming.rtp.RtpSocket}.
319319
* @return the SSRC of the stream
320320
*/
321321
public int getSSRC() {
@@ -326,7 +326,7 @@ protected void createSockets() throws IOException {
326326

327327
if (sPipeApi == PIPE_API_LS) {
328328

329-
final String LOCAL_ADDR = "net.majorkernelpanic.streaming-";
329+
final String LOCAL_ADDR = "d2d.testing.streaming-";
330330

331331
for (int i=0;i<10;i++) {
332332
try {

‎app/src/main/java/d2d/testing/streaming/Session.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
import java.net.InetAddress;
2323
import java.net.UnknownHostException;
2424
import java.util.concurrent.CountDownLatch;
25-
import net.majorkernelpanic.streaming.audio.AudioQuality;
26-
import net.majorkernelpanic.streaming.audio.AudioStream;
27-
import net.majorkernelpanic.streaming.exceptions.CameraInUseException;
28-
import net.majorkernelpanic.streaming.exceptions.ConfNotSupportedException;
29-
import net.majorkernelpanic.streaming.exceptions.InvalidSurfaceException;
30-
import net.majorkernelpanic.streaming.exceptions.StorageUnavailableException;
31-
import net.majorkernelpanic.streaming.gl.SurfaceView;
32-
import net.majorkernelpanic.streaming.rtsp.RtspClient;
33-
import net.majorkernelpanic.streaming.video.VideoQuality;
34-
import net.majorkernelpanic.streaming.video.VideoStream;
25+
import d2d.testing.streaming.audio.AudioQuality;
26+
import d2d.testing.streaming.audio.AudioStream;
27+
import d2d.testing.streaming.exceptions.CameraInUseException;
28+
import d2d.testing.streaming.exceptions.ConfNotSupportedException;
29+
import d2d.testing.streaming.exceptions.InvalidSurfaceException;
30+
import d2d.testing.streaming.exceptions.StorageUnavailableException;
31+
import d2d.testing.streaming.gl.SurfaceView;
32+
import d2d.testing.streaming.rtsp.RtspClient;
33+
import d2d.testing.streaming.video.VideoQuality;
34+
import d2d.testing.streaming.video.VideoStream;
3535
import android.hardware.Camera.CameraInfo;
3636
import android.os.Handler;
3737
import android.os.HandlerThread;
@@ -117,7 +117,7 @@ public class Session {
117117
public Session() {
118118
long uptime = System.currentTimeMillis();
119119

120-
HandlerThread thread = new HandlerThread("net.majorkernelpanic.streaming.Session");
120+
HandlerThread thread = new HandlerThread("d2d.testing.streaming.Session");
121121
thread.start();
122122

123123
mHandler = new Handler(thread.getLooper());

‎app/src/main/java/d2d/testing/streaming/SessionBuilder.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121
import java.io.IOException;
2222
import java.net.InetAddress;
23-
import net.majorkernelpanic.streaming.audio.AACStream;
24-
import net.majorkernelpanic.streaming.audio.AMRNBStream;
25-
import net.majorkernelpanic.streaming.audio.AudioQuality;
26-
import net.majorkernelpanic.streaming.audio.AudioStream;
27-
import net.majorkernelpanic.streaming.gl.SurfaceView;
28-
import net.majorkernelpanic.streaming.video.H263Stream;
29-
import net.majorkernelpanic.streaming.video.H264Stream;
30-
import net.majorkernelpanic.streaming.video.VideoQuality;
31-
import net.majorkernelpanic.streaming.video.VideoStream;
23+
import d2d.testing.streaming.audio.AACStream;
24+
import d2d.testing.streaming.audio.AMRNBStream;
25+
import d2d.testing.streaming.audio.AudioQuality;
26+
import d2d.testing.streaming.audio.AudioStream;
27+
import d2d.testing.streaming.gl.SurfaceView;
28+
import d2d.testing.streaming.video.H263Stream;
29+
import d2d.testing.streaming.video.H264Stream;
30+
import d2d.testing.streaming.video.VideoQuality;
31+
import d2d.testing.streaming.video.VideoStream;
3232
import android.content.Context;
3333
import android.hardware.Camera.CameraInfo;
3434
import android.preference.PreferenceManager;

‎app/src/main/java/d2d/testing/streaming/Stream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public interface Stream {
9595

9696

9797
/**
98-
* Returns the SSRC of the underlying {@link net.majorkernelpanic.streaming.rtp.RtpSocket}.
98+
* Returns the SSRC of the underlying {@link d2d.testing.streaming.rtp.RtpSocket}.
9999
* @return the SSRC of the stream.
100100
*/
101101
public int getSSRC();

‎app/src/main/java/d2d/testing/streaming/audio/AACStream.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
import java.lang.reflect.Field;
2525
import java.net.InetAddress;
2626
import java.nio.ByteBuffer;
27-
import net.majorkernelpanic.streaming.SessionBuilder;
28-
import net.majorkernelpanic.streaming.rtp.AACADTSPacketizer;
29-
import net.majorkernelpanic.streaming.rtp.AACLATMPacketizer;
30-
import net.majorkernelpanic.streaming.rtp.MediaCodecInputStream;
27+
import d2d.testing.streaming.SessionBuilder;
28+
import d2d.testing.streaming.rtp.AACADTSPacketizer;
29+
import d2d.testing.streaming.rtp.AACLATMPacketizer;
30+
import d2d.testing.streaming.rtp.MediaCodecInputStream;
3131
import android.annotation.SuppressLint;
3232
import android.content.SharedPreferences;
3333
import android.content.SharedPreferences.Editor;

‎app/src/main/java/d2d/testing/streaming/audio/AMRNBStream.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import java.io.IOException;
2222
import java.lang.reflect.Field;
23-
import net.majorkernelpanic.streaming.SessionBuilder;
24-
import net.majorkernelpanic.streaming.rtp.AMRNBPacketizer;
23+
import d2d.testing.streaming.SessionBuilder;
24+
import d2d.testing.streaming.rtp.AMRNBPacketizer;
2525
import android.media.MediaRecorder;
2626
import android.service.textservice.SpellCheckerService.Session;
2727

‎app/src/main/java/d2d/testing/streaming/audio/AudioStream.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424

25-
import net.majorkernelpanic.streaming.MediaStream;
25+
import d2d.testing.streaming.MediaStream;
2626
import android.media.MediaRecorder;
2727
import android.os.ParcelFileDescriptor;
2828
import android.util.Log;

‎app/src/main/java/d2d/testing/streaming/gl/SurfaceView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package d2d.testing.streaming.gl;
2020

2121
import java.util.concurrent.Semaphore;
22-
import net.majorkernelpanic.streaming.MediaStream;
23-
import net.majorkernelpanic.streaming.video.VideoStream;
22+
import d2d.testing.streaming.MediaStream;
23+
import d2d.testing.streaming.video.VideoStream;
2424
import android.content.Context;
2525
import android.graphics.SurfaceTexture;
2626
import android.graphics.SurfaceTexture.OnFrameAvailableListener;

‎app/src/main/java/d2d/testing/streaming/hw/EncoderDebugger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.io.PrintWriter;
2323
import java.io.StringWriter;
2424
import java.nio.ByteBuffer;
25-
import net.majorkernelpanic.streaming.hw.CodecManager.Codec;
25+
import d2d.testing.streaming.hw.CodecManager.Codec;
2626
import android.annotation.SuppressLint;
2727
import android.content.Context;
2828
import android.content.SharedPreferences;

‎app/src/main/java/d2d/testing/streaming/rtcp/SenderReport.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
package d2d.testing.streaming.rtcp;
2020

21-
import static net.majorkernelpanic.streaming.rtp.RtpSocket.TRANSPORT_TCP;
22-
import static net.majorkernelpanic.streaming.rtp.RtpSocket.TRANSPORT_UDP;
21+
import static d2d.testing.streaming.rtp.RtpSocket.TRANSPORT_TCP;
22+
import static d2d.testing.streaming.rtp.RtpSocket.TRANSPORT_UDP;
2323
import java.io.IOException;
2424
import java.io.OutputStream;
2525
import java.net.DatagramPacket;

0 commit comments

Comments
 (0)