diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2018-10-17 18:33:12 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2018-10-17 18:34:31 -0400 |
| commit | a10c46a93a450d3e19fa9572daafe880435f8b44 (patch) | |
| tree | 04f569ab506f93d8a3a3ec2f09dc65e3c6e3d3f4 /ext/srtp | |
| parent | 53b6c94d630c35b44226a3c3510955c1fc20f4b6 (diff) | |
| download | gstreamer-plugins-bad-a10c46a93a450d3e19fa9572daafe880435f8b44.tar.gz | |
Revert "srtpdec: also check for "roc" in caps"
This reverts commit 73ebdb888e047b14ceea19ce1a0bbbeff0cd7b2a.
This isn't needed and it breaks srtpenc ! srtpdec, specifying the
roll-over counter manually is an advanced feature.
Also revert "srtp: Add "roc" caps field to the gst-launch example"
This reverts commit 67ae35813bff9362065bbfec770f3fdbb89165a3.
https://bugzilla.gnome.org/show_bug.cgi?id=765079
Diffstat (limited to 'ext/srtp')
| -rw-r--r-- | ext/srtp/gstsrtpdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c index 67c05d3b3..43e5e81b5 100644 --- a/ext/srtp/gstsrtpdec.c +++ b/ext/srtp/gstsrtpdec.c @@ -98,7 +98,7 @@ * * ## Example pipelines * |[ - * gst-launch-1.0 udpsrc port=5004 caps='application/x-srtp, payload=(int)8, ssrc=(uint)1356955624, srtp-key=(buffer)012345678901234567890123456789012345678901234567890123456789, srtp-cipher=(string)aes-128-icm, srtp-auth=(string)hmac-sha1-80, srtcp-cipher=(string)aes-128-icm, srtcp-auth=(string)hmac-sha1-80, roc=(uint)0' ! srtpdec ! rtppcmadepay ! alawdec ! pulsesink + * gst-launch-1.0 udpsrc port=5004 caps='application/x-srtp, payload=(int)8, ssrc=(uint)1356955624, srtp-key=(buffer)012345678901234567890123456789012345678901234567890123456789, srtp-cipher=(string)aes-128-icm, srtp-auth=(string)hmac-sha1-80, srtcp-cipher=(string)aes-128-icm, srtcp-auth=(string)hmac-sha1-80' ! srtpdec ! rtppcmadepay ! alawdec ! pulsesink * ]| Receive PCMA SRTP packets through UDP using caps to specify * master key and protection. * |[ @@ -835,7 +835,6 @@ gst_srtp_dec_sink_setcaps (GstPad * pad, GstObject * parent, ps = gst_caps_get_structure (caps, 0); if (gst_structure_has_field_typed (ps, "ssrc", G_TYPE_UINT) && - gst_structure_has_field_typed (ps, "roc", G_TYPE_UINT) && gst_structure_has_field_typed (ps, "srtp-cipher", G_TYPE_STRING) && gst_structure_has_field_typed (ps, "srtp-auth", G_TYPE_STRING) && gst_structure_has_field_typed (ps, "srtcp-cipher", G_TYPE_STRING) && |