[asterisk-addons-commits] trunk r194 - /trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c

[asterisk-addons-commits at lists.digium.com]

Author: objsys
Date: Wed Feb  8 08:41:26 2006
New Revision: 194

URL: http://svn.digium.com/view/asterisk-addons?rev=194&view=rev
Log:
Added capability type comparision, thanks Vlasis

Modified:
    trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c

Modified: trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c?rev=194&r1=193&r2=194&view=diff
==============================================================================
--- trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c (original)
+++ trunk/asterisk-ooh323c/ooh323c/src/ooCapability.c Wed Feb  8 08:41:26 2006
@@ -876,7 +876,7 @@
    return NULL;
 }
 
-/*Used for g711 ulaw/alaw, g729, g729a, g7231 */
+/* Used for g711 ulaw/alaw, g729, g729a, g7231 */
 ASN1BOOL ooCapabilityCheckCompatibility_Simple
    (OOH323CallData *call, ooH323EpCapability* epCap, 
     H245AudioCapability* audioCap, int dir)
@@ -916,18 +916,34 @@
       return FALSE;
    }
 
-   /* can we receive this capability */
+   if(cap != epCap->cap) { return FALSE; }
+
+   /* Can we receive this capability */
    if(dir & OORX)
    {
-      if(((OOCapParams*)epCap->params)->rxframes >= noofframes)
+      //if(cap == OO_G7231) {
+      //   if(((OOCapParams*)epCap->params)->rxframes <= noofframes) {
+      //      return TRUE;
+      //   }
+      //}
+      //else
+      if(((OOCapParams*)epCap->params)->rxframes >= noofframes) {
          return TRUE;
+      }
    }
 
    /* Can we transmit compatible stream */
    if(dir & OOTX)
    {
-      if(((OOCapParams*)epCap->params)->txframes <= noofframes)
+      //if(cap == OO_G7231) {
+      //   if(((OOCapParams*)epCap->params)->txframes >= noofframes) {
+      //      return TRUE;
+      //   }
+      //}
+      //else 
+      if(((OOCapParams*)epCap->params)->txframes <= noofframes) {
          return TRUE;
+      }
    }
    return FALSE;
 
@@ -1183,7 +1199,7 @@
 /*
    Note: In faststart if we sent transmit rate (x>y) and remote
          can receive only y, then we can't reduce our transmit rate
- */
+*/
 OOBOOL ooCapabilityCheckCompatibility
    (struct OOH323CallData *call, ooH323EpCapability* epCap, 
     H245DataType* dataType, int dir)