Changeset 5820 for pjproject/trunk/pjmedia/include/pjmedia/types.h

Timestamp:

Jul 12, 2018 8:22:31 AM (6 years ago)

Author:

nanang

Message:

Close #2126: Initial implementation of RTCP Feedback.

File:

• pjproject/trunk/pjmedia/include/pjmedia/types.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/types.h

@@ -73 +73 @@
 
 /**
- * Media transport protocol.
+ * Media transport protocol and profile.
  */
 typedef enum pjmedia_tp_proto
 {
+    /* Basic transports */
+
     /** No transport type */
-    PJMEDIA_TP_PROTO_NONE = 0,
+    PJMEDIA_TP_PROTO_NONE           = 0,
+
+    /** Transport unknown */
+    PJMEDIA_TP_PROTO_UNKNOWN        = (1 << 0),
+
+    /** UDP transport */
+    PJMEDIA_TP_PROTO_UDP            = (1 << 1),
+
+    /** RTP transport */
+    PJMEDIA_TP_PROTO_RTP            = (1 << 2),
+
+    /** DTLS transport */
+    PJMEDIA_TP_PROTO_DTLS           = (1 << 3),
+
+
+    /* Basic profiles */
+    
+    /** RTCP Feedback profile */
+    PJMEDIA_TP_PROFILE_RTCP_FB      = (1 << 13),
+
+    /** Secure RTP profile */
+    PJMEDIA_TP_PROFILE_SRTP         = (1 << 14),
+
+    /** Audio/video profile */
+    PJMEDIA_TP_PROFILE_AVP          = (1 << 15),
+
+
+    /* Predefined transport profiles (commonly used) */
 
     /** RTP using A/V profile */
-    PJMEDIA_TP_PROTO_RTP_AVP,
-
-    /** Secure RTP */
-    PJMEDIA_TP_PROTO_RTP_SAVP,
-
-    /** Unknown */
-    PJMEDIA_TP_PROTO_UNKNOWN
+    PJMEDIA_TP_PROTO_RTP_AVP        = (PJMEDIA_TP_PROTO_RTP |
+                                       PJMEDIA_TP_PROFILE_AVP),
+
+    /** Secure RTP using A/V profile */
+    PJMEDIA_TP_PROTO_RTP_SAVP       = (PJMEDIA_TP_PROTO_RTP_AVP |
+                                       PJMEDIA_TP_PROFILE_SRTP),
+
+    /** Secure RTP using A/V profile and DTLS-SRTP keying */
+    PJMEDIA_TP_PROTO_DTLS_SRTP      = (PJMEDIA_TP_PROTO_DTLS |
+                                       PJMEDIA_TP_PROTO_RTP_SAVP),
+
+    /** RTP using A/V and RTCP feedback profile */
+    PJMEDIA_TP_PROTO_RTP_AVPF       = (PJMEDIA_TP_PROTO_RTP_AVP |
+                                       PJMEDIA_TP_PROFILE_RTCP_FB),
+
+    /** Secure RTP using A/V and RTCP feedback profile */
+    PJMEDIA_TP_PROTO_RTP_SAVPF      = (PJMEDIA_TP_PROTO_RTP_SAVP |
+                                       PJMEDIA_TP_PROFILE_RTCP_FB),
+
+    /** Secure RTP using A/V and RTCP feedback profile and DTLS-SRTP keying */
+    PJMEDIA_TP_PROTO_DTLS_SRTPF     = (PJMEDIA_TP_PROTO_DTLS_SRTP |
+                                       PJMEDIA_TP_PROFILE_RTCP_FB),
 
 } pjmedia_tp_proto;
 
+/**
+ * Macro helper for checking if a transport protocol contains specific
+ * transport and profile flags.
+ */
+#define PJMEDIA_TP_PROTO_HAS_FLAG(TP_PROTO, FLAGS) \
+                                    (((TP_PROTO) & (FLAGS)) == (FLAGS))
+
+/**
+ * Macro helper for excluding specific flags in transport protocol.
+ */
+#define PJMEDIA_TP_PROTO_TRIM_FLAG(TP_PROTO, FLAGS) ((TP_PROTO) &= ~(FLAGS))
 
 /**