Changeset 3345

Timestamp:

Oct 14, 2010 8:30:57 AM (14 years ago)

Author:

bennylp

Message:

Misc (re #1134): changed dynamic payload type starting value for internal codecs to 96 (from 101) as we are running out of constants. Also added more comments to clarify the restriction on the value, i.e. it must be less than 128 (thanks Robbie Hanson for the suggestion)

Location:

pjproject/trunk/pjmedia/include

Files:

• pjmedia-codec/types.h (modified) (2 diffs)
• pjmedia/config.h (modified) (2 diffs)

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

@@ -44 +44 @@
 enum
 {
-    /* PJMEDIA_RTP_PT_TELEPHONE_EVENTS is declared in
-     * <pjmedia/config.h>
+    /* 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.
+     *
+     * 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 = 102,
+    PJMEDIA_RTP_PT_START = (PJMEDIA_RTP_PT_DYNAMIC-1),
 #endif
 
@@ -84 +91 @@
     PJMEDIA_RTP_PT_G7221_RSV1,                  /**< G722.1 reserve         */
     PJMEDIA_RTP_PT_G7221_RSV2,                  /**< G722.1 reserve         */
+
+    /* Caution!
+     * Ensure the value of the last pt above is <= 127.
+     */
 };
 

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

@@ -624 +624 @@
  */
 #ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS
-#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS          101
+#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS          96
 #endif
 
@@ -633 +633 @@
  */
 #ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR
-#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR      "101"
+#   define PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR      "96"
 #endif