Changeset 421

Timestamp:

Apr 29, 2006 8:23:37 AM (17 years ago)

Author:

bennylp

Message:

Fixed bugs in codec priority sorting

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/codec.h (modified) (5 diffs)
• src/pjmedia/endpoint.c (modified) (4 diffs)

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

@@ -388 +388 @@
      * of previously highest priority codec to NEXT_HIGHER.
      */
-    PJMEDIA_CODEC_PRIO_HIGHEST,
+    PJMEDIA_CODEC_PRIO_HIGHEST = 16,
 
     /**
@@ -394 +394 @@
      * codecs with this same priority.
      */
-    PJMEDIA_CODEC_PRIO_NEXT_HIGHER,
+    PJMEDIA_CODEC_PRIO_NEXT_HIGHER = 12,
 
     /**
@@ -400 +400 @@
      * codec manager by codec factory.
      */
-    PJMEDIA_CODEC_PRIO_NORMAL,
+    PJMEDIA_CODEC_PRIO_NORMAL = 8,
 
     /**
@@ -407 +407 @@
      * in the last place in the order.
      */
-    PJMEDIA_CODEC_PRIO_LOWEST,
+    PJMEDIA_CODEC_PRIO_LOWEST = 4,
 
     /**
@@ -416 +416 @@
      * query functions.
      */
-    PJMEDIA_CODEC_PRIO_DISABLED,
+    PJMEDIA_CODEC_PRIO_DISABLED = 0,
 };
 

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -407 +407 @@
 
 
+
+#if PJ_LOG_MAX_LEVEL >= 3
+static const char *good_number(char *buf, pj_int32_t val)
+{
+    if (val < 1000) {
+        pj_ansi_sprintf(buf, "%d", val);
+    } else if (val < 1000000) {
+        pj_ansi_sprintf(buf, "%d.%dK", 
+                        val / 1000,
+                        (val % 1000) / 100);
+    } else {
+        pj_ansi_sprintf(buf, "%d.%02dM", 
+                        val / 1000000,
+                        (val % 1000000) / 10000);
+    }
+
+    return buf;
+}
+#endif
+
 PJ_DEF(pj_status_t) pjmedia_endpt_dump(pjmedia_endpt *endpt)
 {
@@ -428 +448 @@
         const char *type;
         pjmedia_codec_param param;
+        char bps[16];
 
         switch (codec_info[i].type) {
@@ -446 +467 @@
 
         PJ_LOG(3,(THIS_FILE, 
-                  "   %s codec #%2d: pt=%d (%.*s @%dKHz/%d, %d bps, ptime=%d ms, vad=%d, cng=%d)", 
+                  "   %s codec #%2d: pt=%d (%.*s @%dKHz/%d, %sbps, ptime=%d ms, vad=%d, cng=%d)", 
                   type, i, codec_info[i].pt,
                   (int)codec_info[i].encoding_name.slen,
@@ -452 +473 @@
                   codec_info[i].clock_rate/1000,
                   codec_info[i].channel_cnt,
-                  param.avg_bps, param.ptime,
+                  good_number(bps, param.avg_bps), 
+                  param.ptime,
                   param.vad,
                   param.cng));