Skip to content

Commit

Permalink
remove unnecessary onUIThread, throw illegalstate on not prepared enc…
Browse files Browse the repository at this point in the history 
…oder and refactor
  • Loading branch information
@pedroSG94
pedroSG94 committed Sep 18, 2023
1 parent a76e75a commit abc975c
Show file tree
Hide file tree
Showing 22 changed files with 249 additions and 642 deletions.
88 changes: 29 additions & 59 deletions app/src/main/java/com/pedro/streamer/customexample/RtmpActivity.java
View file
Expand Up @@ -320,85 +320,55 @@ public void onConnectionStartedRtmp(String rtmpUrl) {

@Override
public void onConnectionSuccessRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtmpActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(RtmpActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}

@Override
public void onConnectionFailedRtmp(final String reason) {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtmpActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtmpCamera1.stopStream();
bStartStop.setText(getResources().getString(R.string.start_button));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtmpCamera1.isRecording()) {
rtmpCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtmpActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}
});
Toast.makeText(RtmpActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtmpCamera1.stopStream();
bStartStop.setText(getResources().getString(R.string.start_button));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtmpCamera1.isRecording()) {
rtmpCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtmpActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}

@Override
public void onNewBitrateRtmp(final long bitrate) {
runOnUiThread(new Runnable() {
@Override
public void run() {
tvBitrate.setText(bitrate + " bps");
}
});
tvBitrate.setText(bitrate + " bps");
}

@Override
public void onDisconnectRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtmpActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtmpCamera1.isRecording()) {
rtmpCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtmpActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}
});
Toast.makeText(RtmpActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtmpCamera1.isRecording()) {
rtmpCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtmpActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}

@Override
public void onAuthErrorRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtmpActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(RtmpActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
}

@Override
public void onAuthSuccessRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtmpActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(RtmpActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}

@Override
Expand Down
112 changes: 41 additions & 71 deletions app/src/main/java/com/pedro/streamer/customexample/RtspActivity.java
View file
Expand Up @@ -337,97 +337,67 @@ public void onConnectionStartedRtsp(@NotNull String rtspUrl) {

@Override
public void onConnectionSuccessRtsp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtspActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(RtspActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}

@Override
public void onConnectionFailedRtsp(final String reason) {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtspActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtspCamera1.stopStream();
bStartStop.setText(getResources().getString(R.string.start_button));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}
});
Toast.makeText(RtspActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtspCamera1.stopStream();
bStartStop.setText(getResources().getString(R.string.start_button));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}

@Override
public void onNewBitrateRtsp(final long bitrate) {
runOnUiThread(new Runnable() {
@Override
public void run() {
tvBitrate.setText(bitrate + " bps");
}
});
tvBitrate.setText(bitrate + " bps");
}

@Override
public void onDisconnectRtsp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtspActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}
});
Toast.makeText(RtspActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}

@Override
public void onAuthErrorRtsp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
bStartStop.setText(getResources().getString(R.string.start_button));
rtspCamera1.stopStream();
Toast.makeText(RtspActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}
});
bStartStop.setText(getResources().getString(R.string.start_button));
rtspCamera1.stopStream();
Toast.makeText(RtspActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2
&& rtspCamera1.isRecording()) {
rtspCamera1.stopRecord();
PathUtils.updateGallery(getApplicationContext(), folder.getAbsolutePath() + "/" + currentDateAndTime + ".mp4");
bRecord.setText(R.string.start_record);
Toast.makeText(RtspActivity.this,
"file " + currentDateAndTime + ".mp4 saved in " + folder.getAbsolutePath(),
Toast.LENGTH_SHORT).show();
currentDateAndTime = "";
}
}

@Override
public void onAuthSuccessRtsp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(RtspActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(RtspActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}

@Override
Expand Down
55 changes: 15 additions & 40 deletions app/src/main/java/com/pedro/streamer/defaultexample/ExampleRtmpActivity.java
View file
Expand Up @@ -80,30 +80,20 @@ public void onConnectionStartedRtmp(String rtmpUrl) {

@Override
public void onConnectionSuccessRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ExampleRtmpActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(ExampleRtmpActivity.this, "Connection success", Toast.LENGTH_SHORT).show();
}

@Override
public void onConnectionFailedRtmp(final String reason) {
runOnUiThread(new Runnable() {
@Override
public void run() {
if (rtmpCamera1.reTry(5000, reason, null)) {
Toast.makeText(ExampleRtmpActivity.this, "Retry", Toast.LENGTH_SHORT)
.show();
} else {
Toast.makeText(ExampleRtmpActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtmpCamera1.stopStream();
button.setText(R.string.start_button);
}
}
});
if (rtmpCamera1.reTry(5000, reason, null)) {
Toast.makeText(ExampleRtmpActivity.this, "Retry", Toast.LENGTH_SHORT)
.show();
} else {
Toast.makeText(ExampleRtmpActivity.this, "Connection failed. " + reason, Toast.LENGTH_SHORT)
.show();
rtmpCamera1.stopStream();
button.setText(R.string.start_button);
}
}

@Override
Expand All @@ -113,34 +103,19 @@ public void onNewBitrateRtmp(final long bitrate) {

@Override
public void onDisconnectRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ExampleRtmpActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(ExampleRtmpActivity.this, "Disconnected", Toast.LENGTH_SHORT).show();
}

@Override
public void onAuthErrorRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ExampleRtmpActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
rtmpCamera1.stopStream();
button.setText(R.string.start_button);
}
});
Toast.makeText(ExampleRtmpActivity.this, "Auth error", Toast.LENGTH_SHORT).show();
rtmpCamera1.stopStream();
button.setText(R.string.start_button);
}

@Override
public void onAuthSuccessRtmp() {
runOnUiThread(new Runnable() {
@Override
public void run() {
Toast.makeText(ExampleRtmpActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}
});
Toast.makeText(ExampleRtmpActivity.this, "Auth success", Toast.LENGTH_SHORT).show();
}

@Override
Expand Down

0 comments on commit abc975c

Please sign in to comment.