Skip to content

Commit 107c844

Browse files
ivangulykivangulyk
committed
Refactor sessions
1 parent 349477d commit 107c844

17 files changed

Lines changed: 45 additions & 77 deletions

‎app/src/main/java/d2d/testing/MainActivity.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import android.content.res.ColorStateList;
1010
import android.net.Uri;
1111
import android.hardware.Camera;
12-
import android.net.wifi.WifiManager;
1312
import android.net.wifi.p2p.WifiP2pDevice;
1413
import android.net.wifi.p2p.WifiP2pManager;
1514
import android.os.Bundle;
@@ -18,7 +17,6 @@
1817
import android.support.v4.app.ActivityCompat;
1918
import android.support.v4.view.ViewPager;
2019
import android.support.v7.app.AppCompatActivity;
21-
import android.text.format.Formatter;
2220
import android.view.Menu;
2321
import android.view.MenuInflater;
2422
import android.view.MenuItem;
@@ -441,12 +439,6 @@ public void openViewStreamActivity(String ip) {
441439
this.startActivity(streamActivityIntent);
442440
}
443441

444-
public String getMyIpAddress(){
445-
WifiManager wm = (WifiManager) getApplicationContext().getSystemService(WIFI_SERVICE);
446-
String ip = Formatter.formatIpAddress(wm.getConnectionInfo().getIpAddress());
447-
return ip;
448-
}
449-
450442
public void setDefaultP2PIp(final String ip){
451443
runOnUiThread(new Runnable() {
452444
public void run() {

‎app/src/main/java/d2d/testing/StreamActivity.java‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
import d2d.testing.wifip2p.WifiP2pController;
1919
import d2d.testing.net.packets.DataPacketBuilder;
2020
import d2d.testing.net.threads.selectors.RTSPServerSelector;
21-
import d2d.testing.streaming.video.Session;
22-
import d2d.testing.streaming.video.SessionBuilder;
21+
import d2d.testing.streaming.sessions.Session;
22+
import d2d.testing.streaming.sessions.SessionBuilder;
2323
import d2d.testing.streaming.gl.SurfaceView;
2424
import d2d.testing.streaming.rtsp.RtspClient;
2525

2626

2727
public class StreamActivity extends AppCompatActivity implements SurfaceHolder.Callback {
2828

29-
private final static String TAG = "MainActivity";
29+
private final static String TAG = "StreamActivity";
3030

3131
private SurfaceView mSurfaceView;
3232

@@ -37,8 +37,6 @@ public class StreamActivity extends AppCompatActivity implements SurfaceHolder.C
3737
private FloatingActionButton recordButton;
3838
public boolean mRecording = false;
3939

40-
private boolean groupOwner = true;
41-
4240
@Override
4341
protected void onCreate(Bundle savedInstanceState) {
4442
super.onCreate(savedInstanceState);
@@ -59,13 +57,6 @@ protected void onCreate(Bundle savedInstanceState) {
5957

6058
mSurfaceView.getHolder().addCallback(this);
6159

62-
//SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this).edit();
63-
//editor.putString(RtspServer.KEY_PORT, String.valueOf(12345));
64-
//editor.commit();
65-
// Starts the RTSP server
66-
//mIntent = new Intent(this, RtspServer.class);
67-
//this.startService(mIntent);
68-
6960
recordButton = findViewById(R.id.button_capture);
7061
recordButton.setBackgroundTintList(ColorStateList.valueOf(getResources().getColor(android.R.color.holo_red_dark)));
7162
recordButton.setOnClickListener(new View.OnClickListener() {
@@ -147,7 +138,9 @@ public void onDestroy(){
147138
//this.stopService(mIntent);
148139
mSesion.stopPreview();
149140
}
150-
141+
/*
142+
setPath() esto quiza se deberia comprobar en GO en futuro antes de hacer streaming
143+
*/
151144
private String setPath(){
152145
ArrayList<StreamDetail> list = WifiP2pController.getInstance().getMainActivity().getStreamlist();
153146

@@ -158,7 +151,7 @@ private String setPath(){
158151
int clietnNumber = 1;
159152

160153
if(list.contains(streamDetail)) {
161-
for (int i = 2; i < 10; i++) {
154+
for (int i = 2; i < 100; i++) {
162155
streamDetail.setIp(ip + path + i);
163156
streamDetail.setName(name + i);
164157
if (!list.contains(streamDetail)) {

‎app/src/main/java/d2d/testing/ViewStreamActivity.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@ public void onCreate(Bundle savedInstanceState) {
6969

7070
mSurface = (SurfaceView) findViewById(R.id.surface);
7171
holder = mSurface.getHolder();
72-
//holder.addCallback(this);
73-
74-
Display display = getWindowManager().getDefaultDisplay();
75-
Point size = new Point();
76-
display.getSize(size);
77-
int width = size.x;
78-
int height = size.y;
7972

8073
ArrayList<String> options = new ArrayList<String>();
8174
options.add("--aout=opensles");
@@ -87,22 +80,19 @@ public void onCreate(Bundle savedInstanceState) {
8780
options.add("--logfile=vlc-log.txt");
8881
//options.add("--video-filter=rotate {angle=270}");
8982

90-
//AnimationSet anim = new AnimationSet(true);
91-
//RotateAnimation rotate = new RotateAnimation(0f, 360f, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
92-
//public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
9383
bufferSpinner = findViewById(R.id.bufferSpinner);
9484

95-
9685
libvlc = new LibVLC(getApplicationContext(), options);
9786
holder.setKeepScreenOn(true);
87+
9888
// Create media player
9989
mMediaPlayer = new MediaPlayer(libvlc);
10090
mMediaPlayer.setEventListener(this);
91+
10192
// Set up video output
10293
final IVLCVout vout = mMediaPlayer.getVLCVout();
10394
vout.setVideoView(mSurface);
10495

105-
10696
DisplayMetrics displayMetrics = new DisplayMetrics();
10797
if (Build.VERSION.SDK_INT >= 19) {
10898
// include navigation bar

‎app/src/main/java/d2d/testing/net/threads/workers/RTSPServerWorker.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import d2d.testing.MainActivity;
2121
import d2d.testing.wifip2p.WifiP2pController;
2222
import d2d.testing.net.packets.DataPacketBuilder;
23-
import d2d.testing.streaming.video.ReceiveSession;
23+
import d2d.testing.streaming.sessions.ReceiveSession;
2424
import d2d.testing.utils.Logger;
2525
import d2d.testing.net.packets.DataReceived;
26-
import d2d.testing.streaming.video.RebroadcastSession;
27-
import d2d.testing.streaming.video.Session;
28-
import d2d.testing.streaming.video.TrackInfo;
26+
import d2d.testing.streaming.sessions.RebroadcastSession;
27+
import d2d.testing.streaming.sessions.Session;
28+
import d2d.testing.streaming.sessions.TrackInfo;
2929
import d2d.testing.streaming.rtsp.RtspRequest;
3030
import d2d.testing.streaming.rtsp.RtspResponse;
3131
import d2d.testing.streaming.rtsp.UriParser;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.lang.reflect.Field;
2525
import java.net.InetAddress;
2626

27-
import d2d.testing.streaming.video.SessionBuilder;
27+
import d2d.testing.streaming.sessions.SessionBuilder;
2828
import d2d.testing.streaming.rtp.AACADTSPacketizer;
2929
import d2d.testing.streaming.rtp.AACLATMPacketizer;
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

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

‎app/src/main/java/d2d/testing/streaming/rtsp/RtspClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.concurrent.Semaphore;
3535
import java.util.regex.Matcher;
3636
import java.util.regex.Pattern;
37-
import d2d.testing.streaming.video.Session;
37+
import d2d.testing.streaming.sessions.Session;
3838
import d2d.testing.streaming.Stream;
3939
import d2d.testing.streaming.rtp.RtpSocket;
4040
import android.os.Handler;

‎app/src/main/java/d2d/testing/streaming/rtsp/RtspServer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import java.util.WeakHashMap;
3535
import java.util.regex.Matcher;
3636
import java.util.regex.Pattern;
37-
import d2d.testing.streaming.video.Session;
38-
import d2d.testing.streaming.video.SessionBuilder;
37+
import d2d.testing.streaming.sessions.Session;
38+
import d2d.testing.streaming.sessions.SessionBuilder;
3939

4040
import android.app.Service;
4141
import android.content.Intent;

‎app/src/main/java/d2d/testing/streaming/rtsp/UriParser.java‎

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

1919
package d2d.testing.streaming.rtsp;
2020

21-
import static d2d.testing.streaming.video.SessionBuilder.AUDIO_AAC;
22-
import static d2d.testing.streaming.video.SessionBuilder.AUDIO_AMRNB;
23-
import static d2d.testing.streaming.video.SessionBuilder.AUDIO_NONE;
24-
import static d2d.testing.streaming.video.SessionBuilder.VIDEO_H263;
25-
import static d2d.testing.streaming.video.SessionBuilder.VIDEO_H264;
26-
import static d2d.testing.streaming.video.SessionBuilder.VIDEO_NONE;
21+
import static d2d.testing.streaming.sessions.SessionBuilder.AUDIO_AAC;
22+
import static d2d.testing.streaming.sessions.SessionBuilder.AUDIO_AMRNB;
23+
import static d2d.testing.streaming.sessions.SessionBuilder.AUDIO_NONE;
24+
import static d2d.testing.streaming.sessions.SessionBuilder.VIDEO_H263;
25+
import static d2d.testing.streaming.sessions.SessionBuilder.VIDEO_H264;
26+
import static d2d.testing.streaming.sessions.SessionBuilder.VIDEO_NONE;
2727

2828
import java.io.IOException;
2929
import java.net.InetAddress;
@@ -32,8 +32,8 @@
3232
import java.net.UnknownHostException;
3333
import java.util.Set;
3434
import d2d.testing.streaming.MediaStream;
35-
import d2d.testing.streaming.video.Session;
36-
import d2d.testing.streaming.video.SessionBuilder;
35+
import d2d.testing.streaming.sessions.Session;
36+
import d2d.testing.streaming.sessions.SessionBuilder;
3737
import d2d.testing.streaming.audio.AudioQuality;
3838
import d2d.testing.streaming.video.VideoQuality;
3939

app/src/main/java/d2d/testing/streaming/video/RebroadcastSession.java renamed to app/src/main/java/d2d/testing/streaming/sessions/RebroadcastSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package d2d.testing.streaming.video;
1+
package d2d.testing.streaming.sessions;
22

33
import android.os.HandlerThread;
44

@@ -32,7 +32,7 @@ public class RebroadcastSession {
3232
public RebroadcastSession() {
3333
long uptime = System.currentTimeMillis();
3434

35-
HandlerThread thread = new HandlerThread("d2d.testing.streaming.video.Session");
35+
HandlerThread thread = new HandlerThread("d2d.testing.streaming.sessions.Session");
3636
thread.start();
3737

3838
mTimestamp = (uptime/1000)<<32 & (((uptime-((uptime/1000)*1000))>>32)/1000); // NTP timestamp

0 commit comments

Comments
 (0)