Changeset 5410 for pjproject

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.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/include/pjmedia/vid_stream.h (modified) (3 diffs)
• pjmedia/src/pjmedia/vid_stream.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/include/pjsua2/account.hpp (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_core.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)
• pjsip/src/pjsua2/account.cpp (modified) (4 diffs)

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -1331 +1331 @@
 #endif
 
+/**
+ * Specify the number of keyframe needed to be sent after the stream is 
+ * created. Setting this to 0 will disable it.
+ *
+ * Default : 5
+ */
+#ifndef PJMEDIA_VID_STREAM_START_KEYFRAME_CNT
+#   define PJMEDIA_VID_STREAM_START_KEYFRAME_CNT        5
+#endif
+
+/**
+ * Specify the interval to send keyframe after the stream is created, in msec.
+ *
+ * Default : 1000
+ */
+#ifndef PJMEDIA_VID_STREAM_START_KEYFRAME_INTERVAL_MSEC
+#   define PJMEDIA_VID_STREAM_START_KEYFRAME_INTERVAL_MSEC  1000
+#endif
+
 
 /**

pjproject/trunk/pjmedia/include/pjmedia/vid_stream.h

@@ -117 +117 @@
 
 } pjmedia_vid_stream_rc_config;
+
+/**
+ * Structure of configuration settings for video stream sending keyframe 
+ * after it is created.
+ */
+typedef struct pjmedia_vid_stream_sk_config
+{
+    /**
+     * The number of keyframe to be sent after the stream is created.
+     *
+     * Default: PJMEDIA_VID_STREAM_START_KEYFRAME_CNT
+     */
+    unsigned                        count;
+
+    /**
+     * The keyframe sending interval after the stream is created.
+     *
+     * Default: PJMEDIA_VID_STREAM_START_KEYFRAME_INTERVAL_MSEC
+     */
+    unsigned                        interval;
+
+} pjmedia_vid_stream_sk_config;
 
 
@@ -166 +188 @@
     pjmedia_vid_stream_rc_config rc_cfg;
                                     /**< Stream send rate control settings. */
+
+    pjmedia_vid_stream_sk_config sk_cfg;
+                                    /**< Stream send keyframe settings.     */
 } pjmedia_vid_stream_info;
 
@@ -201 +226 @@
 PJ_DECL(void)
 pjmedia_vid_stream_rc_config_default(pjmedia_vid_stream_rc_config *cfg);
+
+/**
+ * Initialize the video stream send keyframe with default settings.
+ *
+ * @param cfg           Video stream send keyframe structure to be initialized.
+ */
+PJ_DECL(void)
+pjmedia_vid_stream_sk_config_default(pjmedia_vid_stream_sk_config *cfg);
 
 

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 */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -3307 +3307 @@
 
     /**
+     * Specify the send keyframe config for video stream.
+     *
+     * Default: see #pjmedia_vid_stream_sk_config
+     */
+    pjmedia_vid_stream_sk_config vid_stream_sk_cfg;
+
+    /**
      * Media transport config.
      */

pjproject/trunk/pjsip/include/pjsua2/account.hpp

@@ -832 +832 @@
     unsigned                    rateControlBandwidth;
 
+    /**
+     * The number of keyframe to be sent after the stream is created.
+     *
+     * Default: PJMEDIA_VID_STREAM_START_KEYFRAME_CNT
+     */
+    unsigned                        startKeyframeCount;
+
+    /**
+     * The keyframe sending interval after the stream is created.
+     *
+     * Default: PJMEDIA_VID_STREAM_START_KEYFRAME_INTERVAL_MSEC
+     */
+    unsigned                        startKeyframeInterval;
+
+
 public:
     /**

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

@@ -278 +278 @@
 #if PJMEDIA_HAS_VIDEO
     pjmedia_vid_stream_rc_config_default(&cfg->vid_stream_rc_cfg);
+    pjmedia_vid_stream_sk_config_default(&cfg->vid_stream_sk_cfg);
 #endif
     pjsua_transport_config_default(&cfg->rtp_cfg);

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -911 +911 @@
         /* Set rate control config from account setting */
         si->rc_cfg = acc->cfg.vid_stream_rc_cfg;
+
+        /* Set send keyframe config from account setting */
+        si->sk_cfg = acc->cfg.vid_stream_sk_cfg;
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0

pjproject/trunk/pjsip/src/pjsua2/account.cpp

@@ -278 +278 @@
     NODE_READ_NUM_T   ( this_node, pjmedia_vid_stream_rc_method, rateControlMethod);
     NODE_READ_UNSIGNED( this_node, rateControlBandwidth);
+    NODE_READ_UNSIGNED( this_node, startKeyframeCount);
+    NODE_READ_UNSIGNED( this_node, startKeyframeInterval);
 }
 
@@ -291 +293 @@
     NODE_WRITE_NUM_T   ( this_node, pjmedia_vid_stream_rc_method, rateControlMethod);
     NODE_WRITE_UNSIGNED( this_node, rateControlBandwidth);
+    NODE_WRITE_UNSIGNED( this_node, startKeyframeCount);
+    NODE_WRITE_UNSIGNED( this_node, startKeyframeInterval);
 }
 
@@ -434 +438 @@
     ret.vid_stream_rc_cfg.method= videoConfig.rateControlMethod;
     ret.vid_stream_rc_cfg.bandwidth = videoConfig.rateControlBandwidth;
+    ret.vid_stream_sk_cfg.count = videoConfig.startKeyframeCount;
+    ret.vid_stream_sk_cfg.interval = videoConfig.startKeyframeInterval;
 }
 
@@ -599 +605 @@
     videoConfig.rateControlMethod       = prm.vid_stream_rc_cfg.method;
     videoConfig.rateControlBandwidth    = prm.vid_stream_rc_cfg.bandwidth;
+    videoConfig.startKeyframeCount      = prm.vid_stream_sk_cfg.count;
+    videoConfig.startKeyframeInterval   = prm.vid_stream_sk_cfg.interval;
 }