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

sdp: parse sdp attributes in case that sdp message doesn't contain mikey message

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=766204
This commit is contained in:
Hyunjun Ko 2016-05-10 21:34:53 +09:00 committed by Sebastian Dröge
parent dc8120f298
commit 825c150e9d
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst-libs/gst/sdp/gstsdpmessage.c
View file

@ -3782,12 +3782,17 @@ gst_sdp_message_attributes_to_caps (const GstSDPMessage * msg, GstCaps * caps)
res = gst_sdp_message_parse_keymgmt (msg, &mikey); res = gst_sdp_message_parse_keymgmt (msg, &mikey);
if (mikey) { if (mikey) {
res = GST_SDP_EINVAL; if (gst_mikey_message_to_caps (mikey, caps)) {
if (gst_mikey_message_to_caps (mikey, caps)) res = GST_SDP_EINVAL;
res = sdp_add_attributes_to_caps (msg->attributes, caps); goto done;
gst_mikey_message_unref (mikey); }
} }
res = sdp_add_attributes_to_caps (msg->attributes, caps);
done:
if (mikey)
gst_mikey_message_unref (mikey);
return res; return res;
} }
@ -3813,11 +3818,16 @@ gst_sdp_media_attributes_to_caps (const GstSDPMedia * media, GstCaps * caps)
res = gst_sdp_media_parse_keymgmt (media, &mikey); res = gst_sdp_media_parse_keymgmt (media, &mikey);
if (mikey) { if (mikey) {
res = GST_SDP_EINVAL; if (!gst_mikey_message_to_caps (mikey, caps)) {
if (gst_mikey_message_to_caps (mikey, caps)) res = GST_SDP_EINVAL;
res = sdp_add_attributes_to_caps (media->attributes, caps); goto done;
gst_mikey_message_unref (mikey); }
} }
res = sdp_add_attributes_to_caps (media->attributes, caps);
done:
if (mikey)
gst_mikey_message_unref (mikey);
return res; return res;
} }