virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

rtp: Simplify ff_rtp_get_payload_type

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Rafaël Carré
2011-09-26 11:56:49 -04:00
committed by Martin Storsjö
parent 9152880e95
commit 1430ae44e8
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/rtp.c
View File

@@ -92,32 +92,29 @@ int ff_rtp_get_codec_info(AVCodecContext *codec, int payload_type)
int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec) int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
{ {
int i, payload_type; int i;
AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL; AVOutputFormat *ofmt = fmt ? fmt->oformat : NULL;
/* Was the payload type already specified for the RTP muxer? */ /* Was the payload type already specified for the RTP muxer? */
if (ofmt && ofmt->priv_class) if (ofmt && ofmt->priv_class) {
payload_type = av_get_int(fmt->priv_data, "payload_type", NULL); int payload_type = av_get_int(fmt->priv_data, "payload_type", NULL);
if (payload_type >= 0) if (payload_type >= 0)
return payload_type; return payload_type;
}
/* compute the payload type */ /* static payload type */
for (payload_type = -1, i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i) for (i = 0; AVRtpPayloadTypes[i].pt >= 0; ++i)
if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) { if (AVRtpPayloadTypes[i].codec_id == codec->codec_id) {
if (codec->codec_id == CODEC_ID_H263) if (codec->codec_id == CODEC_ID_H263)
continue; continue;
if (codec->codec_id == CODEC_ID_PCM_S16BE) if (codec->codec_id == CODEC_ID_PCM_S16BE)
if (codec->channels != AVRtpPayloadTypes[i].audio_channels) if (codec->channels != AVRtpPayloadTypes[i].audio_channels)
continue; continue;
payload_type = AVRtpPayloadTypes[i].pt; return AVRtpPayloadTypes[i].pt;
} }
/* dynamic payload type */ /* dynamic payload type */
if (payload_type < 0) return RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO);
payload_type = RTP_PT_PRIVATE + (codec->codec_type == AVMEDIA_TYPE_AUDIO);
return payload_type;
} }
const char *ff_rtp_enc_name(int payload_type) const char *ff_rtp_enc_name(int payload_type)