Changeset 4059

Timestamp:

Apr 17, 2012 7:18:52 AM (11 years ago)

Author:

bennylp

Message:

Re #1476: for simple blocking, the bandwidth typically needs to be set to larger value than the avg_bitrage, otherwise the simple_blocking will slow down the transmission too much, causing video and audio unsync. This patch force the bandwidth to at least three times avg_bps

File:

• pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c (modified) (6 diffs)

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -46 +46 @@
 #define SIGNATURE                       PJMEDIA_SIG_PORT_VID_STREAM
 
+#define TRACE_RC                        0
+
 /* Tracing jitter buffer operations in a stream session to a CSV file.
  * The trace will contain JB operation timestamp, frame info, RTP info, and
@@ -159 +161 @@
 
     pj_timestamp             ts_freq;       /**< Timestamp frequency.       */
+
+#if TRACE_RC
+    unsigned                 rc_total_sleep;
+    unsigned                 rc_total_pkt;
+    unsigned                 rc_total_img;
+    pj_timestamp             tx_start;
+    pj_timestamp             tx_end;
+#endif
 };
 
@@ -918 +928 @@
     }
 
-#if 0
+#if TRACE_RC
     /* Trace log for rate control */
     {
         pj_timestamp end_time;
+        unsigned total_sleep;
+
         pj_get_timestamp(&end_time);
+        total_sleep = pj_elapsed_msec(&initial_time, &end_time);
         PJ_LOG(5, (stream->name.ptr, "total pkt=%d size=%d sleep=%d",
-                   pkt_cnt, total_sent,
-                   pj_elapsed_msec(&initial_time, &end_time)));
+                   pkt_cnt, total_sent, total_sleep));
+
+        if (stream->tx_start.u64 == 0)
+            stream->tx_start = initial_time;
+        stream->tx_end = end_time;
+        stream->rc_total_pkt += pkt_cnt;
+        stream->rc_total_sleep += total_sleep;
+        stream->rc_total_img++;
     }
 #endif
@@ -1458 +1477 @@
     pj_get_timestamp_freq(&stream->ts_freq);
     if (info->rc_cfg.bandwidth == 0)
-        info->rc_cfg.bandwidth = vfd_enc->max_bps * 150 / 100;
+        info->rc_cfg.bandwidth = vfd_enc->max_bps;
+
+    /* For simple blocking, need to have bandwidth large enough, otherwise
+     * we can slow down the transmission too much
+     */
+    if (info->rc_cfg.method==PJMEDIA_VID_STREAM_RC_SIMPLE_BLOCKING &&
+        info->rc_cfg.bandwidth < vfd_enc->avg_bps * 3)
+    {
+        info->rc_cfg.bandwidth = vfd_enc->avg_bps * 3;
+    }
 
     /* Override the initial framerate in the decoding direction. This initial
@@ -1474 +1502 @@
     if (status != PJ_SUCCESS)
         return status;
-
 
     /* Create encoder channel */
@@ -1631 +1658 @@
     PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);
 
+#if TRACE_RC
+    {
+        unsigned total_time;
+
+        total_time = pj_elapsed_msec(&stream->tx_start, &stream->tx_end);
+        PJ_LOG(5, (stream->name.ptr, 
+                   "RC stat: pkt_cnt=%.2f/image, sleep=%.2fms/s, fps=%.2f",
+                   stream->rc_total_pkt*1.0/stream->rc_total_img,
+                   stream->rc_total_sleep*1000.0/total_time,
+                   stream->rc_total_img*1000.0/total_time));
+    }
+#endif
+
     /* Send RTCP BYE (also SDES) */
     if (!stream->rtcp_sdes_bye_disabled) {