From a10e800dfdb2d7cc742711fbbb8b2ab6b51da5d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
Date: Mon, 12 Aug 2013 12:27:16 -0400
Subject: [PATCH] srtpdec: Refactor code a bit

Simplify the error handling case and get the packet push out of the if()
---
 ext/srtp/gstsrtpdec.c | 57 +++++++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c
index 7af2c33d25..2c4c7275bd 100644
--- a/ext/srtp/gstsrtpdec.c
+++ b/ext/srtp/gstsrtpdec.c
@@ -209,6 +209,12 @@ struct _GstSrtpDecSsrcStream
   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 */
 static void
 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) {
     GST_DEBUG ("Got key [%p]", buf);
     stream->key = buf;
-  } else if (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) {
+  } else if (STREAM_HAS_CRYPTO (stream)) {
     goto error;
   }
 
@@ -878,18 +881,7 @@ unprotect:
 
   GST_OBJECT_UNLOCK (filter);
 
-  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 */
+  if (err != err_status_ok) {
     GST_WARNING_OBJECT (pad,
         "Unable to unprotect buffer (unprotect failed code %d)", err);
 
@@ -904,31 +896,44 @@ unprotect:
           if (request_key_with_signal (filter, ssrc, SIGNAL_HARD_LIMIT)) {
             GST_OBJECT_LOCK (filter);
             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;
-
       case err_status_auth_fail:
         GST_WARNING_OBJECT (filter, "Error authentication packet, dropping");
-        goto drop_buffer;
-
+        break;
       case err_status_cipher_fail:
         GST_WARNING_OBJECT (filter, "Error while decrypting packet, dropping");
-        goto drop_buffer;
-
+        break;
       default:
         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;
 
-  /* Drop buffer, except if gst_pad_push returned OK or an error */
-
 drop_buffer:
-  GST_WARNING_OBJECT (pad, "Dropping buffer");
+  /* Drop buffer, except if gst_pad_push returned OK or an error */
 
   gst_buffer_unref (buf);