Changeset 460 for pjproject/trunk

Timestamp:

May 20, 2006 1:01:07 PM (19 years ago)

Author:

bennylp

Message:

Set media thread in siprtp samples to highest priority to make RTCP jitter calculation as accurate as possible

File:

• pjproject/trunk/pjsip-apps/src/samples/siprtp.c (modified) (11 diffs)

pjproject/trunk/pjsip-apps/src/samples/siprtp.c

@@ -81 +81 @@
 #define THIS_FILE       "siprtp.c"
 #define MAX_CALLS       1024
-#define RTP_START_PORT  44100
+#define RTP_START_PORT  4000
 
 
@@ -368 +368 @@
         app.sip_endpt = NULL;
     }
-
-    if (app.pool) {
-        pj_pool_release(app.pool);
-        app.pool = NULL;
-        pj_caching_pool_destroy(&app.cp);
-    }
 }
 
@@ -431 +425 @@
          */
         retry = 0;
-        do {
+        status = -1;
+        for (retry=0; status!=PJ_SUCCESS && retry<100; ++retry,rtp_port+=2) {
             struct media_stream *m = &app.call[i].media[0];
 
-            ++retry;
-            rtp_port += 2;
             m->port = rtp_port;
 
@@ -466 +459 @@
             }
 
-        } while (status != PJ_SUCCESS && retry < 100);
+        }
 
         if (status != PJ_SUCCESS)
@@ -869 +862 @@
     app.thread_count = 1;
     app.sip_port = 5060;
-    app.rtp_start_port = 4000;
+    app.rtp_start_port = RTP_START_PORT;
     app.local_addr = ip_addr;
     app.log_level = 5;
@@ -1062 +1055 @@
 
 
+#if defined(PJ_WIN32) && PJ_WIN32 != 0
+#include <windows.h>
+static void boost_priority(void)
+{
+    SetPriorityClass( GetCurrentProcess(), REALTIME_PRIORITY_CLASS);
+    SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_HIGHEST);
+}
+
+#else
+#  define boost_priority()
+#endif
+
 /* 
  * Media thread 
@@ -1074 +1079 @@
     unsigned msec_interval;
     pj_timestamp freq, next_rtp, next_rtcp;
+
+
+    /* Boost thread priority if necessary */
+    boost_priority();
+
 
     msec_interval = strm->samples_per_frame * 1000 / strm->clock_rate;
@@ -1117 +1127 @@
         rc = pj_sock_select(FD_SETSIZE, &set, NULL, NULL, &timeout);
 
+        if (rc < 0) {
+            pj_thread_sleep(10);
+            continue;
+        }
+
         if (rc > 0 && PJ_FD_ISSET(strm->rtp_sock, &set)) {
 
@@ -1132 +1147 @@
             if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "RTP recv() error", status);
+                pj_thread_sleep(10);
                 continue;
             }
@@ -1164 +1180 @@
             size = sizeof(packet);
             status = pj_sock_recv( strm->rtcp_sock, packet, &size, 0);
-            if (status != PJ_SUCCESS)
+            if (status != PJ_SUCCESS) {
                 app_perror(THIS_FILE, "Error receiving RTCP packet", status);
-            else
+                pj_thread_sleep(10);
+            } else
                 pjmedia_rtcp_rx_rtcp(&strm->rtcp, packet, size);
         }
@@ -1705 +1722 @@
     
     /* Shutting down... */
+    destroy_sip();
     destroy_media();
-    destroy_sip();
+
+    if (app.pool) {
+        pj_pool_release(app.pool);
+        app.pool = NULL;
+        pj_caching_pool_destroy(&app.cp);
+    }
+
     app_logging_shutdown();