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

Timestamp:

Nov 13, 2019 9:11:04 AM (5 years ago)

Author:

nanang

Message:

Close #1437: Video keyframe request/response using RTCP-FB PLI.

File:

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

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

@@ -1336 +1336 @@
         const pjmedia_sdp_media *m = sdp->media[i];
         const pjmedia_sdp_conn *c;
-        static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };
+        pj_uint32_t proto;
 
         /* Skip different media */
@@ -1347 +1347 @@
 
         /* Supported transports */
-        if (pj_stristr(&m->desc.transport, &ID_RTP_SAVP)) {
+        proto = pjmedia_sdp_transport_get_proto(&m->desc.transport);
+        if (PJMEDIA_TP_PROTO_HAS_FLAG(proto, PJMEDIA_TP_PROTO_RTP_SAVP))
+        {
             switch (use_srtp) {
             case PJMEDIA_SRTP_MANDATORY:
@@ -1358 +1360 @@
                 break;
             }
-        } else if (pj_stricmp2(&m->desc.transport, "RTP/AVP")==0) {
+        } else if (PJMEDIA_TP_PROTO_HAS_FLAG(proto, PJMEDIA_TP_PROTO_RTP_AVP))
+        {
             switch (use_srtp) {
             case PJMEDIA_SRTP_MANDATORY:
@@ -1482 +1485 @@
 pj_status_t on_media_event(pjmedia_event *event, void *user_data)
 {
+    char ev_name[5];
     pj_status_t status = PJ_SUCCESS;
 
     PJ_UNUSED_ARG(user_data);
+
+    pjmedia_fourcc_name(event->type, ev_name);
+    PJ_LOG(4,(THIS_FILE, "Received media event type=%s, src=%p, epub=%p",
+                         ev_name, event->src, event->epub));
 
     /* Forward the event */
@@ -1500 +1508 @@
     pjsua_call_media *call_med = (pjsua_call_media*)user_data;
     pjsua_call *call = call_med? call_med->call : NULL;
+    char ev_name[5];
     pj_status_t status = PJ_SUCCESS;
-  
+
+    pj_assert(call && call_med);
+    pjmedia_fourcc_name(event->type, ev_name);
+    PJ_LOG(5,(THIS_FILE, "Call %d: Media %d: Received media event, type=%s, "
+                         "src=%p, epub=%p",
+                         call->index, call_med->idx, ev_name,
+                         event->src, event->epub));
+
     switch(event->type) {
         case PJMEDIA_EVENT_KEYFRAME_MISSING:
@@ -2675 +2691 @@
         }
 
-        /* Add RTCP-FB info in SDP if we are offerer */
-        if (rem_sdp == NULL && acc->cfg.rtcp_fb_cfg.cap_count) {
+        /* Setup RTCP-FB */
+        {
+            pjmedia_rtcp_fb_setting rtcp_cfg;
+            pjmedia_rtcp_fb_setting_default(&rtcp_cfg);
+
+            /* Add RTCP-FB PLI if PJSUA_VID_REQ_KEYFRAME_RTCP_PLI is set */
+            if (call_med->type == PJMEDIA_TYPE_VIDEO &&
+                (call->opt.req_keyframe_method &
+                 PJSUA_VID_REQ_KEYFRAME_RTCP_PLI))
+            {
+                rtcp_cfg.cap_count = 1;
+                pj_strset2(&rtcp_cfg.caps[0].codec_id, (char*)"*");
+                rtcp_cfg.caps[0].type = PJMEDIA_RTCP_FB_NACK;
+                pj_strset2(&rtcp_cfg.caps[0].param, (char*)"pli");
+            }
+
+            /* Should we put "RTP/AVPF" in SDP?*/
+            if (rem_sdp) {
+                /* For answer, match remote offer */
+                unsigned rem_proto = 0;
+                rem_proto = pjmedia_sdp_transport_get_proto(
+                                        &rem_sdp->media[mi]->desc.transport);
+                rtcp_cfg.dont_use_avpf =
+                        !PJMEDIA_TP_PROTO_HAS_FLAG(rem_proto, 
+                                                PJMEDIA_TP_PROFILE_RTCP_FB);
+            } else {
+                /* For offer, check account setting */
+                rtcp_cfg.dont_use_avpf = acc->cfg.rtcp_fb_cfg.dont_use_avpf ||
+                                         (acc->cfg.rtcp_fb_cfg.cap_count == 0
+                                          && rtcp_cfg.cap_count == 0);
+            }
+
             status = pjmedia_rtcp_fb_encode_sdp(pool, pjsua_var.med_endpt,
-                                                &acc->cfg.rtcp_fb_cfg, sdp,
+                                                &rtcp_cfg, sdp,
                                                 mi, rem_sdp);
             if (status != PJ_SUCCESS) {
                 PJ_PERROR(3,(THIS_FILE, status,
-                             "Call %d media %d: Failed to encode RTCP-FB "
+                             "Call %d media %d: Failed to encode RTCP-FB PLI "
                              "setting to SDP",
                              call_id, mi));
+            }
+
+            /* Add any other RTCP-FB setting configured in account setting */
+            if (acc->cfg.rtcp_fb_cfg.cap_count) {
+                pj_bool_t tmp = rtcp_cfg.dont_use_avpf;
+                rtcp_cfg = acc->cfg.rtcp_fb_cfg;
+                rtcp_cfg.dont_use_avpf = tmp;
+                status = pjmedia_rtcp_fb_encode_sdp(pool, pjsua_var.med_endpt,
+                                                    &rtcp_cfg, sdp,
+                                                    mi, rem_sdp);
+                if (status != PJ_SUCCESS) {
+                    PJ_PERROR(3,(THIS_FILE, status,
+                                 "Call %d media %d: Failed to encode account "
+                                 "RTCP-FB setting to SDP",
+                                 call_id, mi));
+                }
             }
         }