Changeset 6105

Timestamp:

Nov 13, 2019 8:09:34 AM (5 years ago)

Author:

nanang

Message:

Close #1297:

• Updated PJMEDIA endpoint to rearrange dynamic payload type allocation in generating SDP for audio, the allocation arranged in pjmedia_audio_pt enumeation is no longer used.
• Updated PJMEDIA_RTP_PT_TELEPHONE_EVENTS default value to 120, so lower PT values will be used by audio codecs.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia-codec/types.h (modified) (2 diffs)
• include/pjmedia/config.h (modified) (1 diff)
• src/pjmedia/endpoint.c (modified) (9 diffs)

pjproject/trunk/pjmedia/include/pjmedia-codec/types.h

@@ -42 +42 @@
  * this library. Also see the header file <pjmedia/codec.h> for list
  * of static payload types.
+ *
+ * These enumeration is for older audio codecs only, newer audio codec using
+ * dynamic payload type can simply assign PJMEDIA_RTP_PT_DYNAMIC in its
+ * payload type (i.e: pjmedia_codec_info.pt). Endpoint will automatically
+ * rearrange dynamic payload types in SDP generation.
  */
 enum pjmedia_audio_pt
 {
     /* According to IANA specifications, dynamic payload types are to be in
-     * the range 96-127 (inclusive). This enum is structured to place the
-     * values of the payload types specified below into that range.
+     * the range 96-127 (inclusive), but this enum allows the value to be
+     * outside that range, later endpoint will rearrange dynamic payload types
+     * in SDP generation to be inside the 96-127 range and not equal to
+     * PJMEDIA_RTP_PT_TELEPHONE_EVENTS.
      *
      * PJMEDIA_RTP_PT_DYNAMIC is defined in <pjmedia/codec.h>. It is defined
      * to be 96.
-     *
-     * PJMEDIA_RTP_PT_TELEPHONE_EVENTS is defined in <pjmedia/config.h>.
-     * The default value is 96.
      */
-#if PJMEDIA_RTP_PT_TELEPHONE_EVENTS
-    PJMEDIA_RTP_PT_START = PJMEDIA_RTP_PT_TELEPHONE_EVENTS,
-#else
     PJMEDIA_RTP_PT_START = (PJMEDIA_RTP_PT_DYNAMIC-1),
-#endif
 
     PJMEDIA_RTP_PT_SPEEX_NB,                    /**< Speex narrowband/8KHz  */
@@ -109 +109 @@
     PJMEDIA_RTP_PT_L16_48KHZ_STEREO,            /**< L16 @ 48KHz, stereo    */
 #endif
-
-    /* Caution!
-     * Ensure the value of the last pt above is <= 127.
-     */
 };
 

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -845 +845 @@
 
 /**
- * This macro declares the payload type for telephone-event
+ * This macro declares the start payload type for telephone-event
  * that is advertised by PJMEDIA for outgoing SDP. If this macro
  * is set to zero, telephone events would not be advertised nor
  * supported.
- *
- * If this value is changed to other number, please update the
- * PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR too.
  */
 #ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS
-#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS          96
-#endif
-
-
-/**
- * Macro to get the string representation of the telephone-event
- * payload type.
- */
-#ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR
-#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR      "96"
+#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS          120
 #endif
 

pjproject/trunk/pjmedia/src/pjmedia/endpoint.c

@@ -421 +421 @@
     unsigned televent_num = 0;
     unsigned televent_clockrates[8];
+#endif
     unsigned used_pt_num = 0;
     unsigned used_pt[PJMEDIA_MAX_SDP_FMT];
-#endif
 
     PJ_UNUSED_ARG(options);
@@ -430 +430 @@
     PJ_ASSERT_RETURN(endpt->codec_mgr.codec_cnt <= PJMEDIA_MAX_SDP_FMT,
                      PJ_ETOOMANY);
+
+    /* Insert PJMEDIA_RTP_PT_TELEPHONE_EVENTS as used PT */
+#if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
+            PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
+    if (endpt->has_telephone_event) {
+        used_pt[used_pt_num++] = PJMEDIA_RTP_PT_TELEPHONE_EVENTS;
+    }
+#endif
 
     /* Create and init basic SDP media */
@@ -445 +453 @@
         pjmedia_codec_param codec_param;
         pj_str_t *fmt;
+        unsigned pt;
 
         if (endpt->codec_mgr.codec_desc[i].prio == PJMEDIA_CODEC_PRIO_DISABLED)
@@ -453 +462 @@
                                             &codec_param);
         fmt = &m->desc.fmt[m->desc.fmt_count++];
+        pt = codec_info->pt;
+
+        /* Rearrange dynamic payload type to make sure it is inside 96-127
+         * range and not being used by other codec/tel-event.
+         */
+        if (pt >= 96) {
+            unsigned pt_check = 96;
+            unsigned j = 0;
+            while (j < used_pt_num && pt_check <= 127) {
+                if (pt_check==used_pt[j]) {
+                    pt_check++;
+                    j = 0;
+                } else {
+                    j++;
+                }
+            }
+            if (pt_check > 127) {
+                /* No more available PT */
+                PJ_LOG(4,(THIS_FILE, "Warning: no available dynamic "
+                          "payload type for audio codec"));
+                break;
+            }
+            pt = pt_check;
+        }
+
+        /* Take a note of used dynamic PT */
+        if (pt >= 96)
+            used_pt[used_pt_num++] = pt;
 
         fmt->ptr = (char*) pj_pool_alloc(pool, 8);
-        fmt->slen = pj_utoa(codec_info->pt, fmt->ptr);
+        fmt->slen = pj_utoa(pt, fmt->ptr);
 
         rtpmap.pt = *fmt;
@@ -461 +498 @@
 
 #if defined(PJMEDIA_HANDLE_G722_MPEG_BUG) && (PJMEDIA_HANDLE_G722_MPEG_BUG != 0)
-        if (codec_info->pt == PJMEDIA_RTP_PT_G722)
+        if (pt == PJMEDIA_RTP_PT_G722)
             rtpmap.clock_rate = 8000;
         else
@@ -488 +525 @@
         }
 
-        if (codec_info->pt >= 96 || pjmedia_add_rtpmap_for_static_pt) {
+        if (pt >= 96 || pjmedia_add_rtpmap_for_static_pt) {
             pjmedia_sdp_rtpmap_to_attr(pool, &rtpmap, &attr);
             m->attr[m->attr_count++] = attr;
@@ -504 +541 @@
                                         MAX_FMTP_STR_LEN - buf_len,
                                         "%d",
-                                        codec_info->pt);
+                                        pt);
 
             for (ii = 0; ii < dec_fmtp->cnt; ++ii) {
@@ -549 +586 @@
             max_bitrate = codec_param.info.max_bps;
 
-        /* List clock rate & channel count of audio codecs for generating
-         * telephone-event later.
-         */
+        /* List clock rate of audio codecs for generating telephone-event */
 #if defined(PJMEDIA_RTP_PT_TELEPHONE_EVENTS) && \
             PJMEDIA_RTP_PT_TELEPHONE_EVENTS != 0
-        {
+        if (endpt->has_telephone_event) {
             unsigned j;
-
-            /* Take a note of used dynamic PT */
-            if (codec_info->pt >= 96)
-                used_pt[used_pt_num++] = codec_info->pt;
 
             for (j=0; j<televent_num; ++j) {
@@ -584 +615 @@
             char buf[160];
             unsigned j = 0;
-            unsigned pt = PJMEDIA_RTP_PT_TELEPHONE_EVENTS;
+            unsigned pt;
 
             /* Find PT for this tel-event */
-            while (j < used_pt_num && pt <= 127) {
-                if (pt == used_pt[j]) {
-                    pt++;
+            if (i == 0) {
+                /* First telephony-event always uses preconfigured PT
+                 * PJMEDIA_RTP_PT_TELEPHONE_EVENTS.
+                 */
+                pt = PJMEDIA_RTP_PT_TELEPHONE_EVENTS;
+            } else {
+                /* Otherwise, find any free PT slot, starting from
+                 * (PJMEDIA_RTP_PT_TELEPHONE_EVENTS + 1).
+                 */
+                pt = PJMEDIA_RTP_PT_TELEPHONE_EVENTS + 1;
+                while (j < used_pt_num && pt <= 127) {
+                    if (pt == used_pt[j]) {
+                        pt++;
+                        j = 0;
+                    } else {
+                        j++;
+                    }
+                }
+                if (pt > 127) {
+                    /* Not found? Find more, but now starting from 96 */
+                    pt = 96;
                     j = 0;
-                } else {
-                    j++;
+                    while (j < used_pt_num &&
+                           pt < PJMEDIA_RTP_PT_TELEPHONE_EVENTS)
+                    {
+                        if (pt == used_pt[j]) {
+                            pt++;
+                            j = 0;
+                        } else {
+                            j++;
+                        }
+                    }
+                    if (pt >= PJMEDIA_RTP_PT_TELEPHONE_EVENTS) {
+                        /* No more available PT */
+                        PJ_LOG(4,(THIS_FILE, "Warning: no available dynamic "
+                                  "payload type for telephone-event"));
+                        break;
+                    }
                 }
-            }
-            if (pt > 127) {
-                /* No more available PT */
-                break;
             }
             used_pt[used_pt_num++] = pt;