From e466f202b3229c07a5a0b16ff761c1a8cce47344 Mon Sep 17 00:00:00 2001 From: Olle Johansson Date: Thu, 8 Jun 2006 20:05:36 +0000 Subject: [PATCH] Avoid using the name "early media" for media that is not early git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33108 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- rtp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/rtp.c b/rtp.c index ec86d767d3..c94fd15a2a 100644 --- a/rtp.c +++ b/rtp.c @@ -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 : ""); + ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", dest->name, src ? src->name : ""); 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 : ""); + ast_log(LOG_DEBUG, "Setting early bridge SDP of '%s' with that of '%s'\n", dest->name, src ? src->name : ""); 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);