Merged revisions 308242 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r308242 | may | 2011-02-18 03:07:20 +0300 (Fri, 18 Feb 2011) | 3 lines
  
  added g729onlyA option for announce only AnnexA g.729 codec in
  h.323 capabilities. Option can be global or per user/peer.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308243 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alexandr Anikin
2011-02-18 00:11:06 +00:00
parent b79adb645e
commit ebbb2cae64
3 changed files with 31 additions and 11 deletions

View File

@@ -386,7 +386,7 @@ int ooh323c_set_capability
int ooh323c_set_capability_for_call
(ooCallData *call, struct ast_codec_pref *prefs, struct ast_format_cap *cap, int dtmf, int dtmfcodec,
int t38support)
int t38support, int g729onlyA)
{
int ret = 0, x, txframes;
struct ast_format tmpfmt;
@@ -472,17 +472,19 @@ int ooh323c_set_capability_for_call
txframes = (prefs->framing[x])/10;
if(gH323Debug)
ast_verbose("\tAdding g729 capability to call(%s, %s)\n",
ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
call->callType, call->callToken);
ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes,
ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
&ooh323c_stop_receive_channel,
&ooh323c_stop_transmit_channel);
if (g729onlyA)
continue;
if(gH323Debug)
ast_verbose("\tAdding g729A capability to call(%s, %s)\n",
ast_verbose("\tAdding g729 capability to call(%s, %s)\n",
call->callType, call->callToken);
ret= ooCallAddG729Capability(call, OO_G729A, txframes, txframes,
ret|= ooCallAddG729Capability(call, OO_G729, txframes, txframes,
OORXANDTX, &ooh323c_start_receive_channel,
&ooh323c_start_transmit_channel,
&ooh323c_stop_receive_channel,