diff options
| author | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-21 18:48:53 +0000 |
|---|---|---|
| committer | pcadach <pcadach@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-21 18:48:53 +0000 |
| commit | 3d1a3d4296f43623be6b937592016119822b6b67 (patch) | |
| tree | 294862161e1fa9ad9388433e795a8297fc38a729 /channels/h323/ast_h323.cxx | |
| parent | 75a0997a67044612baca0101c33d94d2726e341e (diff) | |
Introduce Cisco G.726-32 capability (g726aal2 form)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43429 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323/ast_h323.cxx')
| -rw-r--r-- | channels/h323/ast_h323.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/channels/h323/ast_h323.cxx b/channels/h323/ast_h323.cxx index 55af0d216..63b1f1859 100644 --- a/channels/h323/ast_h323.cxx +++ b/channels/h323/ast_h323.cxx @@ -1259,6 +1259,7 @@ BOOL MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCa unsigned int asterisk_codec; unsigned int h245_cap; const char *oid; + const char *formatName; }; static const struct __codec__ codecs[] = { { AST_FORMAT_G723_1, H245_AudioCapability::e_g7231 }, @@ -1267,6 +1268,7 @@ BOOL MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCa { AST_FORMAT_ALAW, H245_AudioCapability::e_g711Alaw64k }, { AST_FORMAT_G729A, H245_AudioCapability::e_g729AnnexA }, { AST_FORMAT_G729A, H245_AudioCapability::e_g729 }, + { AST_FORMAT_G726_AAL2, H245_AudioCapability::e_nonStandard, NULL, CISCO_G726r32 }, #ifdef AST_FORMAT_MODEM { AST_FORMAT_MODEM, H245_DataApplicationCapability_application::e_t38fax }, #endif @@ -1313,7 +1315,7 @@ BOOL MyH323Connection::OnReceivedCapabilitySet(const H323Capabilities & remoteCa switch(remoteCapabilities[i].GetMainType()) { case H323Capability::e_Audio: for (int x = 0; codecs[x].asterisk_codec > 0; ++x) { - if (subType == codecs[x].h245_cap) { + if ((subType == codecs[x].h245_cap) && (!codecs[x].formatName || (!strcmp(codecs[x].formatName, (const char *)remoteCapabilities[i].GetFormatName())))) { int ast_codec = codecs[x].asterisk_codec; int ms = 0; if (!(peer_capabilities & ast_codec)) { @@ -1495,6 +1497,12 @@ void MyH323Connection::SetCapabilities(int cap, int dtmf_mode, void *_prefs, int if (format.max_ms) g711aCap->SetTxFramesInPacket(format.max_ms); break; + case AST_FORMAT_G726_AAL2: + AST_CiscoG726Capability *g726Cap; + lastcap = localCapabilities.SetCapability(0, 0, g726Cap = new AST_CiscoG726Capability(frames_per_packet)); + if (max_frames_per_packet) + g726Cap->SetTxFramesInPacket(max_frames_per_packet); + break; default: alreadysent &= ~codec; break; |