diff options
author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 20:05:36 +0000 |
---|---|---|
committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-08 20:05:36 +0000 |
commit | 91ed8b4036d685608fe2d0d961531432e2b47345 (patch) | |
tree | c88f550f5c55560a8f60a58821b5708250589b89 /rtp.c | |
parent | 6715c9fa2cb4be1cebcb8b75de0d9c675143a8f4 (diff) |
Avoid using the name "early media" for media that is not early
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@33108 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'rtp.c')
-rw-r--r-- | rtp.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1221,6 +1221,7 @@ int ast_rtp_early_media(struct ast_channel *dest, struct ast_channel *src) struct ast_rtp *vdestp, *vsrcp=NULL; /* Video RTP channels */ struct ast_rtp_protocol *destpr, *srcpr=NULL; int srccodec; + /* Lock channels */ ast_channel_lock(dest); if (src) { @@ -1275,14 +1276,14 @@ int ast_rtp_early_media(struct ast_channel *dest, struct ast_channel *src) /* Consider empty media as non-existant */ if (srcp && !srcp->them.sin_addr.s_addr) srcp = NULL; - /* Bridge early media */ + /* Bridge media early */ if (destpr->set_rtp_peer(dest, srcp, vsrcp, srccodec, srcp ? ast_test_flag(srcp, FLAG_NAT_ACTIVE) : 0)) - ast_log(LOG_WARNING, "Channel '%s' failed to send early media to '%s'\n", dest->name, src ? src->name : "<unspecified>"); + ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", dest->name, src ? src->name : "<unspecified>"); ast_channel_unlock(dest); if (src) ast_channel_unlock(src); if (option_debug) - ast_log(LOG_DEBUG, "Setting early media SDP of '%s' with that of '%s'\n", dest->name, src ? src->name : "<unspecified>"); + ast_log(LOG_DEBUG, "Setting early bridge SDP of '%s' with that of '%s'\n", dest->name, src ? src->name : "<unspecified>"); return 1; } @@ -1339,9 +1340,9 @@ int ast_rtp_make_compatible(struct ast_channel *dest, struct ast_channel *src, i else srccodec = 0; if (media) { - /* Bridge early media */ + /* Bridge early */ if (destpr->set_rtp_peer(dest, srcp, vsrcp, srccodec, ast_test_flag(srcp, FLAG_NAT_ACTIVE))) - ast_log(LOG_WARNING, "Channel '%s' failed to send early media to '%s'\n", dest->name, src->name); + ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", dest->name, src->name); } ast_channel_unlock(dest); ast_channel_unlock(src); |