From 082372fba1007250636dfd25909ec1f07cc9e9eb Mon Sep 17 00:00:00 2001 From: Aaro Altonen Date: Fri, 24 Apr 2020 11:31:40 +0300 Subject: [PATCH] Merge RTP context configuration flags into one enum Having separate enums for general configuration and media configuration might be too confusing given that they are passed to kvzRTP using same variable and the configuration values must not clash with each other so the second enum's values would have to start from RCE_LAST which might look weird --- include/util.hh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/include/util.hh b/include/util.hh index a8f28c3..2fa2e1f 100644 --- a/include/util.hh +++ b/include/util.hh @@ -96,7 +96,7 @@ enum RTP_CTX_ENABLE_FLAGS { RCE_SYSTEM_CALL_DISPATCHER = 1 << 2, /* Use SRTP for this connection */ - RCE_SRTP = 1 << 3, + RCE_SRTP = 1 << 3, /* Use ZRTP for key management * @@ -108,12 +108,6 @@ enum RTP_CTX_ENABLE_FLAGS { * TODO selitä paremmin */ RCE_SRTP_KMNGMNT_USER = 1 << 4, - RCE_LAST = 1 << 5, -}; - -enum RTP_CTX_ENABLE_MEDIA_FLAGS { - RCE_MEDIA_NO_FLAGS = 0 << 0, - /* When kvzRTP is receiving HEVC stream, as an attempt to improve * QoS, it will set frame delay for intra frames to be the same * as intra period. @@ -134,7 +128,9 @@ enum RTP_CTX_ENABLE_MEDIA_FLAGS { * This behavior can be disabled with RCE_HEVC_NO_INTRA_DELAY * If this flag is given, kvzRTP treats all frame types * equally and drops all frames that are late */ - RCE_HEVC_NO_INTRA_DELAY = 1 << 0 + RCE_HEVC_NO_INTRA_DELAY = 1 << 5, + + RCE_LAST = 1 << 6, }; /* These options are given to configuration() */