generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtp: Only choose static payload types if the sample rate and channels are right

Browse Source 
If using a different sample rate or number of channels, use a dynamic
payload type instead, where the parameters are passed in the SDP.

G722 is a special case where the normal rules don't apply.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Adriano Pallavicino 2012-07-17 09:51:13 +02:00 committed by Martin Storsjö
parent d04c5293ce
commit 999c63e4ca
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/rtp.c
View File

@ -110,9 +110,17 @@ int ff_rtp_get_payload_type(AVFormatContext *fmt, AVCodecContext *codec)
!fmt->oformat->priv_class || !fmt->oformat->priv_class ||
!av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190"))) !av_opt_flag_is_set(fmt->priv_data, "rtpflags", "rfc2190")))
continue; continue;
if (codec->codec_id == CODEC_ID_PCM_S16BE) /* G722 has 8000 as nominal rate even if the sample rate is 16000,
if (codec->channels != AVRtpPayloadTypes[i].audio_channels) * see section 4.5.2 in RFC 3551. */
continue; if (codec->codec_id == CODEC_ID_ADPCM_G722 &&
codec->sample_rate == 16000 && codec->channels == 1)
return AVRtpPayloadTypes[i].pt;
if (codec->codec_type == AVMEDIA_TYPE_AUDIO &&
((AVRtpPayloadTypes[i].clock_rate > 0 &&
codec->sample_rate != AVRtpPayloadTypes[i].clock_rate) ||
(AVRtpPayloadTypes[i].audio_channels > 0 &&
codec->channels != AVRtpPayloadTypes[i].audio_channels)))
continue;
return AVRtpPayloadTypes[i].pt; return AVRtpPayloadTypes[i].pt;
} }