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

chan_pjsip: Update media translation paths when new SDP negotiated.

Browse Source 
On a SIP reinvite that changes media strams, the PJSIP channel driver was
flooding the log with "Asked to transmit frame type %s, while native
formats is %s" warnings.

* Fixes PJSIP not setting up translation paths when the formats change on
a reinvite.  AFS-63 was effectively reintroduced because of the media
formats work.  res_pjsip_sdp_rtp.c:set_caps()

* Improved the unexpected frame format WARNING message to include more
information.

* Added protective locking while altering formats on a channel.  Reworked
set_format() to simplify and protect the formats under manipulation.

* Restored some code that got lost in the media_formats work.
(channel.c:set_format() and res_pjsip_sdp_rtp.c:set_caps())

AFS-137 #close
Reported by: Mark Michelson

Review: https://reviewboard.asterisk.org/r/3906/


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@421645 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2014-08-20 22:49:32 +00:00
parent ab526502e6
commit e8b72c6f4b
6 changed files with 109 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/bridge.c
View File

@@ -939,12 +939,14 @@ int ast_bridge_destroy(struct ast_bridge *bridge, int cause)
static int bridge_make_compatible(struct ast_bridge *bridge, struct ast_bridge_channel *bridge_channel)
{
struct ast_str *codec_buf = ast_str_alloca(64);
struct ast_format *read_format;
struct ast_format *write_format;
struct ast_format *best_format;
RAII_VAR(struct ast_format *, read_format, NULL, ao2_cleanup);
RAII_VAR(struct ast_format *, write_format, NULL, ao2_cleanup);
read_format = ast_channel_readformat(bridge_channel->chan);
write_format = ast_channel_writeformat(bridge_channel->chan);
ast_channel_lock(bridge_channel->chan);
read_format = ao2_bump(ast_channel_readformat(bridge_channel->chan));
write_format = ao2_bump(ast_channel_writeformat(bridge_channel->chan));
ast_channel_unlock(bridge_channel->chan);
/* Are the formats currently in use something this bridge can handle? */
if (ast_format_cap_iscompatible_format(bridge->technology->format_capabilities, read_format) == AST_FORMAT_CMP_NOT_EQUAL) {