mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-29 11:40:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

media: Fix pt map caps

Browse source 
Since decryption is handled within rtpbin, all outcoming stream
caps will be application/x-rtp (i.e. regular rtp)

Fixes RECORD with SRTP streams
This commit is contained in:
Edward Hervey 2016-12-02 15:40:09 +01:00 committed by Edward Hervey
parent 8317139121
commit dea000f2e3
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rtsp-server/rtsp-media.c
View file

@ -3380,7 +3380,7 @@ default_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp)
} }
for (i = 0; i < medias_len; i++) { 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); const GstSDPMedia *sdp_media = gst_sdp_message_get_media (sdp, i);
GstRTSPStream *stream; GstRTSPStream *stream;
gint j, formats_len; gint j, formats_len;
@ -3399,16 +3399,12 @@ default_handle_sdp (GstRTSPMedia * media, GstSDPMessage * sdp)
} }
if (g_str_equal (proto, "RTP/AVP")) { if (g_str_equal (proto, "RTP/AVP")) {
media_type = "application/x-rtp";
profile = GST_RTSP_PROFILE_AVP; profile = GST_RTSP_PROFILE_AVP;
} else if (g_str_equal (proto, "RTP/SAVP")) { } else if (g_str_equal (proto, "RTP/SAVP")) {
media_type = "application/x-srtp";
profile = GST_RTSP_PROFILE_SAVP; profile = GST_RTSP_PROFILE_SAVP;
} else if (g_str_equal (proto, "RTP/AVPF")) { } else if (g_str_equal (proto, "RTP/AVPF")) {
media_type = "application/x-rtp";
profile = GST_RTSP_PROFILE_AVPF; profile = GST_RTSP_PROFILE_AVPF;
} else if (g_str_equal (proto, "RTP/SAVPF")) { } else if (g_str_equal (proto, "RTP/SAVPF")) {
media_type = "application/x-srtp";
profile = GST_RTSP_PROFILE_SAVPF; profile = GST_RTSP_PROFILE_SAVPF;
} else { } else {
GST_ERROR ("%p: unsupported profile '%s' for stream %d", media, proto, i); 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); gst_sdp_media_attributes_to_caps (sdp_media, caps);
s = gst_caps_get_structure (caps, 0); 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_rtsp_stream_set_pt_map (stream, pt, caps);
gst_caps_unref (caps); gst_caps_unref (caps);