[Asterisk-cvs] asterisk-addons/asterisk-ooh323c/ooh323c/src ooCapability.c, 1.6, 1.7 ooh245.c, 1.6, 1.7

[vphirke]

Update of /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src
In directory mongoose.digium.com:/tmp/cvs-serv907/ooh323c/src

Modified Files:
	ooCapability.c ooh245.c 
Log Message:
Updated stack source

Index: ooCapability.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooCapability.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ooCapability.c	3 Aug 2005 14:48:19 -0000	1.6
+++ ooCapability.c	4 Aug 2005 14:54:20 -0000	1.7
@@ -1149,17 +1149,14 @@
    switch(audioCap->t)
    {
    case T_H245AudioCapability_gsmFullRate:
-      OOTRACEDBGC1("We have   OO_GSMFULLRATE\n"); 
       framesPerPkt = (audioCap->u.gsmFullRate->audioUnitSize)/OO_GSMFRAMESIZE;
       cap = OO_GSMFULLRATE;
       break;
    case T_H245AudioCapability_gsmHalfRate:
-      OOTRACEDBGC1("We have   OO_GSMHALFRATE\n"); 
       framesPerPkt = (audioCap->u.gsmHalfRate->audioUnitSize)/OO_GSMFRAMESIZE;
       cap = OO_GSMHALFRATE;
       break;
    case T_H245AudioCapability_gsmEnhancedFullRate:
-      OOTRACEDBGC1("We have   OO_GSMENHANCEDFULLRATE\n"); 
       framesPerPkt = (audioCap->u.gsmEnhancedFullRate->audioUnitSize)/OO_GSMFRAMESIZE;
       cap = OO_GSMENHANCEDFULLRATE;
       break;
@@ -1169,7 +1166,6 @@
      return NULL;
    }
 
-   OOTRACEDBGC1("Checking for support of GSM Capability\n");
    OOTRACEDBGC4("Determined audio data type to be of type %d. Searching"
                 " for matching capability.(%s, %s)\n", cap, call->callType, 
                 call->callToken);
@@ -1278,37 +1274,30 @@
    switch(audioCap->t)
    {
       case T_H245AudioCapability_g711Alaw64k:
-         OOTRACEDBGC1("We have  OO_G711ALAW64K\n");
          framesPerPkt = audioCap->u.g711Alaw64k;
          cap = OO_G711ALAW64K;
          break;
       case T_H245AudioCapability_g711Alaw56k:
-         OOTRACEDBGC1("We have  OO_G711ALAW56K\n");
          framesPerPkt = audioCap->u.g711Alaw56k;
          cap = OO_G711ALAW56K;
          break;
       case T_H245AudioCapability_g711Ulaw56k:
-         OOTRACEDBGC1("We have  OO_G711ULAW56K\n");
          framesPerPkt = audioCap->u.g711Ulaw56k;
          cap = OO_G711ULAW56K;
          break;
       case T_H245AudioCapability_g711Ulaw64k:
-         OOTRACEDBGC1("We have  OO_G711ULAW64K\n");
          framesPerPkt = audioCap->u.g711Ulaw64k;
          cap = OO_G711ULAW64K;
          break;
       case T_H245AudioCapability_g729:
-         OOTRACEDBGC1("We have  OO_G729\n");
          framesPerPkt = audioCap->u.g729;
          cap = OO_G729;
          break;
       case T_H245AudioCapability_g729AnnexA:
-         OOTRACEDBGC1("We have  OO_G729A\n");
          framesPerPkt = audioCap->u.g729AnnexA;
          cap = OO_G729A;
          break;
       case T_H245AudioCapability_g7231:
-         OOTRACEDBGC1("We have  OO_G7231\n");
          framesPerPkt = audioCap->u.g7231->maxAl_sduAudioFrames;
          cap = OO_G7231;
          break;
@@ -1316,8 +1305,6 @@
 	return NULL;
    }
 
-   OOTRACEDBGC1("Now searching for matching capability\n");
-   
    OOTRACEDBGC4("Determined Simple audio data type to be of type %s. Searching"
                 " for matching capability.(%s, %s)\n", 
                 ooGetCapTypeText(cap), call->callType, call->callToken);
@@ -1441,14 +1428,10 @@
       case T_H245AudioCapability_g729:
       case T_H245AudioCapability_g729AnnexA:
       case T_H245AudioCapability_g7231:
-         OOTRACEDBGC3("Checking for Simple Audio Data type support.(%s, %s)\n",
-                      call->callType, call->callToken);
          return ooIsAudioDataTypeSimpleSupported(call, audioCap, dir);
       case T_H245AudioCapability_gsmFullRate:
       case T_H245AudioCapability_gsmHalfRate:
       case T_H245AudioCapability_gsmEnhancedFullRate:
-         OOTRACEDBGC3("Checking for GSM Audio Data type support.(%s, %s)\n",
-                      call->callType, call->callToken);
          return ooIsAudioDataTypeGSMSupported(call, audioCap, dir);   
       default:
          return NULL;
@@ -1932,6 +1915,7 @@
       break;
    case T_H245Capability_receiveAndTransmitAudioCapability:
       epCap = NULL;
+      break;
    case T_H245Capability_receiveVideoCapability:
       return ooCapabilityUpdateJointCapabilitiesVideo(call, 
                                           cap->u.receiveVideoCapability, OOTX);
@@ -2054,28 +2038,6 @@
 
    epCap = NULL;
 
-   if(pH263Cap->m.cifMPIPresent)
-   {
-      epCap =  ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, 
-                                                          OO_PICFORMAT_CIF);
-      if(epCap)
-      {
-         OOTRACEDBGC3("Adding H263-CIF to joint capabilities(%s, %s)\n",
-                      call->callType, call->callToken);
-         /* Note:we add jointCaps in remote endpoints preference order.*/
-         if(!call->jointCaps)
-            call->jointCaps = epCap;
-         else {
-            cur = call->jointCaps;
-            while(cur->next) cur = cur->next;
-            cur->next = epCap;
-         }
-
-      }     
-   }
-
-   epCap = NULL;
-
    if(pH263Cap->m.cif4MPIPresent)
    {
       epCap =  ooIsVideoDataTypeH263Supported(call, pH263Cap, dir, 

Index: ooh245.c
===================================================================
RCS file: /usr/cvsroot/asterisk-addons/asterisk-ooh323c/ooh323c/src/ooh245.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ooh245.c	28 Jun 2005 18:40:13 -0000	1.6
+++ ooh245.c	4 Aug 2005 14:54:20 -0000	1.7
@@ -2321,6 +2321,8 @@
       pNode = dListFindByIndex(&tcs->capabilityTable, k);
       if(pNode)
       {
+         OOTRACEDBGC4("Processing CapabilityTable Entry %d (%s, %s)\n", k,
+                       call->callType, call->callToken);
          capEntry = (H245CapabilityTableEntry*) pNode->data;
          if(capEntry->m.capabilityPresent){
             ret =  ooAddRemoteCapability(call, &capEntry->capability);