Changeset 497 for pjproject/trunk

Timestamp:

Jun 11, 2006 11:19:43 PM (18 years ago)

Author:

bennylp

Message:

Changed codec priority to use integer with value between 0-255 instead of enum

Location:

pjproject/trunk

Files:

• pjlib/include/pj/compat/os_linux_kernel.h (modified) (2 diffs)
• pjmedia/include/pjmedia/codec.h (modified) (6 diffs)
• pjmedia/src/pjmedia/codec.c (modified) (1 diff)

pjproject/trunk/pjlib/include/pj/compat/os_linux_kernel.h

@@ -78 +78 @@
 #define PJ_SELECT_NEEDS_NFDS        0
 
+/* Is errno a good way to retrieve OS errors?
+ * (probably no for linux kernel) 
+ * If you answer no here, you'll need to tell pjlib how to get OS
+ * error (a compile error will tell you exactly where)
+ */
+#define PJ_HAS_ERRNO_VAR            0
+
 /* This value specifies the value set in errno by the OS when a non-blocking
  * socket recv() can not return immediate daata.
@@ -115 +122 @@
 #ifndef PJ_OS_HAS_CHECK_STACK
 #   define PJ_OS_HAS_CHECK_STACK    0
+#endif
 #define PJ_TERM_HAS_COLOR           0
 #define PJ_NATIVE_STRING_IS_UNICODE 0

pjproject/trunk/pjmedia/include/pjmedia/codec.h

@@ -427 +427 @@
      * of previously highest priority codec to NEXT_HIGHER.
      */
-    PJMEDIA_CODEC_PRIO_HIGHEST = 16,
+    PJMEDIA_CODEC_PRIO_HIGHEST = 255,
 
     /**
@@ -433 +433 @@
      * codecs with this same priority.
      */
-    PJMEDIA_CODEC_PRIO_NEXT_HIGHER = 12,
+    PJMEDIA_CODEC_PRIO_NEXT_HIGHER = 254,
 
     /**
@@ -439 +439 @@
      * codec manager by codec factory.
      */
-    PJMEDIA_CODEC_PRIO_NORMAL = 8,
+    PJMEDIA_CODEC_PRIO_NORMAL = 128,
 
     /**
@@ -446 +446 @@
      * in the last place in the order.
      */
-    PJMEDIA_CODEC_PRIO_LOWEST = 4,
+    PJMEDIA_CODEC_PRIO_LOWEST = 1,
 
     /**
@@ -638 +638 @@
  * @param codec_id  The full codec ID or codec ID prefix. If an empty
  *                  string is given, it will match all codecs.
- * @param prio      Priority to be set.
+ * @param prio      Priority to be set. The priority can have any value
+ *                  between 1 to 255. When the priority is set to zero,
+ *                  the codec will be disabled.
  *
  * @return          PJ_SUCCESS if at least one codec info is found.
@@ -645 +647 @@
 pjmedia_codec_mgr_set_codec_priority(pjmedia_codec_mgr *mgr, 
                                      const pj_str_t *codec_id,
-                                     pjmedia_codec_priority prio);
+                                     pj_uint8_t prio);
 
 

pjproject/trunk/pjmedia/src/pjmedia/codec.c

@@ -310 +310 @@
 pjmedia_codec_mgr_set_codec_priority(pjmedia_codec_mgr *mgr, 
                                      const pj_str_t *codec_id,
-                                     pjmedia_codec_priority prio)
+                                     pj_uint8_t prio)
 {
     unsigned i, found = 0;