diff options
| author | Benny Prijono <bennylp@teluu.com> | 2010-10-14 08:30:57 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2010-10-14 08:30:57 +0000 |
| commit | 1263f0530a87646c17f73924481a010032a1d0a6 (patch) | |
| tree | 9157a4fd5b151001c17f6364f763d9f51afc20c7 | |
| parent | 74e3874a8ee20dfbf1c3cc86e4603131385f1a38 (diff) | |
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)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3345 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjmedia/include/pjmedia-codec/types.h | 17 | ||||
| -rw-r--r-- | pjmedia/include/pjmedia/config.h | 4 |
2 files changed, 16 insertions, 5 deletions
diff --git a/pjmedia/include/pjmedia-codec/types.h b/pjmedia/include/pjmedia-codec/types.h index b2dc41f9..90f0d534 100644 --- a/pjmedia/include/pjmedia-codec/types.h +++ b/pjmedia/include/pjmedia-codec/types.h @@ -43,13 +43,20 @@ */ 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 PJMEDIA_RTP_PT_SPEEX_NB, /**< Speex narrowband/8KHz */ @@ -83,6 +90,10 @@ enum PJMEDIA_RTP_PT_G7221C_48, /**< G722.1 Annex C (48Kbps)*/ 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. + */ }; /** diff --git a/pjmedia/include/pjmedia/config.h b/pjmedia/include/pjmedia/config.h index 05e40148..0f98633a 100644 --- a/pjmedia/include/pjmedia/config.h +++ b/pjmedia/include/pjmedia/config.h @@ -623,7 +623,7 @@ * PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR too. */ #ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS -# define PJMEDIA_RTP_PT_TELEPHONE_EVENTS 101 +# define PJMEDIA_RTP_PT_TELEPHONE_EVENTS 96 #endif @@ -632,7 +632,7 @@ * payload type. */ #ifndef PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR -# define PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR "101" +# define PJMEDIA_RTP_PT_TELEPHONE_EVENTS_STR "96" #endif |