RTP: ignore muxed RTCP packets for the time being

modules/demux/rtp.c

@@ -469,21 +469,28 @@ static int Demux (demux_t *demux)
     block_t     *block;
 
     block = rtp_dgram_recv (demux, p_sys->fd);
-    if (block)
-    {
+    if (!block)
+        return 1;
+
+    if (block->i_buffer < 2)
+        goto drop;
+
+    const uint8_t ptype = block->p_buffer[1] & 0x7F;
+    if (ptype >= 72 && ptype <= 76)
+        goto drop; /* Muxed RTCP, ignore for now */
+
     /* Not using SDP, we need to guess the payload format used */
     /* see http://www.iana.org/assignments/rtp-parameters */
-        if (p_sys->autodetect && block->i_buffer >= 2)
+    if (p_sys->autodetect)
     {
         rtp_pt_t pt = {
             .init = NULL,
             .destroy = codec_destroy,
             .decode = codec_decode,
             .frequency = 0,
-                .number = block->p_buffer[1] & 0x7f,
+            .number = ptype,
         };
-
-            switch (pt.number)
+        switch (ptype)
         {
           case 0:
             msg_Dbg (demux, "detected G.711 mu-law");
@@ -531,21 +538,16 @@ static int Demux (demux_t *demux)
             pt.frequency = 90000;
             break;
 
-              case 72: /* muxed SR */
-              case 73: /* muxed RR */
-              case 74: /* muxed SDES */
-              case 75: /* muxed BYE */
-              case 76: /* muxed APP */
           default:
-                block_Release (block); /* ooh! ignoring RTCP is evil! */
-                return 1;
+            goto drop;
         }
         rtp_add_type (demux, p_sys->session, &pt);
         p_sys->autodetect = false;
     }
-
     rtp_receive (demux, p_sys->session, block);
-    }
 
+    return 1;
+drop:
+    block_Release (block);
     return 1;
 }