diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-09-05 16:24:19 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-09-05 16:24:19 +0000 |
| commit | be500bbafbb5c116997c5746a6156f32b7f5bd85 (patch) | |
| tree | 6ac590966e72500c58c16a5f8edb7c4e950ff383 /main/rtp_engine.c | |
| parent | a7391a37c119c408c3c6307d412169242257b711 (diff) | |
Re-fix sending unnegotiated payloads during a P2P RTP bridge.
The previous fix still would look in the static_RTP_PT table, which
is inappropriate since we specifically want to find a codec that has
been negotiated.
(closes issue ASTERISK-20296)
reported by NITESH BANSAL
Patches:
codec_negotiation.patch Uploaded by NITESH BANSAL (License #6418)
........
Merged revisions 372311 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372319 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/rtp_engine.c')
| -rw-r--r-- | main/rtp_engine.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 4861387e3..90e1abb45 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -762,7 +762,21 @@ int ast_rtp_codecs_payload_code(struct ast_rtp_codecs *codecs, int asterisk_form return res; } +int ast_rtp_codecs_find_payload_code(struct ast_rtp_codecs *codecs, int code) +{ + struct ast_rtp_payload_type *type; + int res = -1; + + /* Search the payload type in the codecs passed */ + if ((type = ao2_find(codecs->payloads, &code, OBJ_NOLOCK | OBJ_KEY))) + { + res = type->payload; + ao2_ref(type, -1); + return res; + } + return res; +} const char *ast_rtp_lookup_mime_subtype2(const int asterisk_format, struct ast_format *format, int code, enum ast_rtp_options options) { int i; |