Changeset 5410 for pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Aug 5, 2016 7:26:18 AM (8 years ago)

Author:

riza

Message:

Re #1910: Implement option to regularly send video keyframe in the beginning of video call session.

File:

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

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

@@ -155 +155 @@
 
     pj_bool_t                force_keyframe;/**< Forced to encode keyframe? */
+    unsigned                 num_keyframe;  /**< The number of keyframe needed 
+                                                 to be sent, after the stream
+                                                 is created. */
+    pj_timestamp             last_keyframe_tx;  
+                                            /**< Timestamp of the last 
+                                                 keyframe. */
+
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
@@ -851 +858 @@
     frame_out.size = 0;
 
+    /* Check if need to send keyframe. */
+    if (stream->num_keyframe) {
+        unsigned elapse_time;
+        pj_timestamp now;
+
+        pj_get_timestamp(&now);
+
+        elapse_time = pj_elapsed_msec(&stream->last_keyframe_tx, &now);
+
+        if (elapse_time > stream->info.sk_cfg.interval)
+        {
+            stream->force_keyframe = PJ_TRUE;
+            if (--stream->num_keyframe)
+                stream->last_keyframe_tx = now;
+        }
+    }
+
     /* Init encoding option */
     pj_bzero(&enc_opt, sizeof(enc_opt));
@@ -1460 +1484 @@
     stream->use_ka = info->use_ka;
 #endif
+    stream->num_keyframe = info->sk_cfg.count;
 
     /* Build random RTCP CNAME. CNAME has user@host format */
@@ -2010 +2035 @@
 
 
+/*
+ * Initialize the video stream send keyframe with default settings.
+ */
+PJ_DEF(void)
+pjmedia_vid_stream_sk_config_default(pjmedia_vid_stream_sk_config *cfg)
+{
+    pj_bzero(cfg, sizeof(*cfg));
+    cfg->count = PJMEDIA_VID_STREAM_START_KEYFRAME_CNT;
+    cfg->interval = PJMEDIA_VID_STREAM_START_KEYFRAME_INTERVAL_MSEC;
+}
+
+
 #endif /* PJMEDIA_HAS_VIDEO */