diff options
| author | Edward Hervey <edward@centricular.com> | 2016-12-02 15:40:09 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2016-12-02 15:47:12 +0100 |
| commit | dea000f2e3057109b390e94a1b6e389b4ac8b96c (patch) | |
| tree | f84ed2514ea777900d62ab22abf3d28672df1f1f | |
| parent | 8317139121888c43a9745beb29b0e71a9a6d0881 (diff) | |
media: Fix pt map caps
Since decryption is handled within rtpbin, all outcoming stream
caps will be application/x-rtp (i.e. regular rtp)
Fixes RECORD with SRTP streams
| -rw-r--r-- | gst/rtsp-server/rtsp-media.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gst/rtsp-server/rtsp-media.c b/gst/rtsp-server/rtsp-media.c index 4858b13..a7f3460 100644 --- a/gst/rtsp-server/rtsp-media.c +++ b/gst/rtsp-server/rtsp-media.c @@ -3380,7 +3380,7 @@ default_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp) } for (i = 0; i < medias_len; i++) { - const gchar *proto, *media_type; + const gchar *proto; const GstSDPMedia *sdp_media = gst_sdp_message_get_media (sdp, i); GstRTSPStream *stream; gint j, formats_len; @@ -3399,16 +3399,12 @@ default_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp) } if (g_str_equal (proto, "RTP/AVP")) { - media_type = "application/x-rtp"; profile = GST_RTSP_PROFILE_AVP; } else if (g_str_equal (proto, "RTP/SAVP")) { - media_type = "application/x-srtp"; profile = GST_RTSP_PROFILE_SAVP; } else if (g_str_equal (proto, "RTP/AVPF")) { - media_type = "application/x-rtp"; profile = GST_RTSP_PROFILE_AVPF; } else if (g_str_equal (proto, "RTP/SAVPF")) { - media_type = "application/x-srtp"; profile = GST_RTSP_PROFILE_SAVPF; } else { GST_ERROR ("%p: unsupported profile '%s' for stream %d", media, proto, i); @@ -3445,7 +3441,7 @@ default_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp) gst_sdp_media_attributes_to_caps (sdp_media, caps); s = gst_caps_get_structure (caps, 0); - gst_structure_set_name (s, media_type); + gst_structure_set_name (s, "application/x-rtp"); gst_rtsp_stream_set_pt_map (stream, pt, caps); gst_caps_unref (caps); |