Changeset 2054 for pjproject/trunk/pjnath/src/pjnath/ice_strans.c

Timestamp:

Jun 25, 2008 9:16:46 PM (16 years ago)

Author:

bennylp

Message:

Optimize the number of characters written to SDP by ICE

File:

• pjproject/trunk/pjnath/src/pjnath/ice_strans.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/ice_strans.c

@@ -46 +46 @@
 };
 
-/* Candidate preference default values */
-#define SRFLX_PREF  65535
-#define HOST_PREF   65530
-#define RELAY_PREF  65525
+/* Candidate's local preference values. This is mostly used to
+ * specify preference among candidates with the same type. Since
+ * we don't have the facility to specify that, we'll just set it
+ * all to zero.
+ */
+#define SRFLX_PREF  0
+#define HOST_PREF   0
+#define RELAY_PREF  0
+
+/* The candidate type preference when STUN candidate is used */
+static pj_uint8_t srflx_pref_table[4] = 
+{
+    /* Keep it to 2 bits */
+    1,  /**< PJ_ICE_HOST_PREF       */
+    2,  /**< PJ_ICE_SRFLX_PREF      */
+    3,  /**< PJ_ICE_PRFLX_PREF      */
+    0   /**< PJ_ICE_RELAYED_PREF    */
+};
 
 
@@ -640 +654 @@
     ice_st->ice->user_data = (void*)ice_st;
 
-#if 0
     /* If default candidate for components are SRFLX one, upload a custom
      * type priority to ICE session so that SRFLX candidates will get
@@ -649 +662 @@
             == PJ_ICE_CAND_TYPE_SRFLX)
     {
-        pj_ice_sess_set_prefs(ice_st->ice, srflx_prio);
-    }
-#endif
+        pj_ice_sess_set_prefs(ice_st->ice, srflx_pref_table);
+    }
 
     /* Add components/candidates */