Add support for RTP packetization in chan_jingle and chan_gtalk.
(issue #9416, phsultan) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@60011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
d6f029b4f7
commit
b2ddaaf033
|
@ -857,6 +857,9 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
|
||||||
if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
|
if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memcpy(&tmp->prefs, &client->prefs, sizeof(struct ast_codec_pref));
|
||||||
|
|
||||||
if (sid) {
|
if (sid) {
|
||||||
ast_copy_string(tmp->sid, sid, sizeof(tmp->sid));
|
ast_copy_string(tmp->sid, sid, sizeof(tmp->sid));
|
||||||
ast_copy_string(tmp->them, them, sizeof(tmp->them));
|
ast_copy_string(tmp->them, them, sizeof(tmp->them));
|
||||||
|
@ -917,6 +920,11 @@ static struct ast_channel *gtalk_new(struct gtalk *client, struct gtalk_pvt *i,
|
||||||
what = i->capability;
|
what = i->capability;
|
||||||
else
|
else
|
||||||
what = global_capability;
|
what = global_capability;
|
||||||
|
|
||||||
|
/* Set Frame packetization */
|
||||||
|
if (i->rtp)
|
||||||
|
ast_rtp_codec_setpref(i->rtp, &i->prefs);
|
||||||
|
|
||||||
tmp->nativeformats = ast_codec_choose(&i->prefs, what, 1) | (i->jointcapability & AST_FORMAT_VIDEO_MASK);
|
tmp->nativeformats = ast_codec_choose(&i->prefs, what, 1) | (i->jointcapability & AST_FORMAT_VIDEO_MASK);
|
||||||
fmt = ast_best_codec(tmp->nativeformats);
|
fmt = ast_best_codec(tmp->nativeformats);
|
||||||
|
|
||||||
|
|
|
@ -726,6 +726,9 @@ static struct jingle_pvt *jingle_alloc(struct jingle *client, const char *from,
|
||||||
if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
|
if (!(tmp = ast_calloc(1, sizeof(*tmp)))) {
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
memcpy(&tmp->prefs, &client->prefs, sizeof(tmp->prefs));
|
||||||
|
|
||||||
if (sid) {
|
if (sid) {
|
||||||
ast_copy_string(tmp->sid, sid, sizeof(tmp->sid));
|
ast_copy_string(tmp->sid, sid, sizeof(tmp->sid));
|
||||||
ast_copy_string(tmp->from, from, sizeof(tmp->from));
|
ast_copy_string(tmp->from, from, sizeof(tmp->from));
|
||||||
|
@ -777,6 +780,11 @@ static struct ast_channel *jingle_new(struct jingle *client, struct jingle_pvt *
|
||||||
what = i->capability;
|
what = i->capability;
|
||||||
else
|
else
|
||||||
what = global_capability;
|
what = global_capability;
|
||||||
|
|
||||||
|
/* Set Frame packetization */
|
||||||
|
if (i->rtp)
|
||||||
|
ast_rtp_codec_setpref(i->rtp, &i->prefs);
|
||||||
|
|
||||||
tmp->nativeformats = ast_codec_choose(&i->prefs, what, 1) | (i->jointcapability & AST_FORMAT_VIDEO_MASK);
|
tmp->nativeformats = ast_codec_choose(&i->prefs, what, 1) | (i->jointcapability & AST_FORMAT_VIDEO_MASK);
|
||||||
fmt = ast_best_codec(tmp->nativeformats);
|
fmt = ast_best_codec(tmp->nativeformats);
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,8 @@ or global level:
|
||||||
chan_skinny
|
chan_skinny
|
||||||
chan_h323
|
chan_h323
|
||||||
chan_ooh323 (Asterisk-Addons)
|
chan_ooh323 (Asterisk-Addons)
|
||||||
|
chan_gtalk
|
||||||
|
chan_jingle
|
||||||
|
|
||||||
Configuration
|
Configuration
|
||||||
-------
|
-------
|
||||||
|
|
Loading…
Reference in New Issue