kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 18:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "rtp_engine: Init a format-attribute module to its RFC defaults."

Browse Source
This commit is contained in:
Matt Jordan
2015-11-11 08:19:39 -06:00
committed by Gerrit Code Review
parent 21ee2f029c 525c7ab780
commit c1abe8906d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/rtp_engine.c
View File

@@ -973,9 +973,13 @@ int ast_rtp_codecs_payloads_set_rtpmap_type_rate(struct ast_rtp_codecs *codecs,
if (t->payload_type.asterisk_format if (t->payload_type.asterisk_format
&& ast_format_cmp(t->payload_type.format, ast_format_g726) == AST_FORMAT_CMP_EQUAL && ast_format_cmp(t->payload_type.format, ast_format_g726) == AST_FORMAT_CMP_EQUAL
&& (options & AST_RTP_OPT_G726_NONSTANDARD)) { && (options & AST_RTP_OPT_G726_NONSTANDARD)) {
new_type->format = ao2_bump(ast_format_g726_aal2); new_type->format = ast_format_g726_aal2;
} else { } else {
new_type->format = ao2_bump(t->payload_type.format); new_type->format = t->payload_type.format;
}
if (new_type->format) {
/* SDP parsing automatically increases the reference count */
new_type->format = ast_format_parse_sdp_fmtp(new_type->format, "");
} }
if (pt < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) { if (pt < AST_VECTOR_SIZE(&codecs->payload_mapping_tx)) {