Mercurial > libavformat.hg
comparison sdp.c @ 5474:ff40a9607f5b libavformat
Use RTP_PT_PRIVATE in sdp.c instead of hardcoding 96.
| author | lucabe |
|---|---|
| date | Sat, 26 Dec 2009 10:59:56 +0000 |
| parents | c17cb5ef9c61 |
| children | 770a7de45356 |
comparison
equal
deleted
inserted
replaced
| 5473:c00ff770b4fc | 5474:ff40a9607f5b |
|---|---|
| 209 "indexdeltalength=3%s\r\n", | 209 "indexdeltalength=3%s\r\n", |
| 210 payload_type, c->sample_rate, c->channels, | 210 payload_type, c->sample_rate, c->channels, |
| 211 payload_type, config); | 211 payload_type, config); |
| 212 break; | 212 break; |
| 213 case CODEC_ID_PCM_S16BE: | 213 case CODEC_ID_PCM_S16BE: |
| 214 if (payload_type >= 96) | 214 if (payload_type >= RTP_PT_PRIVATE) |
| 215 av_strlcatf(buff, size, "a=rtpmap:%d L16/%d/%d\r\n", | 215 av_strlcatf(buff, size, "a=rtpmap:%d L16/%d/%d\r\n", |
| 216 payload_type, | 216 payload_type, |
| 217 c->sample_rate, c->channels); | 217 c->sample_rate, c->channels); |
| 218 break; | 218 break; |
| 219 case CODEC_ID_PCM_MULAW: | 219 case CODEC_ID_PCM_MULAW: |
| 220 if (payload_type >= 96) | 220 if (payload_type >= RTP_PT_PRIVATE) |
| 221 av_strlcatf(buff, size, "a=rtpmap:%d PCMU/%d/%d\r\n", | 221 av_strlcatf(buff, size, "a=rtpmap:%d PCMU/%d/%d\r\n", |
| 222 payload_type, | 222 payload_type, |
| 223 c->sample_rate, c->channels); | 223 c->sample_rate, c->channels); |
| 224 break; | 224 break; |
| 225 case CODEC_ID_PCM_ALAW: | 225 case CODEC_ID_PCM_ALAW: |
| 226 if (payload_type >= 96) | 226 if (payload_type >= RTP_PT_PRIVATE) |
| 227 av_strlcatf(buff, size, "a=rtpmap:%d PCMA/%d/%d\r\n", | 227 av_strlcatf(buff, size, "a=rtpmap:%d PCMA/%d/%d\r\n", |
| 228 payload_type, | 228 payload_type, |
| 229 c->sample_rate, c->channels); | 229 c->sample_rate, c->channels); |
| 230 break; | 230 break; |
| 231 case CODEC_ID_AMR_NB: | 231 case CODEC_ID_AMR_NB: |
| 255 const char *type; | 255 const char *type; |
| 256 int payload_type; | 256 int payload_type; |
| 257 | 257 |
| 258 payload_type = ff_rtp_get_payload_type(c); | 258 payload_type = ff_rtp_get_payload_type(c); |
| 259 if (payload_type < 0) { | 259 if (payload_type < 0) { |
| 260 payload_type = 96; /* FIXME: how to assign a private pt? rtp.c is broken too */ | 260 payload_type = RTP_PT_PRIVATE; /* FIXME: how to assign a private pt? rtp.c is broken too */ |
| 261 } | 261 } |
| 262 | 262 |
| 263 switch (c->codec_type) { | 263 switch (c->codec_type) { |
| 264 case CODEC_TYPE_VIDEO : type = "video" ; break; | 264 case CODEC_TYPE_VIDEO : type = "video" ; break; |
| 265 case CODEC_TYPE_AUDIO : type = "audio" ; break; | 265 case CODEC_TYPE_AUDIO : type = "audio" ; break; |