kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 15:29:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to reflect recent rtp changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@41272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-08-29 13:55:54 +00:00
parent 1627052cf1
commit 6aae631cc9
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/chan_jingle.c
View File

@@ -185,7 +185,7 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from,
/*----- RTP interface functions */ /*----- RTP interface functions */
static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp, static int jingle_set_rtp_peer(struct ast_channel *chan, struct ast_rtp *rtp,
struct ast_rtp *vrtp, int codecs, int nat_active); struct ast_rtp *vrtp, int codecs, int nat_active);
static struct ast_rtp *jingle_get_rtp_peer(struct ast_channel *chan); static enum ast_rtp_get_result jingle_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp);
static int jingle_get_codec(struct ast_channel *chan); static int jingle_get_codec(struct ast_channel *chan);
/*! \brief PBX interface structure for channel registration */ /*! \brief PBX interface structure for channel registration */
@@ -405,18 +405,22 @@ static int jingle_answer(struct ast_channel *ast)
return res; return res;
} }
static struct ast_rtp *jingle_get_rtp_peer(struct ast_channel *chan) static enum ast_rtp_get_result jingle_get_rtp_peer(struct ast_channel *chan, struct ast_rtp **rtp)
{ {
struct jingle_pvt *p = chan->tech_pvt; struct jingle_pvt *p = chan->tech_pvt;
struct ast_rtp *rtp = NULL; enum ast_rtp_get_result res = AST_RTP_GET_FAILED;
if (!p) if (!p)
return NULL; return res;
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
if (p->rtp) if (p->rtp) {
rtp = p->rtp; *rtp = p->rtp;
res = AST_RTP_TRY_NATIVE;
}
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
return rtp;
return res;
} }
static int jingle_get_codec(struct ast_channel *chan) static int jingle_get_codec(struct ast_channel *chan)