mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-27 16:55:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

srtpdec: Refactor code a bit

Browse source 
Simplify the error handling case and get the packet push out of the if()
This commit is contained in:
Olivier Crête 2013-08-12 12:27:16 -04:00
parent 04bd37dd67
commit a10e800dfd
1 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
ext/srtp/gstsrtpdec.c
View file

@ -209,6 +209,12 @@ struct _GstSrtpDecSsrcStream
GstSrtpAuthType rtcp_auth; GstSrtpAuthType rtcp_auth;
}; };
#define STREAM_HAS_CRYPTO(stream) \
(stream->rtp_cipher != GST_SRTP_CIPHER_NULL || \
stream->rtcp_cipher != GST_SRTP_CIPHER_NULL || \
stream->rtp_auth != GST_SRTP_AUTH_NULL || \
stream->rtcp_auth != GST_SRTP_AUTH_NULL)
/* initialize the srtpdec's class */ /* initialize the srtpdec's class */
static void static void
gst_srtp_dec_class_init (GstSrtpDecClass * klass) gst_srtp_dec_class_init (GstSrtpDecClass * klass)
@ -421,10 +427,7 @@ get_stream_from_caps (GstSrtpDec * filter, GstCaps * caps, guint32 ssrc)
if (gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) { if (gst_structure_get (s, "srtp-key", GST_TYPE_BUFFER, &buf, NULL) || !buf) {
GST_DEBUG ("Got key [%p]", buf); GST_DEBUG ("Got key [%p]", buf);
stream->key = buf; stream->key = buf;
} else if (stream->rtp_cipher != GST_SRTP_CIPHER_NULL || } else if (STREAM_HAS_CRYPTO (stream)) {
stream->rtcp_cipher != GST_SRTP_CIPHER_NULL ||
stream->rtp_auth != GST_SRTP_AUTH_NULL ||
stream->rtcp_auth != GST_SRTP_AUTH_NULL) {
goto error; goto error;
} }
@ -878,18 +881,7 @@ unprotect:
GST_OBJECT_UNLOCK (filter); GST_OBJECT_UNLOCK (filter);
if (err == err_status_ok) { if (err != err_status_ok) {
gst_buffer_set_size (buf, size);
otherpad = (GstPad *) gst_pad_get_element_private (pad);
/* If all is well, we may have reached soft limit */
if (gst_srtp_get_soft_limit_reached ())
request_key_with_signal (filter, ssrc, SIGNAL_SOFT_LIMIT);
/* Push buffer to source pad */
ret = gst_pad_push (otherpad, buf);
} else { /* srtp_unprotect failed */
GST_WARNING_OBJECT (pad, GST_WARNING_OBJECT (pad,
"Unable to unprotect buffer (unprotect failed code %d)", err); "Unable to unprotect buffer (unprotect failed code %d)", err);
@ -904,31 +896,44 @@ unprotect:
if (request_key_with_signal (filter, ssrc, SIGNAL_HARD_LIMIT)) { if (request_key_with_signal (filter, ssrc, SIGNAL_HARD_LIMIT)) {
GST_OBJECT_LOCK (filter); GST_OBJECT_LOCK (filter);
goto unprotect; goto unprotect;
} else {
GST_WARNING_OBJECT (filter, "Hard limit reached, no new key, "
"dropping");
} }
goto drop_buffer; } else {
GST_WARNING_OBJECT (filter, "Could not find matching stream, "
"dropping");
} }
break; break;
case err_status_auth_fail: case err_status_auth_fail:
GST_WARNING_OBJECT (filter, "Error authentication packet, dropping"); GST_WARNING_OBJECT (filter, "Error authentication packet, dropping");
goto drop_buffer; break;
case err_status_cipher_fail: case err_status_cipher_fail:
GST_WARNING_OBJECT (filter, "Error while decrypting packet, dropping"); GST_WARNING_OBJECT (filter, "Error while decrypting packet, dropping");
goto drop_buffer; break;
default: default:
GST_WARNING_OBJECT (filter, "Other error, dropping"); GST_WARNING_OBJECT (filter, "Other error, dropping");
goto drop_buffer; break;
} }
goto drop_buffer;
} }
gst_buffer_set_size (buf, size);
/* If all is well, we may have reached soft limit */
if (gst_srtp_get_soft_limit_reached ())
request_key_with_signal (filter, ssrc, SIGNAL_SOFT_LIMIT);
/* Push buffer to source pad */
otherpad = (GstPad *) gst_pad_get_element_private (pad);
ret = gst_pad_push (otherpad, buf);
return ret; return ret;
/* Drop buffer, except if gst_pad_push returned OK or an error */
drop_buffer: drop_buffer:
GST_WARNING_OBJECT (pad, "Dropping buffer"); /* Drop buffer, except if gst_pad_push returned OK or an error */
gst_buffer_unref (buf); gst_buffer_unref (buf);