Commit d0dc72fb by claincly Committed by bachinger

Fix TCP retry bug when some RTSP tracks are not selected.

The size of rtspLoaderWrappers must match the number of tracks exposed by the
RTSP session (a track is exposed if its media description entry appears in
DESCRIBE's SDP response).

When retrying with TCP, the old code will start loading all exposed RTSP
tracks, regardless of whether they are selected.
The fixed code will only start loading selected tracks.

#minor-release

PiperOrigin-RevId: 377931030
parent 4b30cca9
...@@ -306,9 +306,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -306,9 +306,11 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
@Nullable @Nullable
private RtpDataLoadable getLoadableByTrackUri(Uri trackUri) { private RtpDataLoadable getLoadableByTrackUri(Uri trackUri) {
for (int i = 0; i < rtspLoaderWrappers.size(); i++) { for (int i = 0; i < rtspLoaderWrappers.size(); i++) {
RtpLoadInfo loadInfo = rtspLoaderWrappers.get(i).loadInfo; if (!rtspLoaderWrappers.get(i).canceled) {
if (loadInfo.getTrackUri().equals(trackUri)) { RtpLoadInfo loadInfo = rtspLoaderWrappers.get(i).loadInfo;
return loadInfo.loadable; if (loadInfo.getTrackUri().equals(trackUri)) {
return loadInfo.loadable;
}
} }
} }
return null; return null;
...@@ -543,17 +545,21 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -543,17 +545,21 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
ArrayList<RtspLoaderWrapper> newLoaderWrappers = new ArrayList<>(rtspLoaderWrappers.size()); ArrayList<RtspLoaderWrapper> newLoaderWrappers = new ArrayList<>(rtspLoaderWrappers.size());
ArrayList<RtpLoadInfo> newSelectedLoadInfos = new ArrayList<>(selectedLoadInfos.size()); ArrayList<RtpLoadInfo> newSelectedLoadInfos = new ArrayList<>(selectedLoadInfos.size());
// newLoaderWrappers' elements and orders must match those of rtspLoaderWrappers'.
for (int i = 0; i < rtspLoaderWrappers.size(); i++) { for (int i = 0; i < rtspLoaderWrappers.size(); i++) {
RtspLoaderWrapper loaderWrapper = rtspLoaderWrappers.get(i); RtspLoaderWrapper loaderWrapper = rtspLoaderWrappers.get(i);
RtspLoaderWrapper newLoaderWrapper = if (!loaderWrapper.canceled) {
new RtspLoaderWrapper( RtspLoaderWrapper newLoaderWrapper =
loaderWrapper.loadInfo.mediaTrack, /* trackId= */ i, rtpDataChannelFactory); new RtspLoaderWrapper(
newLoaderWrappers.add(newLoaderWrapper); loaderWrapper.loadInfo.mediaTrack, /* trackId= */ i, rtpDataChannelFactory);
newLoaderWrapper.startLoading(); newLoaderWrappers.add(newLoaderWrapper);
newLoaderWrapper.startLoading();
if (selectedLoadInfos.contains(loaderWrapper.loadInfo)) { if (selectedLoadInfos.contains(loaderWrapper.loadInfo)) {
newSelectedLoadInfos.add(newLoaderWrapper.loadInfo); newSelectedLoadInfos.add(newLoaderWrapper.loadInfo);
}
} else {
newLoaderWrappers.add(loaderWrapper);
} }
} }
...@@ -644,21 +650,22 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; ...@@ -644,21 +650,22 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** Cancels loading. */ /** Cancels loading. */
public void cancelLoad() { public void cancelLoad() {
if (canceled) { if (!canceled) {
return; loadInfo.loadable.cancelLoad();
} canceled = true;
loadInfo.loadable.cancelLoad();
canceled = true;
// Update loadingFinished every time loading is canceled. // Update loadingFinished every time loading is canceled.
updateLoadingFinished(); updateLoadingFinished();
}
} }
/** Resets the {@link Loadable} and {@link SampleQueue} to prepare for an RTSP seek. */ /** Resets the {@link Loadable} and {@link SampleQueue} to prepare for an RTSP seek. */
public void seekTo(long positionUs) { public void seekTo(long positionUs) {
loadInfo.loadable.resetForSeek(); if (!canceled) {
sampleQueue.reset(); loadInfo.loadable.resetForSeek();
sampleQueue.setStartTimeUs(positionUs); sampleQueue.reset();
sampleQueue.setStartTimeUs(positionUs);
}
} }
/** Releases the instance. */ /** Releases the instance. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment