Merge pull request #9247 from colinbarr:dev-v2-rtsp-fmtp-trailing-sem…

…icolon PiperOrigin-RevId: 388713101
google · Aug 4, 2021 · f23ab8e · f23ab8e
1 parent ba3f868
commit f23ab8e
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -138,8 +138,10 @@
 *   Media2 extension:
     *   Deprecate `setControlDispatcher` in `SessionPlayerConnector`.
 *   RTSP:
-    *   Use standard RTSP header names.
+    *   Use standard RTSP header names
         ([#9182](https://github.com/google/ExoPlayer/issues/9182)).
+    *   Handle an extra semicolon in SDP fmtp attribute
+        ([#9247](https://github.com/google/ExoPlayer/pull/9247)).
 *   MediaSession extension:
     *   Deprecate `setControlDispatcher` in `MediaSessionConnector`. The
         `ControlDispatcher` parameter has also been deprecated in all

diff --git a/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java b/library/rtsp/src/main/java/com/google/android/exoplayer2/source/rtsp/MediaDescription.java
@@ -300,7 +300,7 @@ public int hashCode() {
    * {@link MediaDescription} does not contain any FMTP attribute.
    *
    * <p>FMTP format reference: RFC2327 Page 27. The spaces around the FMTP attribute delimiters are
-   * removed. For example,
+   * removed.
    */
   public ImmutableMap<String, String> getFmtpParametersAsMap() {
     @Nullable String fmtpAttributeValue = attributes.get(ATTR_FMTP);
@@ -314,7 +314,8 @@ public ImmutableMap<String, String> getFmtpParametersAsMap() {
 
     // Format of the parameter: RFC3640 Section 4.4.1:
     //   <parameter name>=<value>[; <parameter name>=<value>].
-    String[] parameters = Util.split(fmtpComponents[1], ";\\s?");
+    // Split with an explicit limit of 0 to handle an optional trailing semicolon.
+    String[] parameters = fmtpComponents[1].split(";\\s?", /* limit= */ 0);
     ImmutableMap.Builder<String, String> formatParametersBuilder = new ImmutableMap.Builder<>();
     for (String parameter : parameters) {
       // The parameter values can bear equal signs, so splitAtFirst must be used.

diff --git a/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java b/library/rtsp/src/test/java/com/google/android/exoplayer2/source/rtsp/RtspMediaTrackTest.java
@@ -80,6 +80,48 @@ public void generatePayloadFormat_withH264MediaDescription_succeeds() {
     assertThat(format).isEqualTo(expectedFormat);
   }
 
+  @Test
+  public void generatePayloadFormat_withFmtpTrailingSemicolon_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 =