Changeset 5820 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

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

Author:

nanang

Message:

Close #2126: Initial implementation of RTCP Feedback.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (5 diffs)

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

@@ -2258 +2258 @@
     pj_sockaddr origin;
     pjsua_call *call = &pjsua_var.calls[call_id];
+    pjsua_acc *acc = &pjsua_var.acc[call->acc_id];
     pjmedia_sdp_neg_state sdp_neg_state = PJMEDIA_SDP_NEG_STATE_NULL;
     unsigned mi;
@@ -2484 +2485 @@
             }
         }
+
+        /* Add RTCP-FB info in SDP if we are offerer */
+        if (rem_sdp == NULL && acc->cfg.rtcp_fb_cfg.cap_count) {
+            status = pjmedia_rtcp_fb_encode_sdp(pool, pjsua_var.med_endpt,
+                                                &acc->cfg.rtcp_fb_cfg, sdp,
+                                                mi, rem_sdp);
+            if (status != PJ_SUCCESS) {
+                PJ_PERROR(3,(THIS_FILE, status,
+                             "Call %d media %d: Failed to encode RTCP-FB "
+                             "setting to SDP",
+                             call_id, mi));
+            }
+        }
     }
 
@@ -2529 +2543 @@
         sdp->bandw[sdp->bandw_count++] = b;
     }
-
 
 #if DISABLED_FOR_TICKET_1185 && defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
@@ -2961 +2974 @@
 #endif
 
-    /* Applying media count limitation. Note that in generating SDP answer,
-     * no media count limitation applied, as we didn't know yet which media
-     * would pass the SDP negotiation.
+    /* We need to re-nego SDP or modify our answer when:
+     * - media count exceeds the configured limit,
+     * - RTCP-FB is enabled (so a=rtcp-fb will only be printed for negotiated
+     *   codecs)
      */
-    if (maudcnt > call->opt.aud_cnt || mvidcnt > call->opt.vid_cnt)
+    if (!pjmedia_sdp_neg_was_answer_remote(call->inv->neg) &&
+        ((maudcnt > call->opt.aud_cnt || mvidcnt > call->opt.vid_cnt) ||
+        (acc->cfg.rtcp_fb_cfg.cap_count)))
     {
-        pjmedia_sdp_session *local_sdp2;
-
-        maudcnt = PJ_MIN(maudcnt, call->opt.aud_cnt);
-        mvidcnt = PJ_MIN(mvidcnt, call->opt.vid_cnt);
-        local_sdp2 = pjmedia_sdp_session_clone(tmp_pool, local_sdp);
-
-        for (mi=0; mi < local_sdp2->media_count; ++mi) {
-            pjmedia_sdp_media *m = local_sdp2->media[mi];
-
-            if (m->desc.port == 0 ||
-                pj_memchr(maudidx, mi, maudcnt*sizeof(maudidx[0])) ||
-                pj_memchr(mvididx, mi, mvidcnt*sizeof(mvididx[0])))
-            {
-                continue;
-            }
-            
-            /* Deactivate this media */
-            pjmedia_sdp_media_deactivate(tmp_pool, m);
-        }
-
-        local_sdp = local_sdp2;
+        pjmedia_sdp_session *local_sdp_renego = NULL;
+
+        local_sdp_renego = pjmedia_sdp_session_clone(tmp_pool, local_sdp);
+        local_sdp = local_sdp_renego;
         need_renego_sdp = PJ_TRUE;
+
+        /* Add RTCP-FB info into local SDP answer */
+        if (acc->cfg.rtcp_fb_cfg.cap_count) {
+            for (mi=0; mi < local_sdp_renego->media_count; ++mi) {
+                status = pjmedia_rtcp_fb_encode_sdp(
+                                        tmp_pool, pjsua_var.med_endpt,
+                                        &acc->cfg.rtcp_fb_cfg,
+                                        local_sdp_renego, mi, remote_sdp);
+                if (status != PJ_SUCCESS) {
+                    PJ_PERROR(3,(THIS_FILE, status,
+                                 "Call %d media %d: Failed to encode RTCP-FB "
+                                 "setting to SDP",
+                                 call_id, mi));
+                }
+            }
+        }
+
+        /* Applying media count limitation. Note that in generating SDP
+         * answer, no media count limitation applied as we didn't know yet
+         * which media would pass the SDP negotiation.
+         */
+        if (maudcnt > call->opt.aud_cnt || mvidcnt > call->opt.vid_cnt)
+        {
+            maudcnt = PJ_MIN(maudcnt, call->opt.aud_cnt);
+            mvidcnt = PJ_MIN(mvidcnt, call->opt.vid_cnt);
+
+            for (mi=0; mi < local_sdp_renego->media_count; ++mi) {
+                pjmedia_sdp_media *m = local_sdp_renego->media[mi];
+
+                if (m->desc.port == 0 ||
+                    pj_memchr(maudidx, mi, maudcnt*sizeof(maudidx[0])) ||
+                    pj_memchr(mvididx, mi, mvidcnt*sizeof(mvididx[0])))
+                {
+                    continue;
+                }
+            
+                /* Deactivate this excess media */
+                pjmedia_sdp_media_deactivate(tmp_pool, m);
+            }
+        }
     }
 
@@ -3389 +3428 @@
               sizeof(call->media_prov[0]) * call->med_prov_cnt);
 
-    /* Perform SDP re-negotiation if some media have just got disabled
-     * in this function due to media count limit settings.
-     */
+    /* Perform SDP re-negotiation. */
     if (got_media && need_renego_sdp) {
         pjmedia_sdp_neg *neg = call->inv->neg;
 
-        /* This should only happen when we are the answerer. */
-        PJ_ASSERT_RETURN(neg && !pjmedia_sdp_neg_was_answer_remote(neg),
-                         PJMEDIA_SDPNEG_EINSTATE);
-        
         status = pjmedia_sdp_neg_set_remote_offer(tmp_pool, neg, remote_sdp);
         if (status != PJ_SUCCESS)