diff options
author | Jan Alexander Steffens (heftig) <jsteffens@make.tv> | 2019-03-15 11:03:52 +0100 |
---|---|---|
committer | Jan Alexander Steffens (heftig) <jsteffens@make.tv> | 2019-03-19 13:47:41 +0100 |
commit | 34eaeb17f230424513af2b25c8b9062a7b27577c (patch) | |
tree | 26886c9143cb8aadb769a9c8f35ffebb7f4cb2bd | |
parent | b541b589376952517bb1d7c24f05ab5eef4adb9b (diff) | |
download | gstreamer-plugins-bad-34eaeb17f230424513af2b25c8b9062a7b27577c.tar.gz |
srtpdec: Simplify locking in gst_srtp_dec_decode_buffer
Don't drop the lock on filter just to unmap the buffer (or log a
message).
-rw-r--r-- | ext/srtp/gstsrtpdec.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c index 0e8b1373a..b5d6388ad 100644 --- a/ext/srtp/gstsrtpdec.c +++ b/ext/srtp/gstsrtpdec.c @@ -1382,8 +1382,6 @@ unprotect: #endif } - GST_OBJECT_UNLOCK (filter); - if (err != srtp_err_status_ok) { GST_WARNING_OBJECT (pad, "Unable to unprotect buffer (unprotect failed code %d)", err); @@ -1391,7 +1389,6 @@ unprotect: /* Signal user depending on type of error */ switch (err) { case srtp_err_status_key_expired: - GST_OBJECT_LOCK (filter); /* Update stream */ if (find_stream_by_ssrc (filter, ssrc)) { @@ -1400,6 +1397,7 @@ unprotect: GST_OBJECT_LOCK (filter); goto unprotect; } else { + GST_OBJECT_LOCK (filter); GST_WARNING_OBJECT (filter, "Hard limit reached, no new key, " "dropping"); } @@ -1420,16 +1418,11 @@ unprotect: } gst_buffer_unmap (buf, &map); - - GST_OBJECT_LOCK (filter); return FALSE; } gst_buffer_unmap (buf, &map); - gst_buffer_set_size (buf, size); - - GST_OBJECT_LOCK (filter); return TRUE; } |