[asterisk-addons-commits] objsys: branch 1.2 r327 - in /branches/1.2/asterisk-ooh323c: ooh323c/src/ src/

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

Author: objsys
Date: Fri Jan 19 09:14:40 2007
New Revision: 327

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=327
Log:
h263 video codec cap

Modified:
    branches/1.2/asterisk-ooh323c/ooh323c/src/ooCapability.c
    branches/1.2/asterisk-ooh323c/src/chan_h323.c
    branches/1.2/asterisk-ooh323c/src/ooh323cDriver.c

Modified: branches/1.2/asterisk-ooh323c/ooh323c/src/ooCapability.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/ooh323c/src/ooCapability.c?view=diff&rev=327&r1=326&r2=327
==============================================================================
--- branches/1.2/asterisk-ooh323c/ooh323c/src/ooCapability.c (original)
+++ branches/1.2/asterisk-ooh323c/ooh323c/src/ooCapability.c Fri Jan 19 09:14:40 2007
@@ -1693,7 +1693,7 @@
    
    if(!cur) return NULL;
    
-   OOTRACEDBGC4("Found matching simple audio capability type %s. Comparing"
+   OOTRACEDBGC4("Found matching H.263 video capability type %s. Comparing"
                 " other parameters. (%s, %s)\n", ooGetCapTypeText(cap), 
                 call->callType, call->callToken);   
    if(dir & OORX)

Modified: branches/1.2/asterisk-ooh323c/src/chan_h323.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/src/chan_h323.c?view=diff&rev=327&r1=326&r2=327
==============================================================================
--- branches/1.2/asterisk-ooh323c/src/chan_h323.c (original)
+++ branches/1.2/asterisk-ooh323c/src/chan_h323.c Fri Jan 19 09:14:40 2007
@@ -2892,6 +2892,8 @@
          return OO_G729A;
       case AST_FORMAT_G723_1:
          return OO_G7231;
+      case AST_FORMAT_H263:
+         return OO_H263VIDEO;
       default:
          ast_log(LOG_NOTICE, "Don't know how to deal with mode %s\n", 
                         ast_getformatname_multiple(formats,512,cap));

Modified: branches/1.2/asterisk-ooh323c/src/ooh323cDriver.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.2/asterisk-ooh323c/src/ooh323cDriver.c?view=diff&rev=327&r1=326&r2=327
==============================================================================
--- branches/1.2/asterisk-ooh323c/src/ooh323cDriver.c (original)
+++ branches/1.2/asterisk-ooh323c/src/ooh323cDriver.c Fri Jan 19 09:14:40 2007
@@ -120,6 +120,18 @@
 
       }
 
+      if(format & AST_FORMAT_H263)
+      {
+         if(gH323Debug)
+            ast_verbose("\tAdding h263 capability to H323 endpoint\n");
+         ret = ooH323EpAddH263VideoCapability(OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, 
+                                     OORXANDTX, &ooh323c_start_receive_channel,
+                                     &ooh323c_start_transmit_channel,
+                                     &ooh323c_stop_receive_channel, 
+                                     &ooh323c_stop_transmit_channel);
+
+      }
+
       if(format & AST_FORMAT_GSM)
       {
          if(gH323Debug)
@@ -214,6 +226,19 @@
             ast_verbose("\tAdding g7231 capability to call (%s, %s)\n",
                                            call->callType, call->callToken);
          ret = ooCallAddG7231Capability(call, OO_G7231, 4, 7, FALSE, 
+                                     OORXANDTX, &ooh323c_start_receive_channel,
+                                     &ooh323c_start_transmit_channel,
+                                     &ooh323c_stop_receive_channel, 
+                                     &ooh323c_stop_transmit_channel);
+
+      }
+
+      if(format & AST_FORMAT_H263)
+      {
+         if(gH323Debug)
+            ast_verbose("\tAdding h263 capability to call (%s, %s)\n",
+                                           call->callType, call->callToken);
+         ret = ooCallAddH263VideoCapability(call, OO_H263VIDEO, 1, 0, 0, 0, 0, 320*1024, 
                                      OORXANDTX, &ooh323c_start_receive_channel,
                                      &ooh323c_start_transmit_channel,
                                      &ooh323c_stop_receive_channel, 
@@ -319,6 +344,8 @@
          return AST_FORMAT_G729A;
       case OO_G7231:
          return AST_FORMAT_G723_1;
+      case OO_H263VIDEO:
+         return AST_FORMAT_H263;
       default:
          ast_log(LOG_DEBUG, "Cap %d is not supported by driver yet\n");
          return -1;