Changeset 5513 for pjproject/branches/projects/uwp/pjmedia/src/pjmedia/vid_stream.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/vid_stream.c (modified) (12 diffs)

pjproject/branches/projects/uwp/pjmedia/src/pjmedia/vid_stream.c

@@ -23 +23 @@
 #include <pjmedia/rtcp.h>
 #include <pjmedia/jbuf.h>
-#include <pjmedia/stream_common.h>
 #include <pj/array.h>
 #include <pj/assert.h>
@@ -153 +152 @@
     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 
+                                                 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
@@ -439 +444 @@
     send_rtcp(stream, PJ_TRUE, PJ_FALSE);
 
+    /* Update stats in case the stream is paused */
+    stream->rtcp.stat.rtp_tx_last_seq = pj_ntohs(stream->enc->rtp.out_hdr.seq);
+
 #elif PJMEDIA_STREAM_ENABLE_KA == PJMEDIA_STREAM_KA_USER
 
@@ -608 +616 @@
     if (bytes_read < 0) {
         status = (pj_status_t)-bytes_read;
+        if (status == PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            return;
+        }
         if (stream->rtp_rx_last_err != status) {
             char errmsg[PJ_ERR_MSG_SIZE];
@@ -787 +798 @@
     /* Check for errors */
     if (bytes_read < 0) {
-        LOGERR_((stream->cname.ptr, "RTCP recv() error", 
-                 (pj_status_t)-bytes_read));
+        if (bytes_read != -PJ_STATUS_FROM_OS(OSERR_EWOULDBLOCK)) {
+            LOGERR_((stream->cname.ptr, "RTCP recv() error",
+                    (pj_status_t)-bytes_read));
+        }
         return;
     }
@@ -810 +823 @@
     unsigned pkt_cnt = 0;
     pj_timestamp initial_time;
+    pj_timestamp null_ts ={0};
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA != 0
@@ -846 +860 @@
     frame_out.size = 0;
 
+    /* Check if need to send keyframe. */
+    if (stream->num_keyframe && 
+        (pj_cmp_timestamp(&null_ts, &stream->last_keyframe_tx) != 0)) 
+    {   
+        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;
+            --stream->num_keyframe;             
+        }
+    }
+
     /* Init encoding option */
     pj_bzero(&enc_opt, sizeof(enc_opt));
@@ -874 +906 @@
     
     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 */
@@ -1385 +1424 @@
     char *p;
     pj_status_t status;
+    pjmedia_transport_attach_param att_param;
 
     if (!pool) {
@@ -1455 +1495 @@
     stream->use_ka = info->use_ka;
 #endif
+    stream->num_keyframe = info->sk_cfg.count;
 
     /* Build random RTCP CNAME. CNAME has user@host format */
@@ -1625 +1666 @@
 
     stream->out_rtcp_pkt = pj_pool_alloc(pool, stream->out_rtcp_pkt_size);
+    att_param.stream = stream;
+    att_param.media_type = PJMEDIA_TYPE_VIDEO;
+    att_param.user_data = stream;
+    pj_sockaddr_cp(&att_param.rem_addr, &info->rem_addr);
+    pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
+    att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);
+    att_param.rtp_cb = &on_rx_rtp;
+    att_param.rtcp_cb = &on_rx_rtcp;
 
     /* Only attach transport when stream is ready. */
-    status = pjmedia_transport_attach(tp, stream, &info->rem_addr, 
-                                      &info->rem_rtcp, 
-                                      pj_sockaddr_get_len(&info->rem_addr), 
-                                      &on_rx_rtp, &on_rx_rtcp);
+    status = pjmedia_transport_attach2(tp, &att_param);
     if (status != PJ_SUCCESS)
         return status;
@@ -2005 +2051 @@
 
 
+/*
+ * 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;
+}
+
+
+/**
+ * Get RTP session information from video stream.
+ */
+PJ_DEF(pj_status_t)
+pjmedia_vid_stream_get_rtp_session_info(pjmedia_vid_stream *stream,
+                                    pjmedia_stream_rtp_sess_info *session_info)
+{
+    session_info->rx_rtp = &stream->dec->rtp;
+    session_info->tx_rtp = &stream->enc->rtp;
+    session_info->rtcp = &stream->rtcp;
+    return PJ_SUCCESS;
+}
+
+
 #endif /* PJMEDIA_HAS_VIDEO */