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

Support colon (:) in RTSP timing.

Browse Source 
Some RTSP servers use `npt`: notation rather than `npt=`

PiperOrigin-RevId: 439333319
This commit is contained in:
claincly 2022-04-04 17:19:35 +01:00 committed by Ian Baker
parent 5b258ef8ab
commit e780a32de4
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/exoplayer_rtsp/src/main/java/androidx/media3/exoplayer/rtsp/RtspSessionTiming.java
View File

@ -38,8 +38,9 @@ import java.util.regex.Pattern;
new RtspSessionTiming(/* startTimeMs= */ 0, /* stopTimeMs= */ C.TIME_UNSET); new RtspSessionTiming(/* startTimeMs= */ 0, /* stopTimeMs= */ C.TIME_UNSET);
// We only support npt=xxx-[xxx], but not npt=-xxx. See RFC2326 Section 3.6. // We only support npt=xxx-[xxx], but not npt=-xxx. See RFC2326 Section 3.6.
// Supports both npt= and npt: identifier.
private static final Pattern NPT_RANGE_PATTERN = private static final Pattern NPT_RANGE_PATTERN =
Pattern.compile("npt=([.\\d]+|now)\\s?-\\s?([.\\d]+)?"); Pattern.compile("npt[:=]([.\\d]+|now)\\s?-\\s?([.\\d]+)?");
private static final String START_TIMING_NTP_FORMAT = "npt=%.3f-"; private static final String START_TIMING_NTP_FORMAT = "npt=%.3f-";
private static final long LIVE_START_TIME = 0; private static final long LIVE_START_TIME = 0;

7
libraries/exoplayer_rtsp/src/test/java/androidx/media3/exoplayer/rtsp/RtspSessionTimingTest.java
View File

@ -54,6 +54,13 @@ public class RtspSessionTimingTest {
assertThat(sessionTiming.isLive()).isFalse(); assertThat(sessionTiming.isLive()).isFalse();
} }
@Test
public void parseTiming_withRangeTimingAndColonSeparator() throws Exception {
RtspSessionTiming sessionTiming = RtspSessionTiming.parseTiming("npt:0.000-32.054");
assertThat(sessionTiming.getDurationMs()).isEqualTo(32054);
assertThat(sessionTiming.isLive()).isFalse();
}
@Test @Test
public void parseTiming_withInvalidRangeTiming_throwsIllegalArgumentException() { public void parseTiming_withInvalidRangeTiming_throwsIllegalArgumentException() {
assertThrows( assertThrows(