Changeset 3841 for pjproject/trunk/pjmedia/src/test/jbuf_test.c

Timestamp:

Oct 24, 2011 9:28:13 AM (13 years ago)

Author:

ming

Message:

Re #1395: Backport of PJSIP 1.x branch into PJSIP 2.0 trunk

• Backport of r3557:r3832

TODO: ticket #1268 (Option for automatic/manual sending of RTCP SDES/BYE for the stream) for video stream.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/test/jbuf_test.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/test/jbuf_test.c

@@ -44 +44 @@
     int lost;
     int empty;
-    int delay;      /**< Maximum delay, in frames.          */
+    int delay;      /**< Average delay, in frames.          */
+    int delay_min;  /**< Minimum delay, in frames.          */
 } test_cond_t;
 
@@ -70 +71 @@
         else if (pj_ansi_stricmp(cond_st, "delay") == 0)
             cond->delay = cond_val;
+        else if (pj_ansi_stricmp(cond_st, "delay_min") == 0)
+            cond->delay_min = cond_val;
         else if (pj_ansi_stricmp(cond_st, "discard") == 0)
             cond->discard = cond_val;
@@ -218 +221 @@
         cond.burst = -1;
         cond.delay = -1;
+        cond.delay_min = -1;
         cond.discard = -1;
         cond.empty = -1;
@@ -314 +318 @@
             rc |= 2;
         }
+        if (cond.delay_min >= 0 && (int)state.min_delay/JB_PTIME > cond.delay_min) {
+            printf("! 'Minimum delay' should be %d, it is %d\n", 
+                   cond.delay_min, state.min_delay/JB_PTIME);
+            rc |= 32;
+        }
         if (cond.discard >= 0 && (int)state.discard > cond.discard) {
             printf("! 'Discard' should be %d, it is %d\n",