Skip to content

Commit af99718

Browse files
committed
Restart video stream eqch 30 secs
1 parent bf020c8 commit af99718

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

as/app/app.iml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8586
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8687
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -95,12 +96,16 @@
9596
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-tasks/9.0.2/jars" />
9697
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.firebase/firebase-common/9.0.2/jars" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
98101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
99103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
100104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
103107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
104109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
105110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
106111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

as/app/src/main/java/com/trikset/gamepad/MainActivity.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,9 @@ protected void onResume() {
329329
@Override
330330
public void run() {
331331
new StartReadMjpegAsync(mVideo).execute(mVideoURI);
332-
//if (mRestartCallback != null && mVideo != null)
333-
// mVideo.postDelayed(mRestartCallback, 60000);
332+
if (mRestartCallback != null && mVideo != null)
333+
// drop HTTP connection and restart
334+
mVideo.postDelayed(mRestartCallback, 30000);
334335
}
335336
};
336337
mVideo.post(mRestartCallback);
@@ -536,6 +537,7 @@ protected void onDestroy() {
536537
mRestartCallback = null;
537538
}
538539
mVideo.stopPlayback();
540+
mVideo = null;
539541

540542
final View mainView = findViewById(R.id.main);
541543
mainView.removeCallbacks(getHideRunnable());

as/app/src/main/java/com/trikset/gamepad/StartReadMjpegAsync.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package com.trikset.gamepad;
44

55
import android.os.AsyncTask;
6+
import android.util.Log;
67

78
import com.demo.mjpeg.MjpegInputStream;
89
import com.demo.mjpeg.MjpegView;
@@ -31,7 +32,9 @@ protected MjpegInputStream doInBackground(URI... uris) {
3132
HttpURLConnection c = (HttpURLConnection) u.openConnection();
3233
c.setConnectTimeout(5000);
3334
c.setReadTimeout(5000);
34-
return new MjpegInputStream(c.getInputStream());
35+
MjpegInputStream s = new MjpegInputStream(c.getInputStream());
36+
Log.i("JPGReader", "Restarted connection.");
37+
return s;
3538

3639
} catch (IOException e) {
3740
e.printStackTrace();

0 commit comments

Comments
 (0)