loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow retry opening RTP ports.

Browse Source 
In RtpDataLoadable.load, the second UDP data source is opened on the port we
specify. If the port is already in use, a BindException is thrown.

#minor-release

PiperOrigin-RevId: 371319522
This commit is contained in:
claincly 2021-04-30 14:11:43 +01:00 committed by bachinger
parent 3375ee9c6a
commit 3ddf73fdcf
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspMediaPeriod.java
View File

@ -53,6 +53,7 @@ import com.google.android.exoplayer2.upstream.Loader.Loadable;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.IOException; import java.io.IOException;
import java.net.BindException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -63,6 +64,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
public final class RtspMediaPeriod implements MediaPeriod { public final class RtspMediaPeriod implements MediaPeriod {
private static final String TAG = "RtspMediaPeriod"; private static final String TAG = "RtspMediaPeriod";
/** The maximum times to retry if the underlying data channel failed to bind. */
private static final int PORT_BINDING_MAX_RETRY_COUNT = 3;
private final Allocator allocator; private final Allocator allocator;
private final Handler handler; private final Handler handler;
@ -81,6 +85,7 @@ public final class RtspMediaPeriod implements MediaPeriod {
private boolean released; private boolean released;
private boolean prepared; private boolean prepared;
private boolean trackSelected; private boolean trackSelected;
private int portBindingRetryCount;
/** /**
* Creates an RTSP media period. * Creates an RTSP media period.
@ -426,6 +431,15 @@ public final class RtspMediaPeriod implements MediaPeriod {
} else { } else {
if (error.getCause() instanceof SocketTimeoutException) { if (error.getCause() instanceof SocketTimeoutException) {
handleSocketTimeout(loadable); handleSocketTimeout(loadable);
} else if (error.getCause() instanceof BindException) {
// Allow for retry on RTP port open failure by catching BindException. Two ports are
// opened for each RTP stream, the first port number is auto assigned by the system, while
// the second is manually selected. It is thus possible that the second port fails to
// bind. Failing is more likely when running in a server-side testing environment, it is
// less likely on real devices.
if (portBindingRetryCount++ < PORT_BINDING_MAX_RETRY_COUNT) {
return Loader.RETRY;
}
} else { } else {
playbackException = playbackException =
new RtspPlaybackException( new RtspPlaybackException(