Changeset 5411 for pjproject

Timestamp:

Aug 5, 2016 1:06:14 PM (8 years ago)

Author:

riza

Message:

Re #1910: Send the additional keyframe only after the initial one.

File:

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

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

@@ -153 +153 @@
     pjmedia_frame           *rx_frames;     /**< Temp. buffer for incoming
                                                  frame assembly.            */
-
     pj_bool_t                force_keyframe;/**< Forced to encode keyframe? */
     unsigned                 num_keyframe;  /**< The number of keyframe needed 
@@ -822 +821 @@
     unsigned pkt_cnt = 0;
     pj_timestamp initial_time;
+    pj_timestamp null_ts ={0};
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
@@ -859 +859 @@
 
     /* Check if need to send keyframe. */
-    if (stream->num_keyframe) {
+    if (stream->num_keyframe && 
+        (pj_cmp_timestamp(&null_ts, &stream->last_keyframe_tx) != 0)) 
+    {   
         unsigned elapse_time;
         pj_timestamp now;
@@ -870 +872 @@
         {
             stream->force_keyframe = PJ_TRUE;
-            if (--stream->num_keyframe)
-                stream->last_keyframe_tx = now;
+            --stream->num_keyframe;             
         }
     }
@@ -903 +904 @@
     
     pj_get_timestamp(&initial_time);
+
+    if ((stream->num_keyframe) && 
+        ((frame_out.bit_info & PJMEDIA_VID_FRM_KEYFRAME) 
+                                                  == PJMEDIA_VID_FRM_KEYFRAME)) 
+    {
+        stream->last_keyframe_tx = initial_time;
+    }
 
     /* Loop while we have frame to send */