Changeset 5820 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

Jul 12, 2018 8:22:31 AM (11 months ago)

Author:

nanang

Message:

Close #2126: Initial implementation of RTCP Feedback.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (17 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -97 +97 @@
     int             ebit_cnt;               /**< # of E bit transmissions   */
 };
+
 
 /**
@@ -246 +247 @@
     pj_uint32_t              rtp_rx_last_ts;        /**< Last received RTP timestamp*/
     pj_status_t              rtp_rx_last_err;       /**< Last RTP recv() error */
+
+    /* RTCP Feedback */
+    pj_bool_t                send_rtcp_fb_nack;/**< Should we send NACK?    */
+    pjmedia_rtcp_fb_nack     rtcp_fb_nack;     /**< NACK state.             */
+
+
 };
 
@@ -278 +285 @@
                              pj_bool_t with_sdes,
                              pj_bool_t with_bye,
-                             pj_bool_t with_xr);
+                             pj_bool_t with_xr,
+                             pj_bool_t with_fb);
 
 
@@ -461 +469 @@
 
     /* Send RTCP */
-    send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE);
+    send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE, PJ_FALSE);
     
     /* Update stats in case the stream is paused */
@@ -992 +1000 @@
 
 
+static pj_status_t build_rtcp_fb(pjmedia_stream *stream, void *buf,
+                                 pj_size_t *length)
+{
+    pj_status_t status;
+
+    /* Generic NACK */
+    if (stream->send_rtcp_fb_nack && stream->rtcp_fb_nack.pid >= 0)
+    {
+        status = pjmedia_rtcp_fb_build_nack(&stream->rtcp, buf, length, 1,
+                                            &stream->rtcp_fb_nack);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        /* Reset Packet ID */
+        stream->rtcp_fb_nack.pid = -1;
+    }
+
+    return PJ_SUCCESS;
+}
+
+
 static pj_status_t send_rtcp(pjmedia_stream *stream,
                              pj_bool_t with_sdes,
                              pj_bool_t with_bye,
-                             pj_bool_t with_xr)
+                             pj_bool_t with_xr,
+                             pj_bool_t with_fb)
 {
     void *sr_rr_pkt;
@@ -1009 +1039 @@
 #endif
 
-    if (with_sdes || with_bye || with_xr) {
+    if (with_sdes || with_bye || with_xr || with_fb) {
         pkt = (pj_uint8_t*) stream->out_rtcp_pkt;
         pj_memcpy(pkt, sr_rr_pkt, len);
@@ -1017 +1047 @@
         max_len = len;
     }
+
+    /* RTCP FB must be sent in compound (i.e: with RR/SR and SDES) */
+    if (with_fb)
+        with_sdes = PJ_TRUE;
 
     /* Build RTCP SDES packet */
@@ -1036 +1070 @@
     }
 
+    if (with_fb) {
+        pj_size_t fb_len = max_len - len;
+        status = build_rtcp_fb(stream, pkt+len, &fb_len);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                                     "Error generating RTCP FB"));
+        } else {
+            len += (int)fb_len;
+        }
+    }
+
     /* Build RTCP XR packet */
 #if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
@@ -1137 +1182 @@
 
         status = send_rtcp(stream, !stream->rtcp_sdes_bye_disabled, PJ_FALSE,
-                           with_xr);
+                           with_xr, PJ_FALSE);
         if (status != PJ_SUCCESS) {
             PJ_PERROR(4,(stream->port.info.name.ptr, status,
@@ -1680 +1725 @@
     const void *payload;
     unsigned payloadlen;
-    pjmedia_rtp_status seq_st;
+    pjmedia_rtp_status seq_st = {0};
     pj_status_t status;
     pj_bool_t pkt_discarded = PJ_FALSE;
@@ -2006 +2051 @@
                          pj_ntohl(hdr->ts), payloadlen, pkt_discarded);
 
+    /* RTCP-FB generic NACK */
+    if (stream->rtcp.received >= 10 && seq_st.diff > 1 &&
+        stream->send_rtcp_fb_nack && pj_ntohs(hdr->seq) >= seq_st.diff)
+    {
+        int i;
+        pj_bzero(&stream->rtcp_fb_nack, sizeof(stream->rtcp_fb_nack));
+        stream->rtcp_fb_nack.pid = pj_ntohs(hdr->seq) - seq_st.diff + 1;
+        for (i = 0; i < (seq_st.diff - 1); ++i) {
+            stream->rtcp_fb_nack.blp <<= 1;
+            stream->rtcp_fb_nack.blp |= 1;
+        }
+
+        /* Send it immediately */
+        status = send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE, PJ_TRUE);
+        if (status != PJ_SUCCESS) {
+            PJ_PERROR(4,(stream->port.info.name.ptr, status,
+                      "Error sending RTCP FB generic NACK"));
+        } else {
+            stream->initial_rr = PJ_TRUE;
+        }
+    }
+
     /* Send RTCP RR and SDES after we receive some RTP packets */
     if (stream->rtcp.received >= 10 && !stream->initial_rr) {
         status = send_rtcp(stream, !stream->rtcp_sdes_bye_disabled,
-                           PJ_FALSE, PJ_FALSE);
+                           PJ_FALSE, PJ_FALSE, PJ_FALSE);
         if (status != PJ_SUCCESS) {
             PJ_PERROR(4,(stream->port.info.name.ptr, status,
@@ -2161 +2228 @@
     PJ_ASSERT_RETURN(stream != NULL, PJ_ENOMEM);
     stream->own_pool = own_pool;
+
+    /* Duplicate stream info */
     pj_memcpy(&stream->si, info, sizeof(*info));
     pj_strdup(pool, &stream->si.fmt.encoding_name, &info->fmt.encoding_name);
     if (info->param)
         stream->si.param = pjmedia_codec_param_clone(pool, info->param);
+    pjmedia_rtcp_fb_info_dup(pool, &stream->si.loc_rtcp_fb,
+                             &info->loc_rtcp_fb);
+    pjmedia_rtcp_fb_info_dup(pool, &stream->si.rem_rtcp_fb,
+                             &info->rem_rtcp_fb);
 
     /* Init stream/port name */
@@ -2200 +2273 @@
     stream->last_dtmf = -1;
     stream->jb_last_frm = PJMEDIA_JB_NORMAL_FRAME;
+    stream->rtcp_fb_nack.pid = -1;
 
 #if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
@@ -2591 +2665 @@
 #endif
 
+    /* Check if RTCP-FB generic NACK is enabled for this codec */
+    if (stream->si.rem_rtcp_fb.cap_count) {
+        pjmedia_rtcp_fb_info *rfi = &stream->si.rem_rtcp_fb;
+        char cid[32];
+        unsigned i;
+
+        pjmedia_codec_info_to_id(&stream->si.fmt, cid, sizeof(cid));
+
+        for (i = 0; i < rfi->cap_count; ++i) {
+            if (rfi->caps[i].type == PJMEDIA_RTCP_FB_NACK &&
+                (!pj_strcmp2( &rfi->caps[i].codec_id, "*") ||
+                 !pj_stricmp2(&rfi->caps[i].codec_id, cid)))
+            {
+                stream->send_rtcp_fb_nack = PJ_TRUE;
+                break;
+            }
+        }
+    }
+
     /* Update the stream info's codec param */
     stream->si.param = &stream->codec_param;
@@ -2659 +2752 @@
     /* Send RTCP BYE (also SDES & XR) */
     if (!stream->rtcp_sdes_bye_disabled) {
-        send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_TRUE);
+        send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_TRUE, PJ_FALSE);
     }
 
@@ -3074 +3167 @@
     PJ_ASSERT_RETURN(stream, PJ_EINVAL);
 
-    return send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE);
+    return send_rtcp(stream, PJ_TRUE, PJ_FALSE, PJ_FALSE, PJ_FALSE);
 }
 
@@ -3086 +3179 @@
 
     if (stream->enc && stream->transport) {
-        return send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_FALSE);
+        return send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_FALSE, PJ_FALSE);
     }