[Asterisk-cvs] asterisk/channels/h323 ast_h323.cpp, 1.68, 1.69 chan_h323.h, 1.36, 1.37

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels/h323
In directory mongoose.digium.com:/tmp/cvs-serv13893/h323

Modified Files:
	ast_h323.cpp chan_h323.h 
Log Message:
Fix G.729 name annoucement to Open H.323 and inform Asterisk's RTP stack specifically which codec we are expecting.

Index: ast_h323.cpp
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/ast_h323.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- ast_h323.cpp	16 Dec 2004 04:25:49 -0000	1.68
+++ ast_h323.cpp	21 Dec 2004 00:07:56 -0000	1.69
@@ -83,13 +83,9 @@
 	PTrace::Initialise(0, NULL, PTrace::Timestamp | PTrace::Thread | PTrace::FileAndLine);
 }
 
-#define H323_G7231 OPAL_G7231_6k3 "{sw}"
-#define H323_G729 OPAL_G729 "{sw}"
-#define H323_G729A OPAL_G729A "{sw}"
-
-H323_REGISTER_CAPABILITY(H323_G7231Capability, H323_G7231);
-H323_REGISTER_CAPABILITY(AST_G729Capability,  H323_G729);
-H323_REGISTER_CAPABILITY(AST_G729ACapability, H323_G729A);
+H323_REGISTER_CAPABILITY(H323_G7231Capability, OPAL_G7231);
+H323_REGISTER_CAPABILITY(AST_G729Capability,  OPAL_G729);
+H323_REGISTER_CAPABILITY(AST_G729ACapability, OPAL_G729A);
 
 H323_G7231Capability::H323_G7231Capability(BOOL annexA_)
   : H323AudioCapability(7, 4)
@@ -120,7 +116,7 @@
 
 PString H323_G7231Capability::GetFormatName() const
 {
-  	return H323_G7231;
+  	return OPAL_G7231;
 }
 
 unsigned H323_G7231Capability::GetSubType() const
@@ -172,7 +168,7 @@
 
 PString AST_G729Capability::GetFormatName() const
 {
-  	return H323_G729;
+  	return OPAL_G729;
 }
 
 H323Codec * AST_G729Capability::CreateCodec(H323Codec::Direction direction) const
@@ -197,7 +193,7 @@
 
 PString AST_G729ACapability::GetFormatName() const
 {
-  	return H323_G729A;
+  	return OPAL_G729A;
 }
 
 H323Codec * AST_G729ACapability::CreateCodec(H323Codec::Direction direction) const
@@ -945,7 +941,7 @@
 
 	/* Notify Asterisk of remote RTP information */
 	on_start_rtp_channel(connection.GetCallReference(), (const char *)remoteIpAddr.AsString(), remotePort, 
-		(const char *)connection.GetCallToken());
+		(const char *)connection.GetCallToken(), (int)payloadCode);
 	return TRUE;
 }
 
@@ -965,7 +961,7 @@
 			cout << "		-- remotePort: " << remotePort << endl;
 		}
 		on_start_rtp_channel(connection.GetCallReference(), (const char *)remoteIpAddress.AsString(),
-				remotePort, (const char *)connection.GetCallToken());
+				remotePort, (const char *)connection.GetCallToken(), (int)payloadCode);
 		return TRUE;
 	}
 	return FALSE;

Index: chan_h323.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/h323/chan_h323.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- chan_h323.h	16 Dec 2004 02:03:19 -0000	1.36
+++ chan_h323.h	21 Dec 2004 00:07:56 -0000	1.37
@@ -99,6 +99,8 @@
 	char *call_source_name;
 	char *call_source_e164;
 	char *call_dest_e164;
+	int presentation;
+	int screening;
 	char *sourceIp;
 } call_details_t;
 
@@ -119,7 +121,7 @@
 
 /* This is a callback prototype function, called to send
    the remote IP and RTP port from H.323 to Asterisk */ 
-typedef void (*start_rtp_cb)(unsigned int, const char *, int, const char *);
+typedef void (*start_rtp_cb)(unsigned int, const char *, int, const char *, int);
 extern start_rtp_cb on_start_rtp_channel; 
 
 /* This is a callback that happens when call progress is