loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-09 00:20:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relax session timing requirement.

Browse Source 
Some RTSP servers do not include the RANGE attribute for live contents.

#minor-release

PiperOrigin-RevId: 370662587
This commit is contained in:
claincly 2021-04-27 14:03:23 +01:00 committed by bachinger
parent bf04bb5bc0
commit 13a34b8b4a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspClient.java
View File

@ -443,12 +443,15 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
} }
public void onDescribeResponseReceived(RtspDescribeResponse response) { public void onDescribeResponseReceived(RtspDescribeResponse response) {
@Nullable
String sessionRangeAttributeString = String sessionRangeAttributeString =
checkNotNull(response.sessionDescription.attributes.get(SessionDescription.ATTR_RANGE)); response.sessionDescription.attributes.get(SessionDescription.ATTR_RANGE);
try { try {
sessionInfoListener.onSessionTimelineUpdated( sessionInfoListener.onSessionTimelineUpdated(
RtspSessionTiming.parseTiming(sessionRangeAttributeString), sessionRangeAttributeString != null
? RtspSessionTiming.parseTiming(sessionRangeAttributeString)
: RtspSessionTiming.DEFAULT,
buildTrackList(response.sessionDescription, uri)); buildTrackList(response.sessionDescription, uri));
hasUpdatedTimelineAndTracks = true; hasUpdatedTimelineAndTracks = true;
} catch (ParserException e) { } catch (ParserException e) {

2
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/RtspSessionTiming.java
View File

@ -31,7 +31,7 @@ import java.util.regex.Pattern;
* <p>Currently only NPT is supported. See RFC2326 Section 3.6 for detail of NPT. * <p>Currently only NPT is supported. See RFC2326 Section 3.6 for detail of NPT.
*/ */
public final class RtspSessionTiming { public final class RtspSessionTiming {
/** The default session timing starting from 0.000 and indefinite length. */ /** The default session timing starting from 0.000 and indefinite length, effectively live. */
public static final RtspSessionTiming DEFAULT = public static final RtspSessionTiming DEFAULT =
new RtspSessionTiming(/* startTimeMs= */ 0, /* stopTimeMs= */ C.TIME_UNSET); new RtspSessionTiming(/* startTimeMs= */ 0, /* stopTimeMs= */ C.TIME_UNSET);