sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-09 11:55:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle trailing semicolon on RTSP fmtp attribute

Browse source
This commit is contained in:
Colin Barr 2021-08-02 21:15:33 +01:00
parent f329adbc23
commit 6f67cb839c
No known key found for this signature in database
GPG key ID: 465A0A29B2554888
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java
View file

@ -314,7 +314,8 @@ import java.util.HashMap;
// Format of the parameter: RFC3640 Section 4.4.1:
// <parameter name>=<value>[; <parameter name>=<value>].
String[] parameters = Util.split(fmtpComponents[1], ";\\s?");
// Split with implicit limit of 0 to handle an optional trailing semicolon.
String[] parameters = fmtpComponents[1].split(";\\s?");
ImmutableMap.Builder<String, String> formatParametersBuilder = new ImmutableMap.Builder<>();
for (String parameter : parameters) {
// The parameter values can bear equal signs, so splitAtFirst must be used.

42
library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java
View file

@ -80,6 +80,48 @@ public class RtspMediaTrackTest {
assertThat(format).isEqualTo(expectedFormat);
}
@Test
public void generatePayloadFormat_withH264MediaDescriptionAndFmtpTrailingSemicolon_succeeds() {
MediaDescription mediaDescription =
new MediaDescription.Builder(
MEDIA_TYPE_VIDEO, /* port= */ 0, RTP_AVP_PROFILE, /* payloadType= */ 96)
.setConnection("IN IP4 0.0.0.0")
.setBitrate(500_000)
.addAttribute(ATTR_RTPMAP, "96 H264/90000")
.addAttribute(
ATTR_FMTP,
"96 packetization-mode=1;profile-level-id=64001F;sprop-parameter-sets=Z2QAH6zZQPARabIAAAMACAAAAwGcHjBjLA==,aOvjyyLA;")
.addAttribute(ATTR_CONTROL, "track1")
.build();
RtpPayloadFormat format = RtspMediaTrack.generatePayloadFormat(mediaDescription);
RtpPayloadFormat expectedFormat =
new RtpPayloadFormat(
new Format.Builder()
.setSampleMimeType(MimeTypes.VIDEO_H264)
.setAverageBitrate(500_000)
.setPixelWidthHeightRatio(1.0f)
.setHeight(544)
.setWidth(960)
.setCodecs("avc1.64001F")
.setInitializationData(
ImmutableList.of(
new byte[] {
0, 0, 0, 1, 103, 100, 0, 31, -84, -39, 64, -16, 17, 105, -78, 0, 0, 3, 0,
8, 0, 0, 3, 1, -100, 30, 48, 99, 44
},
new byte[] {0, 0, 0, 1, 104, -21, -29, -53, 34, -64}))
.build(),
/* rtpPayloadType= */ 96,
/* clockRate= */ 90_000,
/* fmtpParameters= */ ImmutableMap.of(
"packetization-mode", "1",
"profile-level-id", "64001F",
"sprop-parameter-sets", "Z2QAH6zZQPARabIAAAMACAAAAwGcHjBjLA==,aOvjyyLA"));
assertThat(format).isEqualTo(expectedFormat);
}
@Test
public void generatePayloadFormat_withAacMediaDescription_succeeds() {
MediaDescription mediaDescription =