Changeset 2818 for pjproject

Timestamp:

Jun 25, 2009 1:27:02 PM (15 years ago)

Author:

bennylp

Message:

Ticket #773 (mixed fixes): backported changes from #772:

• from r2566: bug in pjsua application when reading the URL from the buddy list, causing corrupt/invalid URI to be returned. Thanks Robert Cichielo for the report.
• from r2577: Updated floating point version of math statistic to return the rounded mean value.
• from r2586: Updated stream_destroy() to call jbuf_destroy().
• from r2604: Changed var 'test' (in sdp_neg_test.c) from a global var to static var, since there was naming conflict with libg7221codec.

Location:

pjproject/branches/1.0

Files:

• pjlib/include/pj/math.h (modified) (1 diff)
• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjmedia/src/test/sdp_neg_test.c (modified) (1 diff)
• pjsip-apps/src/pjsua/pjsua_app.c (modified) (5 diffs)

pjproject/branches/1.0/pjlib/include/pj/math.h

@@ -141 +141 @@
     delta = val - stat->fmean_;
     stat->fmean_ += delta/stat->n;
-    stat->mean = (int) stat->fmean_;
+    
+    /* Return mean value with 'rounding' */
+    stat->mean = (int) (stat->fmean_ + 0.5);
 
     stat->m2_ += (int)(delta * (val-stat->fmean_));

pjproject/branches/1.0/pjmedia/src/pjmedia/stream.c

@@ -1884 +1884 @@
         stream->jb_mutex = NULL;
     }
+
+    /* Destroy jitter buffer */
+    if (stream->jb)
+        pjmedia_jbuf_destroy(stream->jb);
 
     return PJ_SUCCESS;

pjproject/branches/1.0/pjmedia/src/test/sdp_neg_test.c

@@ -40 +40 @@
 };
 
-struct test
+static struct test
 {
     const char          *title;

pjproject/branches/1.0/pjsip-apps/src/pjsua/pjsua_app.c

@@ -3132 +3132 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
                 }
 
             } else if (result.uri_result) {
-                uri = result.uri_result;
+                tmp = pj_str(result.uri_result);
+            } else {
+                tmp.slen = 0;
             }
             
-            tmp = pj_str(uri);
             pjsua_call_make_call( current_acc, &tmp, 0, NULL, NULL, NULL);
             break;
@@ -3163 +3165 @@
                 }
                 pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                uri = binfo.uri.ptr;
+                tmp.ptr = buf;
+                pj_strncpy(&tmp, &binfo.uri, sizeof(buf));
             } else {
-                uri =  result.uri_result;
+                tmp = pj_str(result.uri_result);
             }
 
@@ -3171 +3174 @@
                 pj_status_t status;
             
-                tmp = pj_str(uri);
                 status = pjsua_call_make_call(current_acc, &tmp, 0, NULL,
                                               NULL, NULL);
@@ -3209 +3211 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+                    uri = buf;
                 }
 
@@ -3772 +3776 @@
                     pjsua_buddy_info binfo;
                     pjsua_buddy_get_info(result.nb_result-1, &binfo);
-                    uri = binfo.uri.ptr;
+                    tmp.ptr = buf;
+                    pj_strncpy_with_null(&tmp, &binfo.uri, sizeof(buf));
+                    uri = buf;
                 }