diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-31 18:25:12 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:36 -0300 |
| commit | 620d151e5cb095c3406a06a476d4b0bfaf7f0182 (patch) | |
| tree | 00dd1eca8d72cf227247ec0ca6a071c7157f3505 /libavformat/rtp.c | |
| parent | b76e878f5b64587afa584e16ed8353c26d9cf10f (diff) | |
rtp: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/rtp.c')
| -rw-r--r-- | libavformat/rtp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavformat/rtp.c b/libavformat/rtp.c index c536a6f082..564489b613 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -77,8 +77,11 @@ int ff_rtp_get_codec_info(AVCodecParameters *par, int payload_type) if (rtp_payload_types[i].codec_id != AV_CODEC_ID_NONE) { par->codec_type = rtp_payload_types[i].codec_type; par->codec_id = rtp_payload_types[i].codec_id; - if (rtp_payload_types[i].audio_channels > 0) - par->channels = rtp_payload_types[i].audio_channels; + if (rtp_payload_types[i].audio_channels > 0) { + av_channel_layout_uninit(&par->ch_layout); + par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + par->ch_layout.nb_channels = rtp_payload_types[i].audio_channels; + } if (rtp_payload_types[i].clock_rate > 0) par->sample_rate = rtp_payload_types[i].clock_rate; return 0; @@ -111,13 +114,13 @@ int ff_rtp_get_payload_type(const AVFormatContext *fmt, /* G722 has 8000 as nominal rate even if the sample rate is 16000, * see section 4.5.2 in RFC 3551. */ if (par->codec_id == AV_CODEC_ID_ADPCM_G722 && - par->sample_rate == 16000 && par->channels == 1) + par->sample_rate == 16000 && par->ch_layout.nb_channels == 1) return rtp_payload_types[i].pt; if (par->codec_type == AVMEDIA_TYPE_AUDIO && ((rtp_payload_types[i].clock_rate > 0 && par->sample_rate != rtp_payload_types[i].clock_rate) || (rtp_payload_types[i].audio_channels > 0 && - par->channels != rtp_payload_types[i].audio_channels))) + par->ch_layout.nb_channels != rtp_payload_types[i].audio_channels))) continue; return rtp_payload_types[i].pt; } |