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

Timestamp:

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

Author:

nanang

Message:

Close #2126: Initial implementation of RTCP Feedback.

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream_info.c (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia/stream_info.c

@@ -28 +28 @@
 static const pj_str_t ID_IP4 = { "IP4", 3};
 static const pj_str_t ID_IP6 = { "IP6", 3};
-static const pj_str_t ID_RTP_AVP = { "RTP/AVP", 7 };
-static const pj_str_t ID_RTP_SAVP = { "RTP/SAVP", 8 };
 //static const pj_str_t ID_SDP_NAME = { "pjmedia", 7 };
 static const pj_str_t ID_RTPMAP = { "rtpmap", 6 };
@@ -417 +415 @@
         return PJMEDIA_SDPNEG_EINVANSTP;
 
-    if (pj_stricmp(&local_m->desc.transport, &ID_RTP_AVP) == 0) {
-
-        si->proto = PJMEDIA_TP_PROTO_RTP_AVP;
-
-    } else if (pj_stristr(&local_m->desc.transport, &ID_RTP_SAVP)) {
-
-        si->proto = PJMEDIA_TP_PROTO_RTP_SAVP;
-
-    } else {
-
-        si->proto = PJMEDIA_TP_PROTO_UNKNOWN;
+    /* Get the transport protocol */
+    si->proto = pjmedia_sdp_transport_get_proto(&local_m->desc.transport);
+
+    /* Just return success if stream is not RTP/AVP compatible */
+    if (!PJMEDIA_TP_PROTO_HAS_FLAG(si->proto, PJMEDIA_TP_PROTO_RTP_AVP))
         return PJ_SUCCESS;
-    }
-
 
     /* Check address family in remote SDP */
@@ -602 +592 @@
     /* Get codec info and param */
     status = get_audio_codec_info_param(si, pool, mgr, local_m, rem_m);
+    if (status != PJ_SUCCESS)
+        return status;
 
     /* Leave SSRC to random. */
@@ -609 +601 @@
     si->jb_init = si->jb_max = si->jb_min_pre = si->jb_max_pre = -1;
 
+    /* Get local RTCP-FB info */
+    status = pjmedia_rtcp_fb_decode_sdp(pool, endpt, NULL, local, stream_idx,
+                                        &si->loc_rtcp_fb);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    /* Get remote RTCP-FB info */
+    status = pjmedia_rtcp_fb_decode_sdp(pool, endpt, NULL, remote, stream_idx,
+                                        &si->rem_rtcp_fb);
+    if (status != PJ_SUCCESS)
+        return status;
+
     return status;
 }