summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jsteffens@make.tv>2019-03-15 11:19:03 +0100
committerJan Alexander Steffens (heftig) <jsteffens@make.tv>2019-03-19 16:04:07 +0100
commitdeb2f11fe2e9bee66c2d7c367272c344ca9346c2 (patch)
tree125effcab2cb4fbb3c92f0d7c19ab4bbbee351c7
parent8ef4d01f603168757a96afb58f2355c5cbe0ae80 (diff)
downloadgstreamer-plugins-bad-deb2f11fe2e9bee66c2d7c367272c344ca9346c2.tar.gz
srtpdec: Lower severity of srtp_err_status_replay_fail
AFAIU this happens when encountering retransmissions. Don't print a warning for these packets.
-rw-r--r--ext/srtp/gstsrtp.h1
-rw-r--r--ext/srtp/gstsrtpdec.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/ext/srtp/gstsrtp.h b/ext/srtp/gstsrtp.h
index f6475263c..62c67276d 100644
--- a/ext/srtp/gstsrtp.h
+++ b/ext/srtp/gstsrtp.h
@@ -72,6 +72,7 @@
# define srtp_err_status_t err_status_t
# define srtp_err_status_ok err_status_ok
# define srtp_err_status_bad_param err_status_bad_param
+# define srtp_err_status_replay_fail err_status_replay_fail
# define srtp_err_status_key_expired err_status_key_expired
# define srtp_err_status_auth_fail err_status_auth_fail
# define srtp_err_status_cipher_fail err_status_cipher_fail
diff --git a/ext/srtp/gstsrtpdec.c b/ext/srtp/gstsrtpdec.c
index 88d1cd4da..4ecef543b 100644
--- a/ext/srtp/gstsrtpdec.c
+++ b/ext/srtp/gstsrtpdec.c
@@ -1387,6 +1387,10 @@ unprotect:
case srtp_err_status_ok:
/* success! */
break;
+ case srtp_err_status_replay_fail:
+ GST_INFO_OBJECT (filter,
+ "Dropping replayed packet, probably retransmission");
+ goto err;
case srtp_err_status_key_expired:{
GstSrtpDecSsrcStream *stream;
@@ -1401,7 +1405,7 @@ unprotect:
stream = request_key_with_signal (filter, ssrc, SIGNAL_HARD_LIMIT);
GST_OBJECT_LOCK (filter);
- /* Check we have a new stream for the key request */
+ /* Check the key request created a new stream */
if (stream == NULL) {
GST_WARNING_OBJECT (filter, "Hard limit reached, no new key, dropping");
goto err;