From b132d8089b6dc554c0a9876450ea1578f94ee4ce Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 7 Apr 2014 10:12:40 -0400 Subject: [PATCH] redo flags to have a "shared flags namespace" --- daemon/call.h | 68 +++++++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/daemon/call.h b/daemon/call.h index eab535e05..81844f176 100644 --- a/daemon/call.h +++ b/daemon/call.h @@ -68,40 +68,50 @@ struct call_monologue; +/* flags shared by several of the structs below */ +#define SHARED_FLAG_IMPLICIT_RTCP 0x00000001 +#define SHARED_FLAG_ASYMMETRIC 0x00000002 +#define SHARED_FLAG_SEND 0x00000004 +#define SHARED_FLAG_RECV 0x00000008 +#define SHARED_FLAG_RTCP_MUX 0x00000010 +#define SHARED_FLAG_SETUP_ACTIVE 0x00000020 +#define SHARED_FLAG_SETUP_PASSIVE 0x00000040 + /* struct stream_params */ -#define SP_FLAG_NO_RTCP 0x00000001 -#define SP_FLAG_IMPLICIT_RTCP 0x00000002 -#define SP_FLAG_RTCP_MUX 0x00000004 -#define SP_FLAG_SEND 0x00000008 -#define SP_FLAG_RECV 0x00000010 -#define SP_FLAG_ASYMMETRIC 0x00000020 -#define SP_FLAG_SETUP_ACTIVE 0x00000040 -#define SP_FLAG_SETUP_PASSIVE 0x00000080 +#define SP_FLAG_NO_RTCP 0x00010000 +#define SP_FLAG_IMPLICIT_RTCP SHARED_FLAG_IMPLICIT_RTCP +#define SP_FLAG_RTCP_MUX SHARED_FLAG_RTCP_MUX +#define SP_FLAG_SEND SHARED_FLAG_SEND +#define SP_FLAG_RECV SHARED_FLAG_RECV +#define SP_FLAG_ASYMMETRIC SHARED_FLAG_ASYMMETRIC +#define SP_FLAG_SETUP_ACTIVE SHARED_FLAG_SETUP_ACTIVE +#define SP_FLAG_SETUP_PASSIVE SHARED_FLAG_SETUP_PASSIVE /* struct packet_stream */ -#define PS_FLAG_RTP 0x00000100 -#define PS_FLAG_RTCP 0x00000200 -#define PS_FLAG_IMPLICIT_RTCP SP_FLAG_IMPLICIT_RTCP -#define PS_FLAG_FALLBACK_RTCP 0x00000400 -#define PS_FLAG_STUN 0x00000800 -#define PS_FLAG_FILLED 0x00001000 -#define PS_FLAG_CONFIRMED 0x00002000 -#define PS_FLAG_KERNELIZED 0x00004000 -#define PS_FLAG_NO_KERNEL_SUPPORT 0x00008000 -#define PS_FLAG_HAS_HANDLER 0x00010000 -#define PS_FLAG_FINGERPRINT_VERIFIED 0x00020000 +#define PS_FLAG_RTP 0x00010000 +#define PS_FLAG_RTCP 0x00020000 +#define PS_FLAG_IMPLICIT_RTCP SHARED_FLAG_IMPLICIT_RTCP +#define PS_FLAG_FALLBACK_RTCP 0x00040000 +#define PS_FLAG_STUN 0x00080000 +#define PS_FLAG_FILLED 0x00100000 +#define PS_FLAG_CONFIRMED 0x00200000 +#define PS_FLAG_KERNELIZED 0x00400000 +#define PS_FLAG_NO_KERNEL_SUPPORT 0x00800000 +#define PS_FLAG_HAS_HANDLER 0x01000000 +#define PS_FLAG_FINGERPRINT_VERIFIED 0x02000000 /* struct call_media */ -#define MEDIA_FLAG_INITIALIZED 0x00040000 -#define MEDIA_FLAG_ASYMMETRIC SP_FLAG_ASYMMETRIC -#define MEDIA_FLAG_SEND SP_FLAG_SEND -#define MEDIA_FLAG_RECV SP_FLAG_RECV -#define MEDIA_FLAG_RTCP_MUX SP_FLAG_RTCP_MUX -#define MEDIA_FLAG_RTCP_MUX_OVERRIDE 0x00080000 -#define MEDIA_FLAG_DTLS 0x00100000 -#define MEDIA_FLAG_SDES 0x00200000 -#define MEDIA_FLAG_SETUP_ACTIVE SP_FLAG_SETUP_ACTIVE -#define MEDIA_FLAG_SETUP_PASSIVE SP_FLAG_SETUP_PASSIVE +#define MEDIA_FLAG_INITIALIZED 0x00010000 +#define MEDIA_FLAG_ASYMMETRIC SHARED_FLAG_ASYMMETRIC +#define MEDIA_FLAG_SEND SHARED_FLAG_SEND +#define MEDIA_FLAG_RECV SHARED_FLAG_RECV +#define MEDIA_FLAG_RTCP_MUX SHARED_FLAG_RTCP_MUX +#define MEDIA_FLAG_RTCP_MUX_OVERRIDE 0x00020000 +#define MEDIA_FLAG_DTLS 0x00040000 +#define MEDIA_FLAG_SDES 0x00080000 +#define MEDIA_FLAG_SETUP_ACTIVE SHARED_FLAG_SETUP_ACTIVE +#define MEDIA_FLAG_SETUP_PASSIVE SHARED_FLAG_SETUP_PASSIVE +#define MEDIA_FLAG_PASSTHRU 0x00100000 /* access macros */ #define SP_ISSET(p, f) bf_isset(&(p)->sp_flags, SP_FLAG_ ## f)